From d0e9e8396a78df11c31e0d3ed4a4db941bcf0fd1 Mon Sep 17 00:00:00 2001
From: "Xu,Randy" <randy.xu@intel.com>
Date: Wed, 15 Feb 2017 14:06:44 +0800
Subject: [PATCH 001/427] Change the i915 kernel driver as built-in

The SurfaceFlinger init needs open the graphics device node
/dev/dri/RenderD128, which is created in
   -> i915_driver_load
   -> i915_driver_register
   -> drm_dev_register
   -> drm_minor_register
If the Surfaceflinger init goes ahead of i915 kernel module load,
the process will crash and may cause the Android boot failure.

There are two options, here I choose the first one
1. change the i915 kernel driver to built-in
2. change the module init sequence in init.rc

JIRA: https://01.org/jira/browse/AIA-162
Test: No Surfaceflinger crash in system boot up & No Regression

Signed-off-by: Xu,Randy <randy.xu@intel.com>
---
 kernel_config/kernel_64_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index f78355224..4cbaca2be 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -4273,10 +4273,10 @@ CONFIG_INTEL_GTT=y
 CONFIG_VGA_ARB=y
 CONFIG_VGA_ARB_MAX_GPUS=16
 CONFIG_VGA_SWITCHEROO=y
-CONFIG_DRM=m
+CONFIG_DRM=y
 CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
-CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
@@ -4306,7 +4306,7 @@ CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_I915=m
+CONFIG_DRM_I915=y
 CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=y
 CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_I915_GVT is not set

From 385ba3400d38a6e36d076c809b711db9c0fc642a Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Wed, 15 Feb 2017 00:13:28 -0800
Subject: [PATCH 002/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/device.mk  | 4 ++++
 androidia_64/ueventd.rc | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index ceae197a9..9bf6ad73a 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -367,6 +367,10 @@ PRODUCT_COPY_FILES += \
 # usb accessory
 PRODUCT_PACKAGES += \
     com.android.future.usb.accessory
+##############################################################
+# Source: device/intel/mixins/groups/lights/true/product.mk
+##############################################################
+PRODUCT_PACKAGES += lights.android_ia
 # ------------------ END MIX-IN DEFINITIONS ------------------
 PRODUCT_PACKAGES += libhoudini houdini
 PRODUCT_PROPERTY_OVERRIDES += ro.dalvik.vm.isa.arm=x86 ro.enable.native.bridge.exec=1
diff --git a/androidia_64/ueventd.rc b/androidia_64/ueventd.rc
index 3437781a5..0ea5b10dc 100644
--- a/androidia_64/ueventd.rc
+++ b/androidia_64/ueventd.rc
@@ -63,4 +63,9 @@
 ##############################################################
 # rfkill node
 /dev/rfkill 0660 bluetooth system
+##############################################################
+# Source: device/intel/mixins/groups/lights/true/ueventd.rc
+##############################################################
+# i915 backlight driver
+/sys/devices/pci0000:00/0000:00:02.0/drm/card*/card*/intel_backlight brightness 0644 system system
 # ------------------ END MIX-IN DEFINITIONS ------------------

From 3ddc55ecf719d32f5253f024001b7d043e293bbc Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Mon, 20 Feb 2017 04:49:15 -0800
Subject: [PATCH 003/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/BoardConfig.mk | 2 +-
 androidia_64/gpt.ini        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index b3179a540..d3e7cabcc 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -101,7 +101,7 @@ else
 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
 endif
 
-BOARD_SYSTEMIMAGE_PARTITION_SIZE = 2010612736
+BOARD_SYSTEMIMAGE_PARTITION_SIZE = 2147483648
 
 BOARD_BOOTLOADER_PARTITION_SIZE ?= 62914560
 BOARD_BOOTLOADER_BLOCK_SIZE := 512
diff --git a/androidia_64/gpt.ini b/androidia_64/gpt.ini
index 44f4ada83..5d6719cdf 100644
--- a/androidia_64/gpt.ini
+++ b/androidia_64/gpt.ini
@@ -47,7 +47,7 @@ guid = 20ac26be-20b7-11e3-84c5-6cfdb94711e9
 
 [partition.system]
 label = android_system
-len = 2560
+len = 2048
 type = linux
 guid = 38f428e6-d326-425d-9140-6e0ea133647c
 

From 771cb5eee150ae3047a88baf6975de5711f3a768 Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Tue, 21 Feb 2017 11:32:23 -0800
Subject: [PATCH 004/427] Move to 4.10 config.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 kernel_config/kernel_64_defconfig | 637 +++++++++++++++++++-----------
 1 file changed, 407 insertions(+), 230 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 4cbaca2be..93e2cfa03 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -1,5 +1,10 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86 4.10.0 Kernel Configuration
+#
 CONFIG_64BIT=y
 CONFIG_X86_64=y
+CONFIG_X86=y
 CONFIG_INSTRUCTION_DECODER=y
 CONFIG_OUTPUT_FORMAT="elf64-x86-64"
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
@@ -40,6 +45,7 @@ CONFIG_PGTABLE_LEVELS=4
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
+CONFIG_THREAD_INFO_IN_TASK=y
 
 #
 # General setup
@@ -47,6 +53,8 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
+CONFIG_LOCALVERSION="-android_ia_64"
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
@@ -59,6 +67,7 @@ CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_XZ is not set
 # CONFIG_KERNEL_LZO is not set
 # CONFIG_KERNEL_LZ4 is not set
+CONFIG_DEFAULT_HOSTNAME="android_ia_64"
 CONFIG_SWAP=y
 # CONFIG_SYSVIPC is not set
 # CONFIG_POSIX_MQUEUE is not set
@@ -111,6 +120,7 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
+# CONFIG_SCHED_WALT is not set
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 CONFIG_TASKSTATS=y
@@ -138,19 +148,20 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_CGROUPS=y
+CONFIG_CGROUP_DEBUG=y
+CONFIG_CGROUP_FREEZER=y
+# CONFIG_CGROUP_PIDS is not set
+# CONFIG_CGROUP_DEVICE is not set
+# CONFIG_CPUSETS is not set
+CONFIG_CGROUP_CPUACCT=y
 # CONFIG_MEMCG is not set
 # CONFIG_BLK_CGROUP is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_CFS_BANDWIDTH is not set
 CONFIG_RT_GROUP_SCHED=y
-# CONFIG_CGROUP_PIDS is not set
-CONFIG_CGROUP_FREEZER=y
-# CONFIG_CPUSETS is not set
-# CONFIG_CGROUP_DEVICE is not set
-CONFIG_CGROUP_CPUACCT=y
 # CONFIG_CGROUP_PERF is not set
-CONFIG_CGROUP_DEBUG=y
+# CONFIG_SOCK_CGROUP_DATA is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
@@ -158,6 +169,8 @@ CONFIG_NAMESPACES=y
 # CONFIG_PID_NS is not set
 # CONFIG_NET_NS is not set
 # CONFIG_SCHED_AUTOGROUP is not set
+# CONFIG_SCHED_TUNE is not set
+# CONFIG_DEFAULT_USE_ENERGY_AWARE is not set
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
@@ -168,6 +181,7 @@ CONFIG_RD_GZIP=y
 # CONFIG_RD_XZ is not set
 # CONFIG_RD_LZO is not set
 # CONFIG_RD_LZ4 is not set
+CONFIG_INITRAMFS_COMPRESSION=".gz"
 # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
@@ -182,6 +196,7 @@ CONFIG_MULTIUSER=y
 CONFIG_SGETMASK_SYSCALL=y
 CONFIG_SYSFS_SYSCALL=y
 CONFIG_SYSCTL_SYSCALL=y
+CONFIG_POSIX_TIMERS=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
@@ -213,13 +228,14 @@ CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_PERF_EVENTS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_COMPAT_BRK is not set
 CONFIG_SLAB=y
 # CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
-# CONFIG_SYSTEM_DATA_VERIFICATION is not set
+CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
-CONFIG_KEXEC_CORE=y
 CONFIG_OPROFILE=y
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 CONFIG_HAVE_OPROFILE=y
@@ -256,9 +272,14 @@ CONFIG_HAVE_CMPXCHG_DOUBLE=y
 CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGINS is not set
 CONFIG_HAVE_CC_STACKPROTECTOR=y
+CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_CC_STACKPROTECTOR_NONE is not set
+# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
+CONFIG_CC_STACKPROTECTOR_STRONG=y
 CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
@@ -281,6 +302,8 @@ CONFIG_HAVE_STACK_VALIDATION=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_COMPAT_OLD_SIGACTION=y
 # CONFIG_CPU_NO_EFFICIENT_FFS is not set
+CONFIG_HAVE_ARCH_VMAP_STACK=y
+CONFIG_VMAP_STACK=y
 
 #
 # GCOV-based kernel profiling
@@ -297,13 +320,24 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
+CONFIG_MODULE_SIG=y
+CONFIG_MODULE_SIG_FORCE=y
+CONFIG_MODULE_SIG_ALL=y
+# CONFIG_MODULE_SIG_SHA1 is not set
+# CONFIG_MODULE_SIG_SHA224 is not set
+# CONFIG_MODULE_SIG_SHA256 is not set
+# CONFIG_MODULE_SIG_SHA384 is not set
+CONFIG_MODULE_SIG_SHA512=y
+CONFIG_MODULE_SIG_HASH="sha512"
 # CONFIG_MODULE_COMPRESS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_BLK_DEV_BSGLIB is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
+# CONFIG_BLK_DEV_ZONED is not set
 # CONFIG_BLK_CMDLINE_PARSER is not set
+# CONFIG_BLK_WBT is not set
 
 #
 # Partition Types
@@ -329,6 +363,7 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_BLOCK_COMPAT=y
+CONFIG_BLK_MQ_PCI=y
 
 #
 # IO Schedulers
@@ -340,6 +375,7 @@ CONFIG_IOSCHED_CFQ=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_ASN1=y
 CONFIG_UNINLINE_SPIN_UNLOCK=y
 CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
@@ -361,6 +397,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y
 # CONFIG_X86_X2APIC is not set
 CONFIG_X86_MPPARSE=y
 # CONFIG_GOLDFISH is not set
+# CONFIG_INTEL_RDT_A is not set
 CONFIG_X86_EXTENDED_PLATFORM=y
 # CONFIG_X86_VSMP is not set
 # CONFIG_X86_GOLDFISH is not set
@@ -401,6 +438,7 @@ CONFIG_IOMMU_HELPER=y
 CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
+CONFIG_SCHED_MC_PRIO=y
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
@@ -466,6 +504,7 @@ CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 # CONFIG_MEMORY_FAILURE is not set
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
@@ -503,14 +542,20 @@ CONFIG_SECCOMP=y
 CONFIG_HZ_1000=y
 CONFIG_HZ=1000
 CONFIG_SCHED_HRTICK=y
+# CONFIG_KEXEC is not set
 # CONFIG_KEXEC_FILE is not set
 # CONFIG_CRASH_DUMP is not set
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_RELOCATABLE=y
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_X86_NEED_RELOCS=y
 CONFIG_PHYSICAL_ALIGN=0x200000
+CONFIG_RANDOMIZE_MEMORY=y
+CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0x0
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
+# CONFIG_COMPAT_VDSO is not set
 # CONFIG_LEGACY_VSYSCALL_NATIVE is not set
 CONFIG_LEGACY_VSYSCALL_EMULATE=y
 # CONFIG_LEGACY_VSYSCALL_NONE is not set
@@ -526,6 +571,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 # CONFIG_SUSPEND_SKIP_SYNC is not set
+# CONFIG_HIBERNATION is not set
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_AUTOSLEEP=y
@@ -560,6 +606,7 @@ CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_CPU_FREQ_PSS=y
 CONFIG_ACPI_PROCESSOR_CSTATE=y
 CONFIG_ACPI_PROCESSOR_IDLE=y
+CONFIG_ACPI_CPPC_LIB=y
 CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_PROCESSOR_AGGREGATOR=y
@@ -574,6 +621,7 @@ CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_HOTPLUG_IOAPIC=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_HED=m
+# CONFIG_ACPI_CUSTOM_METHOD is not set
 # CONFIG_ACPI_BGRT is not set
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
 # CONFIG_ACPI_NFIT is not set
@@ -599,13 +647,13 @@ CONFIG_CPU_FREQ_STAT_DETAILS=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHED is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-# CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set
+# CONFIG_CPU_FREQ_GOV_SCHED is not set
 
 #
 # CPU frequency scaling drivers
@@ -634,11 +682,6 @@ CONFIG_CPU_IDLE_GOV_MENU=y
 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 CONFIG_INTEL_IDLE=y
 
-#
-# Memory power savings
-#
-# CONFIG_I7300_IDLE is not set
-
 #
 # Bus options (PCI etc.)
 #
@@ -659,6 +702,7 @@ CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 # CONFIG_PCIE_DPC is not set
+# CONFIG_PCIE_PTM is not set
 CONFIG_PCI_BUS_ADDR_T_64BIT=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
@@ -681,6 +725,7 @@ CONFIG_HOTPLUG_PCI_SHPC=m
 # PCI host controller drivers
 #
 # CONFIG_PCIE_DW_PLAT is not set
+# CONFIG_VMD is not set
 # CONFIG_ISA_BUS is not set
 CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
@@ -712,15 +757,17 @@ CONFIG_COMPAT_BINFMT_ELF=y
 CONFIG_ELFCORE=y
 CONFIG_BINFMT_SCRIPT=y
 # CONFIG_HAVE_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
 CONFIG_COREDUMP=y
 CONFIG_IA32_EMULATION=y
 # CONFIG_IA32_AOUT is not set
 CONFIG_X86_X32=y
+CONFIG_COMPAT_32=y
 CONFIG_COMPAT=y
 CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_KEYS_COMPAT=y
 CONFIG_X86_DEV_DMA_OPS=y
 CONFIG_PMC_ATOM=y
-# CONFIG_VMD is not set
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
@@ -757,6 +804,7 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_NET_IPGRE_DEMUX is not set
 CONFIG_NET_IP_TUNNEL=y
 # CONFIG_IP_MROUTE is not set
+CONFIG_SYN_COOKIES=y
 # CONFIG_NET_IPVTI is not set
 CONFIG_NET_UDP_TUNNEL=m
 # CONFIG_NET_FOU is not set
@@ -769,9 +817,7 @@ CONFIG_INET_TUNNEL=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 CONFIG_INET_XFRM_MODE_TUNNEL=y
 # CONFIG_INET_XFRM_MODE_BEET is not set
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_UDP_DIAG=m
-CONFIG_INET_DIAG_DESTROY=y
+# CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
@@ -801,6 +847,8 @@ CONFIG_IPV6_TUNNEL=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
 # CONFIG_IPV6_SUBTREES is not set
 # CONFIG_IPV6_MROUTE is not set
+# CONFIG_IPV6_SEG6_LWTUNNEL is not set
+# CONFIG_IPV6_SEG6_HMAC is not set
 # CONFIG_NETLABEL is not set
 CONFIG_ANDROID_PARANOID_NETWORK=y
 CONFIG_NETWORK_SECMARK=y
@@ -820,6 +868,7 @@ CONFIG_NETFILTER_NETLINK=y
 CONFIG_NETFILTER_NETLINK_QUEUE=y
 CONFIG_NETFILTER_NETLINK_LOG=y
 CONFIG_NF_CONNTRACK=y
+# CONFIG_NF_LOG_NETDEV is not set
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_PROCFS=y
@@ -931,11 +980,11 @@ CONFIG_NETFILTER_XT_MATCH_POLICY=y
 # CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
 CONFIG_NETFILTER_XT_MATCH_QUOTA=y
+# CONFIG_NETFILTER_XT_MATCH_QUOTA2 is not set
 # CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
 # CONFIG_NETFILTER_XT_MATCH_REALM is not set
 # CONFIG_NETFILTER_XT_MATCH_RECENT is not set
 # CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-CONFIG_NETFILTER_XT_MATCH_SOCKET=y
 CONFIG_NETFILTER_XT_MATCH_STATE=y
 CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
 CONFIG_NETFILTER_XT_MATCH_STRING=y
@@ -950,7 +999,7 @@ CONFIG_NETFILTER_XT_MATCH_U32=y
 #
 CONFIG_NF_DEFRAG_IPV4=y
 CONFIG_NF_CONNTRACK_IPV4=y
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+# CONFIG_NF_SOCKET_IPV4 is not set
 # CONFIG_NF_DUP_IPV4 is not set
 # CONFIG_NF_LOG_ARP is not set
 # CONFIG_NF_LOG_IPV4 is not set
@@ -987,6 +1036,7 @@ CONFIG_IP_NF_ARP_MANGLE=y
 #
 CONFIG_NF_DEFRAG_IPV6=y
 CONFIG_NF_CONNTRACK_IPV6=y
+# CONFIG_NF_SOCKET_IPV6 is not set
 # CONFIG_NF_DUP_IPV6 is not set
 CONFIG_NF_REJECT_IPV6=y
 # CONFIG_NF_LOG_IPV6 is not set
@@ -1105,10 +1155,13 @@ CONFIG_NET_ACT_MIRRED=y
 # CONFIG_NET_ACT_VLAN is not set
 # CONFIG_NET_ACT_BPF is not set
 # CONFIG_NET_ACT_CONNMARK is not set
+# CONFIG_NET_ACT_SKBMOD is not set
 # CONFIG_NET_ACT_IFE is not set
+# CONFIG_NET_ACT_TUNNEL_KEY is not set
 # CONFIG_NET_CLS_IND is not set
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_DCB is not set
+# CONFIG_DNS_RESOLVER is not set
 # CONFIG_BATMAN_ADV is not set
 # CONFIG_OPENVSWITCH is not set
 # CONFIG_VSOCKETS is not set
@@ -1121,7 +1174,6 @@ CONFIG_NET_SCH_FIFO=y
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
-# CONFIG_SOCK_CGROUP_DATA is not set
 # CONFIG_CGROUP_NET_PRIO is not set
 # CONFIG_CGROUP_NET_CLASSID is not set
 CONFIG_NET_RX_BUSY_POLL=y
@@ -1172,6 +1224,7 @@ CONFIG_BT_HCIUART_INTEL=y
 CONFIG_BT_HCIUART_BCM=y
 CONFIG_BT_HCIUART_QCA=y
 # CONFIG_BT_HCIUART_AG6XX is not set
+# CONFIG_BT_HCIUART_MRVL is not set
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
@@ -1186,6 +1239,7 @@ CONFIG_BT_ATH3K=m
 CONFIG_BT_WILINK=m
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AF_KCM is not set
+# CONFIG_STREAM_PARSER is not set
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_EXT=y
@@ -1224,6 +1278,7 @@ CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
 CONFIG_WIMAX=m
 CONFIG_WIMAX_DEBUG_LEVEL=8
 CONFIG_RFKILL=y
+CONFIG_RFKILL_PM=y
 CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
 # CONFIG_RFKILL_REGULATOR is not set
@@ -1259,6 +1314,8 @@ CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
@@ -1268,7 +1325,7 @@ CONFIG_REGMAP_SPI=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_FENCE_TRACE is not set
+# CONFIG_DMA_FENCE_TRACE is not set
 
 #
 # Bus devices
@@ -1340,6 +1397,7 @@ CONFIG_MTD_CFI_I2=y
 # Disk-On-Chip Device Drivers
 #
 # CONFIG_MTD_DOCG3 is not set
+CONFIG_MTD_NAND_IDS=m
 CONFIG_MTD_NAND_ECC=m
 # CONFIG_MTD_NAND_ECC_SMC is not set
 CONFIG_MTD_NAND=m
@@ -1349,13 +1407,13 @@ CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_DENALI_DT is not set
 # CONFIG_MTD_NAND_GPIO is not set
 # CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set
-CONFIG_MTD_NAND_IDS=m
 # CONFIG_MTD_NAND_RICOH is not set
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_DOCG4 is not set
 # CONFIG_MTD_NAND_CAFE is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_NAND_OXNAS is not set
 # CONFIG_MTD_NAND_HISI504 is not set
 # CONFIG_MTD_NAND_MTK is not set
 CONFIG_MTD_ONENAND=m
@@ -1385,7 +1443,6 @@ CONFIG_OF_NET=y
 CONFIG_OF_MDIO=m
 CONFIG_OF_PCI=y
 CONFIG_OF_PCI_IRQ=y
-CONFIG_OF_MTD=y
 # CONFIG_OF_OVERLAY is not set
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 CONFIG_PARPORT=m
@@ -1458,6 +1515,7 @@ CONFIG_VIRTIO_BLK=y
 # CONFIG_BLK_DEV_RBD is not set
 # CONFIG_BLK_DEV_RSXX is not set
 # CONFIG_BLK_DEV_NVME is not set
+# CONFIG_NVME_FC is not set
 # CONFIG_NVME_TARGET is not set
 
 #
@@ -1480,16 +1538,12 @@ CONFIG_APDS9802ALS=m
 CONFIG_ISL29003=m
 CONFIG_ISL29020=m
 CONFIG_SENSORS_TSL2550=m
-CONFIG_SENSORS_BH1780=m
 CONFIG_SENSORS_BH1770=m
 CONFIG_SENSORS_APDS990X=m
 CONFIG_HMC6352=m
 # CONFIG_DS1682 is not set
 # CONFIG_TI_DAC7512 is not set
 CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=m
-CONFIG_BMP085_I2C=m
-CONFIG_BMP085_SPI=m
 CONFIG_USB_SWITCH_FSA9480=m
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 # CONFIG_SRAM is not set
@@ -1497,6 +1551,8 @@ CONFIG_PANEL=m
 CONFIG_PANEL_PARPORT=0
 CONFIG_PANEL_PROFILE=5
 # CONFIG_PANEL_CHANGE_MESSAGE is not set
+# CONFIG_UID_CPUTIME is not set
+# CONFIG_MEMORY_STATE_TIME is not set
 CONFIG_C2PORT=m
 CONFIG_C2PORT_DURAMAR_2150=m
 
@@ -1684,9 +1740,9 @@ CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_MEGARAID_SAS is not set
 # CONFIG_SCSI_MPT3SAS is not set
 # CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_SMARTPQI is not set
 CONFIG_SCSI_UFSHCD=y
 # CONFIG_SCSI_UFSHCD_PCI is not set
-# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
 # CONFIG_SCSI_UFSHCD_PLATFORM is not set
 # CONFIG_SCSI_HPTIOP is not set
 # CONFIG_SCSI_BUSLOGIC is not set
@@ -1708,6 +1764,7 @@ CONFIG_HYPERV_STORAGE=y
 # CONFIG_SCSI_IPR is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
 # CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_QEDI is not set
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_AM53C974 is not set
 # CONFIG_SCSI_WD719X is not set
@@ -1827,7 +1884,7 @@ CONFIG_BLK_DEV_DM=y
 # CONFIG_DM_MQ_DEFAULT is not set
 CONFIG_DM_DEBUG=y
 CONFIG_DM_BUFIO=y
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
 CONFIG_DM_CRYPT=y
 # CONFIG_DM_SNAPSHOT is not set
 # CONFIG_DM_THIN_PROVISIONING is not set
@@ -1841,6 +1898,8 @@ CONFIG_DM_CRYPT=y
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_FLAKEY is not set
 CONFIG_DM_VERITY=y
+# CONFIG_DM_VERITY_HASH_PREFETCH_MIN_SIZE_128 is not set
+CONFIG_DM_VERITY_HASH_PREFETCH_MIN_SIZE=1
 CONFIG_DM_VERITY_FEC=y
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
@@ -1875,7 +1934,6 @@ CONFIG_NET_TEAM=m
 # CONFIG_NET_TEAM_MODE_LOADBALANCE is not set
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
-# CONFIG_IPVLAN is not set
 # CONFIG_VXLAN is not set
 # CONFIG_GENEVE is not set
 # CONFIG_GTP is not set
@@ -1920,17 +1978,21 @@ CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_NET_VENDOR_AGERE=y
 CONFIG_ET131X=m
+CONFIG_NET_VENDOR_ALACRITECH=y
+CONFIG_SLICOSS=m
 CONFIG_NET_VENDOR_ALTEON=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 CONFIG_ALTERA_TSE=m
+CONFIG_NET_VENDOR_AMAZON=y
+# CONFIG_ENA_ETHERNET is not set
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_AMD8111_ETH=m
 CONFIG_PCNET32=m
 CONFIG_PCMCIA_NMCLAN=m
+# CONFIG_AMD_XGBE is not set
+# CONFIG_AMD_XGBE_HAVE_ECC is not set
 CONFIG_NET_VENDOR_ARC=y
-# CONFIG_ARC_EMAC is not set
-# CONFIG_EMAC_ROCKCHIP is not set
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ATL2=m
 CONFIG_ATL1=m
@@ -1941,6 +2003,7 @@ CONFIG_NET_VENDOR_AURORA=y
 CONFIG_AURORA_NB8800=m
 CONFIG_NET_CADENCE=y
 CONFIG_MACB=m
+# CONFIG_MACB_PCI is not set
 CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_B44=m
 CONFIG_B44_PCI_AUTOSELECT=y
@@ -1959,7 +2022,9 @@ CONFIG_NET_VENDOR_CAVIUM=y
 CONFIG_THUNDER_NIC_PF=m
 # CONFIG_THUNDER_NIC_VF is not set
 CONFIG_THUNDER_NIC_BGX=m
+CONFIG_THUNDER_NIC_RGX=m
 CONFIG_LIQUIDIO=m
+# CONFIG_LIQUIDIO_VF is not set
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
@@ -2021,7 +2086,6 @@ CONFIG_NET_VENDOR_I825XX=y
 CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_MVMDIO=m
-# CONFIG_MVNETA_BM is not set
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
 # CONFIG_SKGE_GENESIS is not set
@@ -2035,7 +2099,10 @@ CONFIG_MLX5_CORE=m
 CONFIG_MLX5_CORE_EN=y
 CONFIG_MLXSW_CORE=m
 CONFIG_MLXSW_CORE_HWMON=y
+CONFIG_MLXSW_CORE_THERMAL=y
 CONFIG_MLXSW_PCI=m
+CONFIG_MLXSW_I2C=m
+CONFIG_MLXSW_MINIMAL=m
 CONFIG_NET_VENDOR_MICREL=y
 CONFIG_KS8842=m
 CONFIG_KS8851=m
@@ -2075,6 +2142,7 @@ CONFIG_QED=m
 CONFIG_QEDE=m
 CONFIG_NET_VENDOR_QUALCOMM=y
 # CONFIG_QCA7000 is not set
+# CONFIG_QCOM_EMAC is not set
 CONFIG_NET_VENDOR_REALTEK=y
 CONFIG_ATP=m
 CONFIG_8139CP=m
@@ -2096,10 +2164,12 @@ CONFIG_SC92031=m
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_SIS900=m
 CONFIG_SIS190=m
+CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
 CONFIG_SFC_MCDI_MON=y
 CONFIG_SFC_MCDI_LOGGING=y
+# CONFIG_SFC_FALCON is not set
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_PCMCIA_SMC91C92=m
 CONFIG_EPIC100=m
@@ -2141,46 +2211,52 @@ CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_NET_SB1000=m
 CONFIG_PHYLIB=m
 CONFIG_SWPHY=y
+# CONFIG_LED_TRIGGER_PHY is not set
+
+#
+# MDIO bus device drivers
+#
+# CONFIG_MDIO_BCM_UNIMAC is not set
+CONFIG_MDIO_BITBANG=m
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+CONFIG_MDIO_CAVIUM=m
+CONFIG_MDIO_GPIO=m
+# CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_OCTEON=m
+CONFIG_MDIO_THUNDER=m
 
 #
 # MII PHY device drivers
 #
+CONFIG_AMD_PHY=m
 # CONFIG_AQUANTIA_PHY is not set
 CONFIG_AT803X_PHY=m
-CONFIG_AMD_PHY=m
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-# CONFIG_TERANETICS_PHY is not set
-CONFIG_SMSC_PHY=m
-CONFIG_BCM_NET_PHYLIB=m
-CONFIG_BROADCOM_PHY=m
 CONFIG_BCM7XXX_PHY=m
 CONFIG_BCM87XX_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_MICREL_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_DAVICOM_PHY=m
 # CONFIG_DP83848_PHY is not set
 # CONFIG_DP83867_PHY is not set
-CONFIG_MICROCHIP_PHY=m
 CONFIG_FIXED_PHY=m
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO_GPIO=m
-CONFIG_MDIO_CAVIUM=m
-CONFIG_MDIO_OCTEON=m
-CONFIG_MDIO_THUNDER=m
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-# CONFIG_MDIO_BCM_UNIMAC is not set
+CONFIG_ICPLUS_PHY=m
 # CONFIG_INTEL_XWAY_PHY is not set
-# CONFIG_MDIO_HISI_FEMAC is not set
-# CONFIG_MDIO_XGENE is not set
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MICROCHIP_PHY=m
+# CONFIG_MICROSEMI_PHY is not set
+CONFIG_NATIONAL_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_STE10XP=m
+# CONFIG_TERANETICS_PHY is not set
+CONFIG_VITESSE_PHY=m
+# CONFIG_XILINX_GMII2RGMII is not set
 CONFIG_MICREL_KS8995MA=m
 CONFIG_PLIP=m
 CONFIG_PPP=m
@@ -2191,6 +2267,8 @@ CONFIG_PPP_MPPE=m
 CONFIG_PPP_MULTILINK=y
 CONFIG_PPPOE=m
 CONFIG_PPPOL2TP=m
+# CONFIG_PPPOLAC is not set
+# CONFIG_PPPOPNS is not set
 CONFIG_PPP_ASYNC=m
 CONFIG_PPP_SYNC_TTY=m
 CONFIG_SLIP=m
@@ -2243,6 +2321,7 @@ CONFIG_USB_SIERRA_NET=m
 CONFIG_USB_VL600=m
 CONFIG_USB_NET_CH9200=m
 CONFIG_WLAN=y
+# CONFIG_WIRELESS_WDS is not set
 CONFIG_WLAN_VENDOR_ADMTEK=y
 CONFIG_ADM8211=m
 CONFIG_ATH_COMMON=m
@@ -2333,7 +2412,6 @@ CONFIG_BRCMFMAC_USB=y
 CONFIG_BRCMFMAC_PCIE=y
 # CONFIG_BRCM_TRACING is not set
 # CONFIG_BRCMDBG is not set
-CONFIG_WL=m
 CONFIG_WLAN_VENDOR_CISCO=y
 CONFIG_AIRO=m
 CONFIG_AIRO_CS=m
@@ -2523,11 +2601,14 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
+# CONFIG_INPUT_KEYRESET is not set
+# CONFIG_INPUT_KEYCOMBO is not set
 
 #
 # Input Device Drivers
 #
 CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADC is not set
 # CONFIG_KEYBOARD_ADP5588 is not set
 # CONFIG_KEYBOARD_ADP5589 is not set
 CONFIG_KEYBOARD_ATKBD=m
@@ -2627,6 +2708,7 @@ CONFIG_TOUCHSCREEN_AD7879_I2C=m
 CONFIG_TOUCHSCREEN_AD7879_SPI=m
 # CONFIG_TOUCHSCREEN_AR1021_I2C is not set
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
 CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
 CONFIG_TOUCHSCREEN_BU21013=m
 CONFIG_TOUCHSCREEN_CHIPONE_ICN8318=m
@@ -2642,11 +2724,11 @@ CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 CONFIG_TOUCHSCREEN_EETI=m
 CONFIG_TOUCHSCREEN_EGALAX=m
 # CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
-CONFIG_TOUCHSCREEN_FT6236=m
 CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GOODIX=m
 CONFIG_TOUCHSCREEN_ILI210X=m
 CONFIG_TOUCHSCREEN_GUNZE=m
+# CONFIG_TOUCHSCREEN_EKTF2127 is not set
 CONFIG_TOUCHSCREEN_ELAN=m
 CONFIG_TOUCHSCREEN_ELO=m
 CONFIG_TOUCHSCREEN_WACOM_W8001=m
@@ -2721,8 +2803,10 @@ CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_GP2A=m
 # CONFIG_INPUT_GPIO_BEEPER is not set
 CONFIG_INPUT_GPIO_TILT_POLLED=m
+# CONFIG_INPUT_GPIO_DECODER is not set
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_ATI_REMOTE2=m
+# CONFIG_INPUT_KEYCHORD is not set
 CONFIG_INPUT_KEYSPAN_REMOTE=m
 CONFIG_INPUT_KXTJ9=m
 # CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
@@ -2732,6 +2816,7 @@ CONFIG_INPUT_CM109=m
 CONFIG_INPUT_REGULATOR_HAPTIC=m
 CONFIG_INPUT_TPS65218_PWRBUTTON=m
 CONFIG_INPUT_UINPUT=y
+# CONFIG_INPUT_GPIO is not set
 CONFIG_INPUT_PCF8574=m
 # CONFIG_INPUT_PWM_BEEPER is not set
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
@@ -2743,7 +2828,6 @@ CONFIG_INPUT_CMA3000=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
 CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_INPUT_SURFACE3_BUTTON_ARRAY=m
 CONFIG_INPUT_DRV260X_HAPTICS=m
 CONFIG_INPUT_DRV2665_HAPTICS=m
 CONFIG_INPUT_DRV2667_HAPTICS=m
@@ -2815,6 +2899,7 @@ CONFIG_SERIAL_8250_RSA=y
 # CONFIG_SERIAL_8250_FSL is not set
 CONFIG_SERIAL_8250_DW=m
 # CONFIG_SERIAL_8250_RT288X is not set
+CONFIG_SERIAL_8250_LPSS=y
 # CONFIG_SERIAL_8250_MID is not set
 # CONFIG_SERIAL_8250_MOXA is not set
 # CONFIG_SERIAL_OF_PLATFORM is not set
@@ -2838,7 +2923,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_RP2 is not set
 # CONFIG_SERIAL_FSL_LPUART is not set
 # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
-CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_TTY_PRINTK is not set
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
@@ -2862,6 +2946,7 @@ CONFIG_NVRAM=m
 # CONFIG_SYNCLINK_CS is not set
 # CONFIG_CARDMAN_4000 is not set
 # CONFIG_CARDMAN_4040 is not set
+# CONFIG_SCR24X is not set
 # CONFIG_IPWIRELESS is not set
 # CONFIG_MWAVE is not set
 CONFIG_RAW_DRIVER=m
@@ -2894,9 +2979,10 @@ CONFIG_I2C_MUX_PCA954x=m
 CONFIG_I2C_MUX_PINCTRL=m
 CONFIG_I2C_MUX_REG=m
 # CONFIG_I2C_DEMUX_PINCTRL is not set
+# CONFIG_I2C_MUX_MLXCPLD is not set
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
-CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_ALGOPCA=m
 
 #
@@ -2959,6 +3045,7 @@ CONFIG_I2C_TINY_USB=m
 #
 # Other I2C/SMBus bus drivers
 #
+# CONFIG_I2C_MLXCPLD is not set
 CONFIG_I2C_CROS_EC_TUNNEL=m
 # CONFIG_I2C_STUB is not set
 CONFIG_I2C_SLAVE=y
@@ -3040,13 +3127,13 @@ CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
 CONFIG_PINCTRL_AMD=y
 CONFIG_PINCTRL_SINGLE=m
+# CONFIG_PINCTRL_SX150X is not set
 CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_CHERRYVIEW=y
 CONFIG_PINCTRL_INTEL=m
 CONFIG_PINCTRL_BROXTON=m
 CONFIG_PINCTRL_SUNRISEPOINT=m
 CONFIG_GPIOLIB=y
-CONFIG_GPIO_DEVRES=y
 CONFIG_OF_GPIO=y
 CONFIG_GPIO_ACPI=y
 CONFIG_GPIOLIB_IRQCHIP=y
@@ -3066,10 +3153,10 @@ CONFIG_GPIO_GENERIC_PLATFORM=m
 # CONFIG_GPIO_GRGPIO is not set
 CONFIG_GPIO_ICH=m
 CONFIG_GPIO_LYNXPOINT=m
+# CONFIG_GPIO_MOCKUP is not set
 CONFIG_GPIO_SYSCON=m
 CONFIG_GPIO_VX855=m
 CONFIG_GPIO_XILINX=m
-# CONFIG_GPIO_ZX is not set
 
 #
 # Port-mapped I/O GPIO drivers
@@ -3098,6 +3185,7 @@ CONFIG_GPIO_ARIZONA=m
 CONFIG_GPIO_CRYSTAL_COVE=y
 # CONFIG_GPIO_TPS65218 is not set
 CONFIG_GPIO_UCB1400=m
+# CONFIG_GPIO_WHISKEY_COVE is not set
 
 #
 # PCI GPIO expanders
@@ -3124,6 +3212,8 @@ CONFIG_GPIO_MCP23S08=m
 # USB GPIO expanders
 #
 # CONFIG_W1 is not set
+CONFIG_POWER_AVS=y
+# CONFIG_POWER_RESET is not set
 CONFIG_POWER_SUPPLY=y
 CONFIG_POWER_SUPPLY_DEBUG=y
 CONFIG_PDA_POWER=y
@@ -3150,8 +3240,6 @@ CONFIG_CHARGER_SMB347=m
 # CONFIG_CHARGER_TPS65217 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_CHARGER_RT9455 is not set
-# CONFIG_POWER_RESET is not set
-CONFIG_POWER_AVS=y
 CONFIG_HWMON=m
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -3225,6 +3313,7 @@ CONFIG_SENSORS_DELL_SMM=m
 # CONFIG_SENSORS_MAX6697 is not set
 # CONFIG_SENSORS_MAX31790 is not set
 # CONFIG_SENSORS_MCP3021 is not set
+# CONFIG_SENSORS_TC654 is not set
 # CONFIG_SENSORS_MENF21BMC_HWMON is not set
 # CONFIG_SENSORS_ADCXX is not set
 # CONFIG_SENSORS_LM63 is not set
@@ -3281,6 +3370,7 @@ CONFIG_SENSORS_LM85=m
 # CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_TMP102 is not set
 # CONFIG_SENSORS_TMP103 is not set
+# CONFIG_SENSORS_TMP108 is not set
 # CONFIG_SENSORS_TMP401 is not set
 # CONFIG_SENSORS_TMP421 is not set
 # CONFIG_SENSORS_VIA_CPUTEMP is not set
@@ -3296,6 +3386,7 @@ CONFIG_SENSORS_LM85=m
 # CONFIG_SENSORS_W83L786NG is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_SENSORS_XGENE is not set
 
 #
 # ACPI drivers
@@ -3316,6 +3407,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y
 # CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
 # CONFIG_CPU_THERMAL is not set
 # CONFIG_THERMAL_EMULATION is not set
+# CONFIG_QORIQ_THERMAL is not set
 CONFIG_INTEL_POWERCLAMP=m
 CONFIG_X86_PKG_TEMP_THERMAL=m
 CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
@@ -3327,6 +3419,7 @@ CONFIG_INTEL_SOC_DTS_THERMAL=m
 CONFIG_INT340X_THERMAL=m
 CONFIG_ACPI_THERMAL_REL=m
 # CONFIG_INT3406_THERMAL is not set
+# CONFIG_INTEL_BXT_PMIC_THERMAL is not set
 CONFIG_INTEL_PCH_THERMAL=m
 # CONFIG_GENERIC_ADC_THERMAL is not set
 CONFIG_WATCHDOG=y
@@ -3340,6 +3433,7 @@ CONFIG_WATCHDOG=y
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_MENF21BMC_WATCHDOG is not set
+# CONFIG_WDAT_WDT is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ZIIRAVE_WATCHDOG is not set
 # CONFIG_CADENCE_WATCHDOG is not set
@@ -3389,6 +3483,11 @@ CONFIG_WATCHDOG=y
 # USB-based Watchdog Cards
 #
 # CONFIG_USBPCWATCHDOG is not set
+
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
 CONFIG_SSB_POSSIBLE=y
 
 #
@@ -3507,6 +3606,7 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TPS65086 is not set
 # CONFIG_MFD_TPS65090 is not set
 CONFIG_MFD_TPS65217=m
+# CONFIG_MFD_TI_LP873X is not set
 CONFIG_MFD_TPS65218=m
 # CONFIG_MFD_TPS6586X is not set
 # CONFIG_MFD_TPS65910 is not set
@@ -3554,6 +3654,7 @@ CONFIG_REGULATOR_GPIO=m
 # CONFIG_REGULATOR_LP872X is not set
 # CONFIG_REGULATOR_LP8755 is not set
 # CONFIG_REGULATOR_LTC3589 is not set
+# CONFIG_REGULATOR_LTC3676 is not set
 # CONFIG_REGULATOR_MAX1586 is not set
 # CONFIG_REGULATOR_MAX8649 is not set
 # CONFIG_REGULATOR_MAX8660 is not set
@@ -3590,6 +3691,7 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 CONFIG_MEDIA_RADIO_SUPPORT=y
 # CONFIG_MEDIA_SDR_SUPPORT is not set
 CONFIG_MEDIA_RC_SUPPORT=y
+# CONFIG_MEDIA_CEC_SUPPORT is not set
 CONFIG_MEDIA_CEC_EDID=y
 CONFIG_MEDIA_CONTROLLER=y
 # CONFIG_MEDIA_CONTROLLER_DVB is not set
@@ -3598,6 +3700,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_VIDEO_V4L2=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_PCI_SKELETON is not set
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
@@ -3614,6 +3717,7 @@ CONFIG_DVB_NET=y
 CONFIG_TTPCI_EEPROM=m
 CONFIG_DVB_MAX_ADAPTERS=8
 # CONFIG_DVB_DYNAMIC_MINORS is not set
+# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
 
 #
 # Media drivers
@@ -3649,6 +3753,7 @@ CONFIG_IR_IGUANA=m
 CONFIG_IR_TTUSBIR=m
 CONFIG_RC_LOOPBACK=m
 CONFIG_IR_GPIO_CIR=m
+# CONFIG_IR_SERIAL is not set
 CONFIG_MEDIA_USB_SUPPORT=y
 
 #
@@ -3741,6 +3846,7 @@ CONFIG_VIDEO_TM6000_DVB=m
 #
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_DIB3000MC=m
 CONFIG_DVB_USB_A800=m
 CONFIG_DVB_USB_DIBUSB_MB=m
 CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
@@ -3801,6 +3907,7 @@ CONFIG_MEDIA_PCI_SUPPORT=y
 #
 CONFIG_VIDEO_MEYE=m
 # CONFIG_VIDEO_SOLO6X10 is not set
+# CONFIG_VIDEO_TW5864 is not set
 # CONFIG_VIDEO_TW68 is not set
 # CONFIG_VIDEO_TW686X is not set
 # CONFIG_VIDEO_ZORAN is not set
@@ -3917,14 +4024,14 @@ CONFIG_SMS_SIANO_RC=y
 CONFIG_VIDEO_V4L2_TPG=m
 
 #
-# Media ancillary drivers (tuners, sensors, i2c, frontends)
+# Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
 #
 # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
 CONFIG_MEDIA_ATTACH=y
 CONFIG_VIDEO_IR_I2C=m
 
 #
-# Encoders, decoders, sensors and other helper chips
+# I2C Encoders, decoders, sensors and other helper chips
 #
 
 #
@@ -3963,6 +4070,7 @@ CONFIG_VIDEO_BT856=m
 CONFIG_VIDEO_BT866=m
 CONFIG_VIDEO_KS0127=m
 # CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_AD5820 is not set
 CONFIG_VIDEO_SAA7110=m
 CONFIG_VIDEO_SAA711X=m
 # CONFIG_VIDEO_TC358743 is not set
@@ -4004,6 +4112,7 @@ CONFIG_VIDEO_OV7670=m
 # CONFIG_VIDEO_OV9650 is not set
 CONFIG_VIDEO_VS6624=m
 CONFIG_VIDEO_MT9M032=m
+CONFIG_VIDEO_MT9M111=m
 CONFIG_VIDEO_MT9P031=m
 CONFIG_VIDEO_MT9T001=m
 CONFIG_VIDEO_MT9V011=m
@@ -4064,6 +4173,11 @@ CONFIG_SOC_CAMERA_OV9640=m
 CONFIG_SOC_CAMERA_OV9740=m
 CONFIG_SOC_CAMERA_RJ54N1=m
 CONFIG_SOC_CAMERA_TW9910=m
+
+#
+# SPI helper chips
+#
+# CONFIG_VIDEO_GS1662 is not set
 CONFIG_MEDIA_TUNER=y
 
 #
@@ -4188,6 +4302,7 @@ CONFIG_DVB_RTL2830=m
 CONFIG_DVB_RTL2832=m
 CONFIG_DVB_SI2168=m
 CONFIG_DVB_AS102_FE=m
+CONFIG_DVB_GP8PSK_FE=m
 
 #
 # DVB-C (cable) frontends
@@ -4276,11 +4391,14 @@ CONFIG_VGA_SWITCHEROO=y
 CONFIG_DRM=y
 CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
+# CONFIG_DRM_DEBUG_MM is not set
+# CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 CONFIG_DRM_TTM=m
+CONFIG_DRM_VM=y
 
 #
 # I2C encoder or helper chips
@@ -4288,15 +4406,13 @@ CONFIG_DRM_TTM=m
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
 # CONFIG_DRM_RADEON_USERPTR is not set
 CONFIG_DRM_AMDGPU=m
+# CONFIG_DRM_AMDGPU_SI is not set
 CONFIG_DRM_AMDGPU_CIK=y
 # CONFIG_DRM_AMDGPU_USERPTR is not set
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
-# CONFIG_DRM_AMD_POWERPLAY is not set
 
 #
 # ACP (Audio CoProcessor) Configuration
@@ -4307,7 +4423,9 @@ CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_I915=y
-CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=y
+# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
+CONFIG_DRM_I915_CAPTURE_ERROR=y
+CONFIG_DRM_I915_COMPRESS_ERROR=y
 CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_I915_GVT is not set
 
@@ -4316,10 +4434,8 @@ CONFIG_DRM_I915_USERPTR=y
 #
 # CONFIG_DRM_I915_WERROR is not set
 # CONFIG_DRM_I915_DEBUG is not set
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
+# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
+# CONFIG_DRM_I915_SELFTEST is not set
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VMWGFX=m
 CONFIG_DRM_VMWGFX_FBCON=y
@@ -4339,6 +4455,7 @@ CONFIG_DRM_PANEL=y
 # Display Panels
 #
 # CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
@@ -4351,12 +4468,19 @@ CONFIG_DRM_BRIDGE=y
 # Display Interface Bridges
 #
 # CONFIG_DRM_ANALOGIX_ANX78XX is not set
+# CONFIG_DRM_DUMB_VGA_DAC is not set
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PARADE_PS8622 is not set
+# CONFIG_DRM_SIL_SII8620 is not set
 # CONFIG_DRM_SII902X is not set
 # CONFIG_DRM_TOSHIBA_TC358767 is not set
+# CONFIG_DRM_TI_TFP410 is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
 # CONFIG_DRM_ARCPGU is not set
+# CONFIG_DRM_HISI_HIBMC is not set
+# CONFIG_DRM_MXSFB is not set
+# CONFIG_DRM_LEGACY is not set
+# CONFIG_DRM_LIB_RANDOM is not set
 
 #
 # Frame buffer Devices
@@ -4371,11 +4495,12 @@ CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
+# CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA is not set
 # CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_SVGALIB=m
 # CONFIG_FB_MACMODES is not set
@@ -4407,7 +4532,6 @@ CONFIG_FB_RIVA=m
 CONFIG_FB_RIVA_BACKLIGHT=y
 # CONFIG_FB_I740 is not set
 # CONFIG_FB_LE80578 is not set
-# CONFIG_FB_INTEL is not set
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -4509,6 +4633,7 @@ CONFIG_SND=m
 CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
 CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
 CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_HWDEP=m
 CONFIG_SND_RAWMIDI=m
@@ -4711,6 +4836,7 @@ CONFIG_SND_SOC_INTEL_HASWELL=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 # CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set
 # CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set
+# CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
 # CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH is not set
@@ -4721,13 +4847,6 @@ CONFIG_SND_SOC_INTEL_SKYLAKE=m
 CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
 # CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH is not set
 # CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH is not set
-
-#
-# Allwinner SoC Audio support
-#
-# CONFIG_SND_SUN4I_CODEC is not set
-# CONFIG_SND_SUN4I_I2S is not set
-# CONFIG_SND_SUN4I_SPDIF is not set
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
 CONFIG_SND_SOC_I2C_AND_SPI=m
 
@@ -4746,6 +4865,8 @@ CONFIG_SND_SOC_ALC5623=m
 # CONFIG_SND_SOC_BT_SCO is not set
 CONFIG_SND_SOC_CS35L32=m
 # CONFIG_SND_SOC_CS35L33 is not set
+# CONFIG_SND_SOC_CS35L34 is not set
+# CONFIG_SND_SOC_CS42L42 is not set
 CONFIG_SND_SOC_CS42L51=m
 CONFIG_SND_SOC_CS42L51_I2C=m
 CONFIG_SND_SOC_CS42L52=m
@@ -4761,6 +4882,7 @@ CONFIG_SND_SOC_CS42XX8_I2C=m
 CONFIG_SND_SOC_CS4349=m
 # CONFIG_SND_SOC_CS53L30 is not set
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_ES8328=m
 # CONFIG_SND_SOC_GTM601 is not set
 CONFIG_SND_SOC_HDAC_HDMI=m
@@ -4768,6 +4890,7 @@ CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_MAX98090=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
+# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 CONFIG_SND_SOC_PCM1681=m
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X_SPI is not set
@@ -4829,9 +4952,12 @@ CONFIG_SND_SOC_WM8962=m
 # CONFIG_SND_SOC_WM8974 is not set
 CONFIG_SND_SOC_WM8978=m
 # CONFIG_SND_SOC_WM8985 is not set
+# CONFIG_SND_SOC_NAU8810 is not set
 CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
+# CONFIG_SND_SIMPLE_SCU_CARD is not set
+# CONFIG_SND_X86 is not set
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
 
@@ -4893,6 +5019,7 @@ CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIWHEELS_FF=y
 CONFIG_HID_MAGICMOUSE=m
+# CONFIG_HID_MAYFLASH is not set
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
 CONFIG_HID_MULTITOUCH=m
@@ -4929,6 +5056,7 @@ CONFIG_HID_TOPSEED=m
 CONFIG_HID_THINGM=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
+# CONFIG_HID_UDRAW_PS3 is not set
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
 CONFIG_HID_XINMO=m
@@ -4950,6 +5078,11 @@ CONFIG_USB_HIDDEV=y
 # I2C HID support
 #
 CONFIG_I2C_HID=m
+
+#
+# Intel ISH HID support
+#
+# CONFIG_INTEL_ISH_HID is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
@@ -4966,7 +5099,7 @@ CONFIG_USB_OTG=y
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 # CONFIG_USB_OTG_FSM is not set
-# CONFIG_USB_ULPI_BUS is not set
+# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
 CONFIG_USB_MON=y
 # CONFIG_USB_WUSB_CBAF is not set
 
@@ -4976,7 +5109,7 @@ CONFIG_USB_MON=y
 # CONFIG_USB_C67X00_HCD is not set
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_PCI=y
-CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_XHCI_PLATFORM=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
@@ -5039,6 +5172,8 @@ CONFIG_USB_MDC800=m
 # CONFIG_USB_MICROTEK is not set
 CONFIG_USBIP_CORE=m
 CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_VHCI_HC_PORTS=8
+CONFIG_USBIP_VHCI_NR_HCS=1
 CONFIG_USBIP_HOST=m
 # CONFIG_USBIP_VUDC is not set
 # CONFIG_USBIP_DEBUG is not set
@@ -5090,6 +5225,7 @@ CONFIG_USB_SERIAL_IR=m
 CONFIG_USB_SERIAL_EDGEPORT=m
 CONFIG_USB_SERIAL_EDGEPORT_TI=m
 CONFIG_USB_SERIAL_F81232=m
+# CONFIG_USB_SERIAL_F8153X is not set
 CONFIG_USB_SERIAL_GARMIN=m
 CONFIG_USB_SERIAL_IPW=m
 CONFIG_USB_SERIAL_IUU=m
@@ -5151,6 +5287,7 @@ CONFIG_USB_APPLEDISPLAY=m
 # CONFIG_USB_YUREX is not set
 CONFIG_USB_EZUSB_FX2=m
 # CONFIG_USB_HSIC_USB3503 is not set
+# CONFIG_USB_HSIC_USB4604 is not set
 # CONFIG_USB_LINK_LAYER_TEST is not set
 # CONFIG_USB_CHAOSKEY is not set
 # CONFIG_UCSI is not set
@@ -5159,9 +5296,11 @@ CONFIG_USB_EZUSB_FX2=m
 # USB Physical Layer drivers
 #
 CONFIG_USB_PHY=y
+# CONFIG_USB_OTG_WAKELOCK is not set
 CONFIG_NOP_USB_XCEIV=m
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_ISP1301 is not set
+# CONFIG_DUAL_ROLE_USB_INTF is not set
 CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
 CONFIG_USB_GADGET_DEBUG_FILES=y
@@ -5188,10 +5327,30 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_GADGET_XILINX is not set
 # CONFIG_USB_DUMMY_HCD is not set
 CONFIG_USB_LIBCOMPOSITE=y
-CONFIG_USB_F_UVC=m
 CONFIG_USB_F_FS=y
+CONFIG_USB_F_UVC=m
 CONFIG_USB_CONFIGFS=y
+# CONFIG_USB_CONFIGFS_SERIAL is not set
+# CONFIG_USB_CONFIGFS_ACM is not set
+# CONFIG_USB_CONFIGFS_OBEX is not set
+# CONFIG_USB_CONFIGFS_NCM is not set
+# CONFIG_USB_CONFIGFS_ECM is not set
+# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
+# CONFIG_USB_CONFIGFS_RNDIS is not set
+# CONFIG_USB_CONFIGFS_EEM is not set
+# CONFIG_USB_CONFIGFS_PHONET is not set
+# CONFIG_USB_CONFIGFS_MASS_STORAGE is not set
+# CONFIG_USB_CONFIGFS_F_LB_SS is not set
 CONFIG_USB_CONFIGFS_F_FS=y
+# CONFIG_USB_CONFIGFS_F_MTP is not set
+# CONFIG_USB_CONFIGFS_F_ACC is not set
+# CONFIG_USB_CONFIGFS_UEVENT is not set
+# CONFIG_USB_CONFIGFS_F_UAC1 is not set
+# CONFIG_USB_CONFIGFS_F_UAC2 is not set
+# CONFIG_USB_CONFIGFS_F_MIDI is not set
+# CONFIG_USB_CONFIGFS_F_HID is not set
+# CONFIG_USB_CONFIGFS_F_UVC is not set
+# CONFIG_USB_CONFIGFS_F_PRINTER is not set
 # CONFIG_USB_ZERO is not set
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_ETH is not set
@@ -5209,24 +5368,15 @@ CONFIG_USB_CONFIGFS_F_FS=y
 # CONFIG_USB_G_HID is not set
 # CONFIG_USB_G_DBGP is not set
 CONFIG_USB_G_WEBCAM=m
-
-#
-# USB PD and Type-C drivers
-#
-CONFIG_TYPEC=y
-CONFIG_USB_PD_SINK=y
-CONFIG_TYPEC_WCOVE=y
-
 # CONFIG_USB_LED_TRIG is not set
+# CONFIG_USB_ULPI_BUS is not set
 # CONFIG_UWB is not set
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 CONFIG_PWRSEQ_EMMC=y
 CONFIG_PWRSEQ_SIMPLE=y
-
-#
-# MMC/SD/SDIO Card Drivers
-#
+# CONFIG_MMC_EMBEDDED_SDIO is not set
+# CONFIG_MMC_PARANOID_SD_INIT is not set
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_BLOCK_BOUNCE=y
@@ -5243,6 +5393,7 @@ CONFIG_MMC_SDHCI_ACPI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 # CONFIG_MMC_SDHCI_OF_ARASAN is not set
 # CONFIG_MMC_SDHCI_OF_AT91 is not set
+# CONFIG_MMC_SDHCI_CADENCE is not set
 CONFIG_MMC_SDHCI_F_SDH30=m
 CONFIG_MMC_WBSD=m
 CONFIG_MMC_TIFM_SD=m
@@ -5309,6 +5460,7 @@ CONFIG_LEDS_GPIO=m
 # CONFIG_LEDS_TLC591XX is not set
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_MENF21BMC is not set
+# CONFIG_LEDS_IS31FL319X is not set
 # CONFIG_LEDS_IS31FL32XX is not set
 
 #
@@ -5316,6 +5468,9 @@ CONFIG_LEDS_GPIO=m
 #
 # CONFIG_LEDS_BLINKM is not set
 # CONFIG_LEDS_SYSCON is not set
+# CONFIG_LEDS_MLXCPLD is not set
+# CONFIG_LEDS_USER is not set
+# CONFIG_LEDS_NIC78BX is not set
 
 #
 # LED Triggers
@@ -5368,6 +5523,7 @@ CONFIG_RTC_DRV_ABB5ZES3=m
 # CONFIG_RTC_DRV_ABX80X is not set
 CONFIG_RTC_DRV_DS1307=m
 CONFIG_RTC_DRV_DS1307_HWMON=y
+# CONFIG_RTC_DRV_DS1307_CENTURY is not set
 CONFIG_RTC_DRV_DS1374=m
 # CONFIG_RTC_DRV_DS1374_WDT is not set
 CONFIG_RTC_DRV_DS1672=m
@@ -5377,7 +5533,6 @@ CONFIG_RTC_DRV_MAX8907=m
 CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_ISL1208=m
 CONFIG_RTC_DRV_ISL12022=m
-# CONFIG_RTC_DRV_ISL12057 is not set
 CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_PCF8523=m
 CONFIG_RTC_DRV_PCF85063=m
@@ -5455,6 +5610,7 @@ CONFIG_RTC_DRV_V3020=m
 #
 # CONFIG_RTC_DRV_SNVS is not set
 # CONFIG_RTC_DRV_MT6397 is not set
+# CONFIG_RTC_DRV_R7301 is not set
 
 #
 # HID Sensor RTC drivers
@@ -5474,9 +5630,9 @@ CONFIG_DMA_OF=y
 CONFIG_INTEL_IOATDMA=m
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_HIDMA is not set
-CONFIG_DW_DMAC_CORE=m
+CONFIG_DW_DMAC_CORE=y
 CONFIG_DW_DMAC=m
-CONFIG_DW_DMAC_PCI=m
+CONFIG_DW_DMAC_PCI=y
 
 #
 # DMA Clients
@@ -5488,6 +5644,8 @@ CONFIG_DMA_ENGINE_RAID=y
 #
 # DMABUF options
 #
+CONFIG_SYNC_FILE=y
+CONFIG_SW_SYNC=y
 CONFIG_DCA=m
 # CONFIG_AUXDISPLAY is not set
 CONFIG_UIO=m
@@ -5500,6 +5658,7 @@ CONFIG_UIO=m
 # CONFIG_UIO_NETX is not set
 # CONFIG_UIO_PRUSS is not set
 # CONFIG_UIO_MF624 is not set
+# CONFIG_UIO_HV_GENERIC is not set
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VIRTIO=y
 
@@ -5520,7 +5679,6 @@ CONFIG_HYPERV=y
 CONFIG_HYPERV_UTILS=m
 CONFIG_HYPERV_BALLOON=m
 CONFIG_STAGING=y
-CONFIG_SLICOSS=m
 CONFIG_PRISM2_USB=m
 CONFIG_COMEDI=m
 # CONFIG_COMEDI_DEBUG is not set
@@ -5542,13 +5700,6 @@ CONFIG_RTL8192E=m
 CONFIG_R8712U=m
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
-CONFIG_R8723AU=m
-CONFIG_8723AU_AP_MODE=y
-CONFIG_8723AU_BT_COEXIST=y
-CONFIG_RTL8723BS=m
-CONFIG_RTL8723BU=m
-CONFIG_RTL8821AU=m
-CONFIG_WLAN_SDIO=y
 CONFIG_RTS5208=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
@@ -5564,7 +5715,6 @@ CONFIG_ADIS16201=m
 CONFIG_ADIS16203=m
 CONFIG_ADIS16209=m
 CONFIG_ADIS16240=m
-CONFIG_SCA3000=m
 
 #
 # Analog to digital converters
@@ -5608,9 +5758,7 @@ CONFIG_ADIS16060=m
 #
 # Light sensors
 #
-CONFIG_SENSORS_ISL29018=m
 CONFIG_SENSORS_ISL29028=m
-CONFIG_TSL2583=m
 CONFIG_TSL2x7x=m
 
 #
@@ -5641,9 +5789,7 @@ CONFIG_FB_XGI=m
 # CONFIG_SPEAKUP is not set
 CONFIG_STAGING_MEDIA=y
 # CONFIG_I2C_BCM2048 is not set
-# CONFIG_MEDIA_CEC is not set
 CONFIG_DVB_CXD2099=m
-# CONFIG_VIDEO_TW686X_KH is not set
 # CONFIG_LIRC_STAGING is not set
 
 #
@@ -5651,7 +5797,9 @@ CONFIG_DVB_CXD2099=m
 #
 CONFIG_ASHMEM=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
+CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
 # CONFIG_ION is not set
+# CONFIG_FIQ_WATCHDOG is not set
 # CONFIG_STAGING_BOARD is not set
 # CONFIG_LTE_GDM724X is not set
 # CONFIG_MTD_SPINAND_MT29F is not set
@@ -5666,6 +5814,7 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 # CONFIG_WILC1000_SPI is not set
 # CONFIG_MOST is not set
 # CONFIG_KS7010 is not set
+# CONFIG_GREYBUS is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -5688,6 +5837,7 @@ CONFIG_COMPAL_LAPTOP=m
 CONFIG_SONY_LAPTOP=m
 CONFIG_SONYPI_COMPAT=y
 CONFIG_IDEAPAD_LAPTOP=m
+# CONFIG_SURFACE3_WMI is not set
 CONFIG_THINKPAD_ACPI=m
 CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
 # CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
@@ -5724,8 +5874,12 @@ CONFIG_INTEL_RST=m
 CONFIG_INTEL_SMARTCONNECT=m
 CONFIG_PVPANIC=m
 CONFIG_INTEL_PMC_IPC=y
+# CONFIG_INTEL_BXTWC_PMIC_TMU is not set
 CONFIG_SURFACE_PRO3_BUTTON=m
+# CONFIG_SURFACE_3_BUTTON is not set
 # CONFIG_INTEL_PUNIT_IPC is not set
+# CONFIG_MLX_PLATFORM is not set
+# CONFIG_MLX_CPLD_PLATFORM is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
 # CONFIG_CHROMEOS_PSTORE is not set
@@ -5751,7 +5905,13 @@ CONFIG_COMMON_CLK=y
 # CONFIG_COMMON_CLK_PWM is not set
 # CONFIG_COMMON_CLK_PXA is not set
 # CONFIG_COMMON_CLK_PIC32 is not set
-# CONFIG_SUNXI_CCU is not set
+# CONFIG_COMMON_CLK_MT2701 is not set
+# CONFIG_COMMON_CLK_MT2701_MMSYS is not set
+# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set
+# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set
+# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set
+# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set
+# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set
 
 #
 # Hardware Spinlock drivers
@@ -5768,7 +5928,11 @@ CONFIG_CLKBLD_I8253=y
 # CONFIG_SH_TIMER_MTU2 is not set
 # CONFIG_SH_TIMER_TMU is not set
 # CONFIG_EM_TIMER_STI is not set
-# CONFIG_MAILBOX is not set
+CONFIG_MAILBOX=y
+# CONFIG_PLATFORM_MHU is not set
+CONFIG_PCC=y
+# CONFIG_ALTERA_MBOX is not set
+# CONFIG_MAILBOX_TEST is not set
 CONFIG_IOMMU_SUPPORT=y
 
 #
@@ -5781,7 +5945,7 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # Remoteproc drivers
 #
-# CONFIG_STE_MODEM_RPROC is not set
+# CONFIG_REMOTEPROC is not set
 
 #
 # Rpmsg drivers
@@ -5820,6 +5984,7 @@ CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_ARIZONA=m
 CONFIG_EXTCON_GPIO=m
 # CONFIG_EXTCON_MAX3355 is not set
+# CONFIG_EXTCON_QCOM_SPMI_MISC is not set
 CONFIG_EXTCON_RT8973A=m
 CONFIG_EXTCON_SM5502=m
 CONFIG_EXTCON_USB_GPIO=m
@@ -5843,12 +6008,20 @@ CONFIG_BMA180=m
 CONFIG_BMC150_ACCEL=m
 CONFIG_BMC150_ACCEL_I2C=m
 CONFIG_BMC150_ACCEL_SPI=m
+# CONFIG_DA280 is not set
+# CONFIG_DA311 is not set
+# CONFIG_DMARD06 is not set
+# CONFIG_DMARD09 is not set
+# CONFIG_DMARD10 is not set
 CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_IIO_ST_ACCEL_3AXIS=m
 CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
 CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
 CONFIG_KXSD9=m
+CONFIG_KXSD9_SPI=m
+CONFIG_KXSD9_I2C=m
 CONFIG_KXCJK1013=m
+# CONFIG_MC3230 is not set
 # CONFIG_MMA7455_I2C is not set
 # CONFIG_MMA7455_SPI is not set
 # CONFIG_MMA7660 is not set
@@ -5858,6 +6031,7 @@ CONFIG_MMA9551=m
 CONFIG_MMA9553=m
 CONFIG_MXC4005=m
 # CONFIG_MXC6255 is not set
+CONFIG_SCA3000=m
 CONFIG_STK8312=m
 CONFIG_STK8BA50=m
 
@@ -5869,14 +6043,17 @@ CONFIG_AD_SIGMA_DELTA=m
 # CONFIG_AD7291 is not set
 # CONFIG_AD7298 is not set
 # CONFIG_AD7476 is not set
+# CONFIG_AD7766 is not set
 # CONFIG_AD7791 is not set
 # CONFIG_AD7793 is not set
 # CONFIG_AD7887 is not set
 # CONFIG_AD7923 is not set
 # CONFIG_AD799X is not set
 # CONFIG_CC10001_ADC is not set
+# CONFIG_ENVELOPE_DETECTOR is not set
 # CONFIG_HI8435 is not set
 # CONFIG_INA2XX_ADC is not set
+# CONFIG_LTC2485 is not set
 # CONFIG_MAX1027 is not set
 # CONFIG_MAX1363 is not set
 # CONFIG_MCP320X is not set
@@ -5884,7 +6061,9 @@ CONFIG_AD_SIGMA_DELTA=m
 # CONFIG_NAU7802 is not set
 # CONFIG_TI_ADC081C is not set
 # CONFIG_TI_ADC0832 is not set
+# CONFIG_TI_ADC12138 is not set
 # CONFIG_TI_ADC128S052 is not set
+# CONFIG_TI_ADC161S626 is not set
 # CONFIG_TI_ADS1015 is not set
 # CONFIG_TI_ADS8688 is not set
 # CONFIG_VF610_ADC is not set
@@ -5900,6 +6079,7 @@ CONFIG_AD_SIGMA_DELTA=m
 # CONFIG_ATLAS_PH_SENSOR is not set
 # CONFIG_IAQCORE is not set
 # CONFIG_VZ89X is not set
+# CONFIG_IIO_CROS_EC_SENSORS_CORE is not set
 
 #
 # Hid Sensor IIO Common
@@ -5917,6 +6097,10 @@ CONFIG_IIO_ST_SENSORS_I2C=m
 CONFIG_IIO_ST_SENSORS_SPI=m
 CONFIG_IIO_ST_SENSORS_CORE=m
 
+#
+# Counters
+#
+
 #
 # Digital to analog converters
 #
@@ -5936,6 +6120,8 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_AD5764 is not set
 # CONFIG_AD5791 is not set
 # CONFIG_AD7303 is not set
+# CONFIG_AD8801 is not set
+# CONFIG_DPOT_DAC is not set
 # CONFIG_M62332 is not set
 # CONFIG_MAX517 is not set
 # CONFIG_MAX5821 is not set
@@ -5995,6 +6181,7 @@ CONFIG_ITG3200=m
 # CONFIG_AM2315 is not set
 CONFIG_DHT11=m
 CONFIG_HDC100X=m
+# CONFIG_HTS221 is not set
 CONFIG_HTU21=m
 CONFIG_SI7005=m
 CONFIG_SI7020=m
@@ -6027,6 +6214,7 @@ CONFIG_CM3232=m
 CONFIG_CM3323=m
 CONFIG_CM36651=m
 CONFIG_GP2AP020A00F=m
+CONFIG_SENSORS_ISL29018=m
 CONFIG_ISL29125=m
 CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_PROX=m
@@ -6037,10 +6225,12 @@ CONFIG_LTR501=m
 # CONFIG_MAX44000 is not set
 CONFIG_OPT3001=m
 CONFIG_PA12203001=m
+# CONFIG_SI1145 is not set
 CONFIG_STK3310=m
 CONFIG_TCS3414=m
 CONFIG_TCS3472=m
 CONFIG_SENSORS_TSL2563=m
+CONFIG_TSL2583=m
 CONFIG_TSL4531=m
 CONFIG_US5182D=m
 CONFIG_VCNL4000=m
@@ -6049,6 +6239,7 @@ CONFIG_VCNL4000=m
 #
 # Magnetometer sensors
 #
+# CONFIG_AK8974 is not set
 CONFIG_AK8975=m
 CONFIG_AK09911=m
 # CONFIG_BMC150_MAGN_I2C is not set
@@ -6084,9 +6275,16 @@ CONFIG_IIO_SYSFS_TRIGGER=m
 # CONFIG_MCP4531 is not set
 # CONFIG_TPL0102 is not set
 
+#
+# Digital potentiostats
+#
+# CONFIG_LMP91000 is not set
+
 #
 # Pressure sensors
 #
+# CONFIG_ABP060MG is not set
+# CONFIG_BMP280 is not set
 CONFIG_HID_SENSOR_PRESS=m
 # CONFIG_HP03 is not set
 # CONFIG_MPL115_I2C is not set
@@ -6101,6 +6299,7 @@ CONFIG_IIO_ST_PRESS_I2C=m
 CONFIG_IIO_ST_PRESS_SPI=m
 CONFIG_T5403=m
 # CONFIG_HP206C is not set
+# CONFIG_ZPA2326 is not set
 
 #
 # Lightning sensors
@@ -6116,6 +6315,7 @@ CONFIG_SX9500=m
 #
 # Temperature sensors
 #
+# CONFIG_MAXIM_THERMOCOUPLE is not set
 CONFIG_MLX90614=m
 CONFIG_TMP006=m
 CONFIG_TSYS01=m
@@ -6135,7 +6335,17 @@ CONFIG_IRQCHIP=y
 CONFIG_ARM_GIC_MAX_NR=1
 # CONFIG_IPACK_BUS is not set
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_ATH79 is not set
+# CONFIG_RESET_BERLIN is not set
+# CONFIG_RESET_LPC18XX is not set
+# CONFIG_RESET_MESON is not set
+# CONFIG_RESET_PISTACHIO is not set
+# CONFIG_RESET_SOCFPGA is not set
+# CONFIG_RESET_STM32 is not set
+# CONFIG_RESET_SUNXI is not set
 # CONFIG_TI_SYSCON_RESET is not set
+# CONFIG_RESET_ZYNQ is not set
+# CONFIG_RESET_TEGRA_BPMP is not set
 # CONFIG_FMC is not set
 
 #
@@ -6164,6 +6374,7 @@ CONFIG_THUNDERBOLT=m
 #
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDER_DEVICES="binder"
 # CONFIG_LIBNVDIMM is not set
 CONFIG_NVMEM=m
 # CONFIG_STM is not set
@@ -6177,6 +6388,7 @@ CONFIG_NVMEM=m
 #
 # Firmware Drivers
 #
+# CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_EDD is not set
 CONFIG_FIRMWARE_MEMMAP=y
 # CONFIG_DELL_RBU is not set
@@ -6195,11 +6407,17 @@ CONFIG_EFI_VARS=m
 CONFIG_EFI_ESRT=y
 CONFIG_EFI_VARS_PSTORE=m
 # CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
-CONFIG_EFI_RUNTIME_MAP=y
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_RUNTIME_WRAPPERS=y
 CONFIG_EFI_BOOTLOADER_CONTROL=m
 # CONFIG_EFI_CAPSULE_LOADER is not set
+# CONFIG_EFI_TEST is not set
+CONFIG_APPLE_PROPERTIES=y
+CONFIG_EFI_DEV_PATH_PARSER=y
+
+#
+# Tegra firmware driver
+#
 
 #
 # File systems
@@ -6262,7 +6480,7 @@ CONFIG_FSNOTIFY=y
 CONFIG_INOTIFY_USER=y
 # CONFIG_FANOTIFY is not set
 CONFIG_QUOTA=y
-# CONFIG_QUOTA_NETLINK_INTERFACE is not set
+CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_PRINT_QUOTA_WARNING=y
 # CONFIG_QUOTA_DEBUG is not set
 CONFIG_QUOTA_TREE=m
@@ -6315,12 +6533,15 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
-CONFIG_CONFIGFS_FS=m
+CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
+CONFIG_CONFIGFS_FS=y
 CONFIG_EFIVAR_FS=m
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ORANGEFS_FS is not set
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
+# CONFIG_ECRYPT_FS is not set
+# CONFIG_SDCARD_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set
@@ -6328,7 +6549,6 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_EFS_FS is not set
 # CONFIG_JFFS2_FS is not set
 # CONFIG_UBIFS_FS is not set
-# CONFIG_LOGFS is not set
 # CONFIG_CRAMFS is not set
 CONFIG_SQUASHFS=y
 # CONFIG_SQUASHFS_FILE_CACHE is not set
@@ -6379,9 +6599,11 @@ CONFIG_SUNRPC=m
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS is not set
 # CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_UPCALL is not set
 # CONFIG_CIFS_XATTR is not set
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_SMB2 is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
@@ -6448,6 +6670,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # printk and dmesg options
 #
 CONFIG_PRINTK_TIME=y
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_BOOT_PRINTK_DELAY is not set
 CONFIG_DYNAMIC_DEBUG=y
@@ -6473,6 +6696,7 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
+CONFIG_DEBUG_KERNEL=y
 
 #
 # Memory Debugging
@@ -6510,10 +6734,12 @@ CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
 # CONFIG_DETECT_HUNG_TASK is not set
 # CONFIG_WQ_WATCHDOG is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_ON_OOPS=y
+CONFIG_PANIC_ON_OOPS_VALUE=1
 CONFIG_PANIC_TIMEOUT=5
 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHED_INFO=y
+# CONFIG_PANIC_ON_RT_THROTTLING is not set
 CONFIG_SCHEDSTATS=y
 # CONFIG_SCHED_STACK_END_CHECK is not set
 # CONFIG_DEBUG_TIMEKEEPING is not set
@@ -6540,6 +6766,7 @@ CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_PI_LIST is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
+CONFIG_DEBUG_CREDENTIALS=y
 
 #
 # RCU Debugging
@@ -6558,13 +6785,10 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_NOTIFIER_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
-CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
@@ -6585,6 +6809,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_PREEMPT_TRACER is not set
 # CONFIG_SCHED_TRACER is not set
+# CONFIG_HWLAT_TRACER is not set
 # CONFIG_FTRACE_SYSCALLS is not set
 # CONFIG_TRACER_SNAPSHOT is not set
 CONFIG_BRANCH_PROFILE_NONE=y
@@ -6634,12 +6859,15 @@ CONFIG_TRACING_EVENTS_GPIO=y
 # CONFIG_TEST_UDELAY is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_TEST_STATIC_KEYS is not set
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+# CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set
 # CONFIG_UBSAN is not set
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
+CONFIG_STRICT_DEVMEM=y
 # CONFIG_IO_STRICT_DEVMEM is not set
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_EARLY_PRINTK=y
@@ -6676,22 +6904,42 @@ CONFIG_X86_DEBUG_FPU=y
 #
 # Security options
 #
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+# CONFIG_PERSISTENT_KEYRINGS is not set
+# CONFIG_BIG_KEYS is not set
+# CONFIG_ENCRYPTED_KEYS is not set
+# CONFIG_KEY_DH_OPERATIONS is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_SECURITY=y
 # CONFIG_SECURITYFS is not set
 CONFIG_SECURITY_NETWORK=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_PATH=y
 CONFIG_LSM_MMAP_MIN_ADDR=65536
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y
+CONFIG_HARDENED_USERCOPY=y
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
+CONFIG_SECURITY_SELINUX_DISABLE=y
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 # CONFIG_SECURITY_SMACK is not set
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_SECURITY_LOADPIN is not set
+CONFIG_SECURITY_YAMA=y
 CONFIG_INTEGRITY=y
+# CONFIG_INTEGRITY_SIGNATURE is not set
 CONFIG_INTEGRITY_AUDIT=y
 # CONFIG_IMA is not set
 # CONFIG_EVM is not set
+CONFIG_DEFAULT_SECURITY_SELINUX=y
+# CONFIG_DEFAULT_SECURITY_DAC is not set
+CONFIG_DEFAULT_SECURITY="selinux"
 CONFIG_XOR_BLOCKS=m
 CONFIG_CRYPTO=y
 
@@ -6710,8 +6958,10 @@ CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
-# CONFIG_CRYPTO_RSA is not set
+CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_RSA=y
 # CONFIG_CRYPTO_DH is not set
 # CONFIG_CRYPTO_ECDH is not set
 CONFIG_CRYPTO_MANAGER=y
@@ -6728,6 +6978,7 @@ CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_ABLK_HELPER=y
+CONFIG_CRYPTO_SIMD=m
 CONFIG_CRYPTO_GLUE_HELPER_X86=y
 
 #
@@ -6855,11 +7106,23 @@ CONFIG_CRYPTO_USER_API_HASH=m
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 # CONFIG_CRYPTO_USER_API_RNG is not set
 # CONFIG_CRYPTO_USER_API_AEAD is not set
+CONFIG_CRYPTO_HASH_INFO=y
 # CONFIG_CRYPTO_HW is not set
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
 
 #
 # Certificates for signature checking
 #
+CONFIG_MODULE_SIG_KEY="certs/signing_key.pem"
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
 CONFIG_HAVE_KVM=y
 # CONFIG_VIRTUALIZATION is not set
 CONFIG_BINARY_PRINTF=y
@@ -6918,6 +7181,7 @@ CONFIG_TEXTSEARCH_KMP=y
 CONFIG_TEXTSEARCH_BM=y
 CONFIG_TEXTSEARCH_FSM=y
 CONFIG_INTERVAL_TREE=y
+CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
@@ -6927,10 +7191,12 @@ CONFIG_DQL=y
 CONFIG_GLOB=y
 # CONFIG_GLOB_SELFTEST is not set
 CONFIG_NLATTR=y
-CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+CONFIG_CLZ_TAB=y
 CONFIG_CORDIC=m
 # CONFIG_DDR is not set
 # CONFIG_IRQ_POLL is not set
+CONFIG_MPILIB=y
+CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
 CONFIG_FONT_SUPPORT=y
 CONFIG_FONTS=y
@@ -6951,94 +7217,5 @@ CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_ARCH_HAS_MMIO_FLUSH=y
-
-
-CONFIG_LOCALVERSION="-android_ia_64"
-CONFIG_DEFAULT_HOSTNAME="android_ia_64"
-CONFIG_SYNC_FILE=y
-CONFIG_SYNC=y
-CONFIG_SW_SYNC=y
-CONFIG_SW_SYNC_USER=y
-CONFIG_DEFAULT_SECURITY_SELINUX=y
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_DEFAULT_SECURITY="selinux"
-CONFIG_SECURITY_SELINUX=y
-CONFIG_SECURITY_PATH=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM=y
-CONFIG_SECURITY_SELINUX_DISABLE=y
-CONFIG_SECURITY_SELINUX_DEVELOP=y
-CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
-CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
-CONFIG_X86=n
-
-# Make sure kernel page tables have safe permissions.
-CONFIG_DEBUG_KERNEL=y
-
-# Blocks direct physical memory access.
-CONFIG_STRICT_DEVMEM=y
-
-# Provides some protections against SYN flooding.
-CONFIG_SYN_COOKIES=y
-
-# Perform additional validation of credentials.
-CONFIG_DEBUG_CREDENTIALS=y
-
-# Provide userspace with seccomp BPF API for syscall attack surface reduction.
-CONFIG_SECCOMP_FILTER=y
-
-# Randomize allocator freelists.
-CONFIG_SLAB_FREELIST_RANDOM=y
-
-# Allow allocator validation checking to be enabled.
-CONFIG_SLUB_DEBUG=y
-
-# Dangerous; allows direct physical memory writing.
-# CONFIG_ACPI_CUSTOM_METHOD is not set
-
-# Dangerous; disables brk ASLR.
-# CONFIG_COMPAT_BRK is not set
-
-# Dangerous; disables VDSO ASLR.
-# CONFIG_COMPAT_VDSO is not set
-
-# Dangerous; allows replacement of running kernel.
-# CONFIG_KEXEC is not set
-
-# Dangerous; allows replacement of running kernel.
-# CONFIG_HIBERNATION is not set
-
-# Prior to v4.1, assists heap memory attacks; best to keep interface disabled.
-# CONFIG_INET_DIAG is not set
-
-# Easily confused by misconfigured userspace, keep off.
-# CONFIG_BINFMT_MISC is not set
-
-# Reboot devices immediately if kernel experiences an Oops.
-CONFIG_PANIC_ON_OOPS=y
-
-# Disallow allocating the first 64k of memory.
-CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
-
-# Randomize position of kernel and memory.
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_RANDOMIZE_MEMORY=y
-
-# Perform usercopy bounds checking.
-CONFIG_HARDENED_USERCOPY=y
-
-# Use -fstack-protector-strong (gcc 4.9+) for best stack canary coverage.
-CONFIG_CC_STACKPROTECTOR=y
-CONFIG_CC_STACKPROTECTOR_STRONG=y
-
-# Provide userspace with ptrace ancestry protections.
-CONFIG_SECURITY=y
-CONFIG_SECURITY_YAMA=y
-
-# If we build using modules, they must be signed with a per-build key.
-CONFIG_MODULE_SIG=y
-CONFIG_MODULE_SIG_FORCE=y
-CONFIG_MODULE_SIG_ALL=y
-CONFIG_MODULE_SIG_SHA512=y
-CONFIG_MODULE_SIG_HASH="sha512"
-CONFIG_MODULE_SIG_KEY="certs/signing_key.pem"
+CONFIG_SBITMAP=y
+# CONFIG_PRIME_NUMBERS is not set

From f46673d463e1c4364d69118c317c561cf68c1af5 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Mon, 20 Feb 2017 16:00:51 +0530
Subject: [PATCH 005/427] Summary : Avoid copy of unused firmware binaries.

Fix  : Added support to copy only required list of (intel specific)
       firmware bins files/folders/patterns to system/vendor/firmware.

Jira : https://01.org/jira/browse/AIA-114

Test : Build boots to home screen. Wifi, & speaker
       working fine.

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 common/firmware.mk | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/common/firmware.mk b/common/firmware.mk
index 0a3c31b22..57d7d9b1f 100644
--- a/common/firmware.mk
+++ b/common/firmware.mk
@@ -14,7 +14,26 @@
 # limitations under the License.
 #
 
-LOCAL_FIRMWARES ?= $(filter-out $(FIRMWARE_FILTERS),$(subst ./,,$(shell cd $(FIRMWARES_DIR) && find . -type f)))
+## List of Firmware bin files to be copied
+
+LOCAL_FIRMWARE_SRC := \
+    i6050-fw-usb-1.5.sbcf \
+    i2400m-fw-usb-1.4.sbcf \
+    i2400m-fw-usb-1.5.sbcf
+
+## List of complete Firmware folders to be copied
+
+LOCAL_FIRMWARE_DIR := \
+    intel \
+    i915
+
+## List of matching patterns of Firmware bins to be copied
+
+LOCAL_FIRMWARE_PATTERN := \
+    iwlwifi
+
+LOCAL_FIRMWARE_SRC += $(foreach f,$(LOCAL_FIRMWARE_PATTERN),$(shell cd $(FIRMWARES_DIR) && find . -iname "*$(f)*" -type f ))
+LOCAL_FIRMWARE_SRC += $(foreach f,$(LOCAL_FIRMWARE_DIR),$(shell cd $(FIRMWARES_DIR) && find $(f) -type f) )
 
 PRODUCT_COPY_FILES := \
-    $(foreach f,$(LOCAL_FIRMWARES),$(FIRMWARES_DIR)/$(f):system/vendor/firmware/$(f))
+    $(foreach f,$(LOCAL_FIRMWARE_SRC),$(FIRMWARES_DIR)/$(f):system/vendor/firmware/$(f))

From 63d3f92863a5a623b57dcdbbdac45294257e2531 Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Wed, 22 Feb 2017 06:54:01 -0800
Subject: [PATCH 006/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/init.rc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index ab8dcfb7f..0dde5f878 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -6,6 +6,10 @@
 on early-init
     mount_all /fstab.${ro.hardware}
 
+on init
+    rm /dev/.coldboot_done
+    restart ueventd
+
 on fs
     mkdir /dev/pstore 0755 root system
     mount pstore pstore /dev/pstore

From 0d9546bbf1cce34f036cdaf8906182f42f4c76c5 Mon Sep 17 00:00:00 2001
From: Carlos Santa <carlos.santa@intel.com>
Date: Wed, 22 Feb 2017 10:09:26 -0800
Subject: [PATCH 007/427] Revert "Move to 4.10 config."

This change affects adb support on Joule board, let's revert for now.

This reverts commit 771cb5eee150ae3047a88baf6975de5711f3a768.
---
 kernel_config/kernel_64_defconfig | 637 +++++++++++-------------------
 1 file changed, 230 insertions(+), 407 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 93e2cfa03..4cbaca2be 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -1,10 +1,5 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.10.0 Kernel Configuration
-#
 CONFIG_64BIT=y
 CONFIG_X86_64=y
-CONFIG_X86=y
 CONFIG_INSTRUCTION_DECODER=y
 CONFIG_OUTPUT_FORMAT="elf64-x86-64"
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
@@ -45,7 +40,6 @@ CONFIG_PGTABLE_LEVELS=4
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
-CONFIG_THREAD_INFO_IN_TASK=y
 
 #
 # General setup
@@ -53,8 +47,6 @@ CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-android_ia_64"
-# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
@@ -67,7 +59,6 @@ CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_XZ is not set
 # CONFIG_KERNEL_LZO is not set
 # CONFIG_KERNEL_LZ4 is not set
-CONFIG_DEFAULT_HOSTNAME="android_ia_64"
 CONFIG_SWAP=y
 # CONFIG_SYSVIPC is not set
 # CONFIG_POSIX_MQUEUE is not set
@@ -120,7 +111,6 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
-# CONFIG_SCHED_WALT is not set
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 CONFIG_TASKSTATS=y
@@ -148,20 +138,19 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_CGROUPS=y
-CONFIG_CGROUP_DEBUG=y
-CONFIG_CGROUP_FREEZER=y
-# CONFIG_CGROUP_PIDS is not set
-# CONFIG_CGROUP_DEVICE is not set
-# CONFIG_CPUSETS is not set
-CONFIG_CGROUP_CPUACCT=y
 # CONFIG_MEMCG is not set
 # CONFIG_BLK_CGROUP is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_CFS_BANDWIDTH is not set
 CONFIG_RT_GROUP_SCHED=y
+# CONFIG_CGROUP_PIDS is not set
+CONFIG_CGROUP_FREEZER=y
+# CONFIG_CPUSETS is not set
+# CONFIG_CGROUP_DEVICE is not set
+CONFIG_CGROUP_CPUACCT=y
 # CONFIG_CGROUP_PERF is not set
-# CONFIG_SOCK_CGROUP_DATA is not set
+CONFIG_CGROUP_DEBUG=y
 # CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
@@ -169,8 +158,6 @@ CONFIG_NAMESPACES=y
 # CONFIG_PID_NS is not set
 # CONFIG_NET_NS is not set
 # CONFIG_SCHED_AUTOGROUP is not set
-# CONFIG_SCHED_TUNE is not set
-# CONFIG_DEFAULT_USE_ENERGY_AWARE is not set
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
@@ -181,7 +168,6 @@ CONFIG_RD_GZIP=y
 # CONFIG_RD_XZ is not set
 # CONFIG_RD_LZO is not set
 # CONFIG_RD_LZ4 is not set
-CONFIG_INITRAMFS_COMPRESSION=".gz"
 # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
@@ -196,7 +182,6 @@ CONFIG_MULTIUSER=y
 CONFIG_SGETMASK_SYSCALL=y
 CONFIG_SYSFS_SYSCALL=y
 CONFIG_SYSCTL_SYSCALL=y
-CONFIG_POSIX_TIMERS=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
@@ -228,14 +213,13 @@ CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_PERF_EVENTS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_COMPAT_BRK is not set
 CONFIG_SLAB=y
 # CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
-CONFIG_SLAB_FREELIST_RANDOM=y
-CONFIG_SYSTEM_DATA_VERIFICATION=y
+# CONFIG_SYSTEM_DATA_VERIFICATION is not set
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
+CONFIG_KEXEC_CORE=y
 CONFIG_OPROFILE=y
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 CONFIG_HAVE_OPROFILE=y
@@ -272,14 +256,9 @@ CONFIG_HAVE_CMPXCHG_DOUBLE=y
 CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGINS is not set
 CONFIG_HAVE_CC_STACKPROTECTOR=y
-CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_CC_STACKPROTECTOR_NONE is not set
-# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
-CONFIG_CC_STACKPROTECTOR_STRONG=y
 CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
@@ -302,8 +281,6 @@ CONFIG_HAVE_STACK_VALIDATION=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_COMPAT_OLD_SIGACTION=y
 # CONFIG_CPU_NO_EFFICIENT_FFS is not set
-CONFIG_HAVE_ARCH_VMAP_STACK=y
-CONFIG_VMAP_STACK=y
 
 #
 # GCOV-based kernel profiling
@@ -320,24 +297,13 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
-CONFIG_MODULE_SIG=y
-CONFIG_MODULE_SIG_FORCE=y
-CONFIG_MODULE_SIG_ALL=y
-# CONFIG_MODULE_SIG_SHA1 is not set
-# CONFIG_MODULE_SIG_SHA224 is not set
-# CONFIG_MODULE_SIG_SHA256 is not set
-# CONFIG_MODULE_SIG_SHA384 is not set
-CONFIG_MODULE_SIG_SHA512=y
-CONFIG_MODULE_SIG_HASH="sha512"
 # CONFIG_MODULE_COMPRESS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_BLK_DEV_BSGLIB is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
-# CONFIG_BLK_DEV_ZONED is not set
 # CONFIG_BLK_CMDLINE_PARSER is not set
-# CONFIG_BLK_WBT is not set
 
 #
 # Partition Types
@@ -363,7 +329,6 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_BLOCK_COMPAT=y
-CONFIG_BLK_MQ_PCI=y
 
 #
 # IO Schedulers
@@ -375,7 +340,6 @@ CONFIG_IOSCHED_CFQ=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_ASN1=y
 CONFIG_UNINLINE_SPIN_UNLOCK=y
 CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
@@ -397,7 +361,6 @@ CONFIG_X86_FAST_FEATURE_TESTS=y
 # CONFIG_X86_X2APIC is not set
 CONFIG_X86_MPPARSE=y
 # CONFIG_GOLDFISH is not set
-# CONFIG_INTEL_RDT_A is not set
 CONFIG_X86_EXTENDED_PLATFORM=y
 # CONFIG_X86_VSMP is not set
 # CONFIG_X86_GOLDFISH is not set
@@ -438,7 +401,6 @@ CONFIG_IOMMU_HELPER=y
 CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
-CONFIG_SCHED_MC_PRIO=y
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
@@ -504,7 +466,6 @@ CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 # CONFIG_MEMORY_FAILURE is not set
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
@@ -542,20 +503,14 @@ CONFIG_SECCOMP=y
 CONFIG_HZ_1000=y
 CONFIG_HZ=1000
 CONFIG_SCHED_HRTICK=y
-# CONFIG_KEXEC is not set
 # CONFIG_KEXEC_FILE is not set
 # CONFIG_CRASH_DUMP is not set
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_RELOCATABLE=y
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_X86_NEED_RELOCS=y
 CONFIG_PHYSICAL_ALIGN=0x200000
-CONFIG_RANDOMIZE_MEMORY=y
-CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0x0
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_COMPAT_VDSO is not set
 # CONFIG_LEGACY_VSYSCALL_NATIVE is not set
 CONFIG_LEGACY_VSYSCALL_EMULATE=y
 # CONFIG_LEGACY_VSYSCALL_NONE is not set
@@ -571,7 +526,6 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 # CONFIG_SUSPEND_SKIP_SYNC is not set
-# CONFIG_HIBERNATION is not set
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_AUTOSLEEP=y
@@ -606,7 +560,6 @@ CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_CPU_FREQ_PSS=y
 CONFIG_ACPI_PROCESSOR_CSTATE=y
 CONFIG_ACPI_PROCESSOR_IDLE=y
-CONFIG_ACPI_CPPC_LIB=y
 CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_PROCESSOR_AGGREGATOR=y
@@ -621,7 +574,6 @@ CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_HOTPLUG_IOAPIC=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_HED=m
-# CONFIG_ACPI_CUSTOM_METHOD is not set
 # CONFIG_ACPI_BGRT is not set
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
 # CONFIG_ACPI_NFIT is not set
@@ -647,13 +599,13 @@ CONFIG_CPU_FREQ_STAT_DETAILS=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHED is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-# CONFIG_CPU_FREQ_GOV_SCHED is not set
+# CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set
 
 #
 # CPU frequency scaling drivers
@@ -682,6 +634,11 @@ CONFIG_CPU_IDLE_GOV_MENU=y
 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 CONFIG_INTEL_IDLE=y
 
+#
+# Memory power savings
+#
+# CONFIG_I7300_IDLE is not set
+
 #
 # Bus options (PCI etc.)
 #
@@ -702,7 +659,6 @@ CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 # CONFIG_PCIE_DPC is not set
-# CONFIG_PCIE_PTM is not set
 CONFIG_PCI_BUS_ADDR_T_64BIT=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
@@ -725,7 +681,6 @@ CONFIG_HOTPLUG_PCI_SHPC=m
 # PCI host controller drivers
 #
 # CONFIG_PCIE_DW_PLAT is not set
-# CONFIG_VMD is not set
 # CONFIG_ISA_BUS is not set
 CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
@@ -757,17 +712,15 @@ CONFIG_COMPAT_BINFMT_ELF=y
 CONFIG_ELFCORE=y
 CONFIG_BINFMT_SCRIPT=y
 # CONFIG_HAVE_AOUT is not set
-# CONFIG_BINFMT_MISC is not set
 CONFIG_COREDUMP=y
 CONFIG_IA32_EMULATION=y
 # CONFIG_IA32_AOUT is not set
 CONFIG_X86_X32=y
-CONFIG_COMPAT_32=y
 CONFIG_COMPAT=y
 CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
-CONFIG_KEYS_COMPAT=y
 CONFIG_X86_DEV_DMA_OPS=y
 CONFIG_PMC_ATOM=y
+# CONFIG_VMD is not set
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
@@ -804,7 +757,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_NET_IPGRE_DEMUX is not set
 CONFIG_NET_IP_TUNNEL=y
 # CONFIG_IP_MROUTE is not set
-CONFIG_SYN_COOKIES=y
 # CONFIG_NET_IPVTI is not set
 CONFIG_NET_UDP_TUNNEL=m
 # CONFIG_NET_FOU is not set
@@ -817,7 +769,9 @@ CONFIG_INET_TUNNEL=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 CONFIG_INET_XFRM_MODE_TUNNEL=y
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_DIAG is not set
+CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_DIAG_DESTROY=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
@@ -847,8 +801,6 @@ CONFIG_IPV6_TUNNEL=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
 # CONFIG_IPV6_SUBTREES is not set
 # CONFIG_IPV6_MROUTE is not set
-# CONFIG_IPV6_SEG6_LWTUNNEL is not set
-# CONFIG_IPV6_SEG6_HMAC is not set
 # CONFIG_NETLABEL is not set
 CONFIG_ANDROID_PARANOID_NETWORK=y
 CONFIG_NETWORK_SECMARK=y
@@ -868,7 +820,6 @@ CONFIG_NETFILTER_NETLINK=y
 CONFIG_NETFILTER_NETLINK_QUEUE=y
 CONFIG_NETFILTER_NETLINK_LOG=y
 CONFIG_NF_CONNTRACK=y
-# CONFIG_NF_LOG_NETDEV is not set
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_PROCFS=y
@@ -980,11 +931,11 @@ CONFIG_NETFILTER_XT_MATCH_POLICY=y
 # CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
 CONFIG_NETFILTER_XT_MATCH_QUOTA=y
-# CONFIG_NETFILTER_XT_MATCH_QUOTA2 is not set
 # CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
 # CONFIG_NETFILTER_XT_MATCH_REALM is not set
 # CONFIG_NETFILTER_XT_MATCH_RECENT is not set
 # CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+CONFIG_NETFILTER_XT_MATCH_SOCKET=y
 CONFIG_NETFILTER_XT_MATCH_STATE=y
 CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
 CONFIG_NETFILTER_XT_MATCH_STRING=y
@@ -999,7 +950,7 @@ CONFIG_NETFILTER_XT_MATCH_U32=y
 #
 CONFIG_NF_DEFRAG_IPV4=y
 CONFIG_NF_CONNTRACK_IPV4=y
-# CONFIG_NF_SOCKET_IPV4 is not set
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 # CONFIG_NF_DUP_IPV4 is not set
 # CONFIG_NF_LOG_ARP is not set
 # CONFIG_NF_LOG_IPV4 is not set
@@ -1036,7 +987,6 @@ CONFIG_IP_NF_ARP_MANGLE=y
 #
 CONFIG_NF_DEFRAG_IPV6=y
 CONFIG_NF_CONNTRACK_IPV6=y
-# CONFIG_NF_SOCKET_IPV6 is not set
 # CONFIG_NF_DUP_IPV6 is not set
 CONFIG_NF_REJECT_IPV6=y
 # CONFIG_NF_LOG_IPV6 is not set
@@ -1155,13 +1105,10 @@ CONFIG_NET_ACT_MIRRED=y
 # CONFIG_NET_ACT_VLAN is not set
 # CONFIG_NET_ACT_BPF is not set
 # CONFIG_NET_ACT_CONNMARK is not set
-# CONFIG_NET_ACT_SKBMOD is not set
 # CONFIG_NET_ACT_IFE is not set
-# CONFIG_NET_ACT_TUNNEL_KEY is not set
 # CONFIG_NET_CLS_IND is not set
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_DCB is not set
-# CONFIG_DNS_RESOLVER is not set
 # CONFIG_BATMAN_ADV is not set
 # CONFIG_OPENVSWITCH is not set
 # CONFIG_VSOCKETS is not set
@@ -1174,6 +1121,7 @@ CONFIG_NET_SCH_FIFO=y
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
+# CONFIG_SOCK_CGROUP_DATA is not set
 # CONFIG_CGROUP_NET_PRIO is not set
 # CONFIG_CGROUP_NET_CLASSID is not set
 CONFIG_NET_RX_BUSY_POLL=y
@@ -1224,7 +1172,6 @@ CONFIG_BT_HCIUART_INTEL=y
 CONFIG_BT_HCIUART_BCM=y
 CONFIG_BT_HCIUART_QCA=y
 # CONFIG_BT_HCIUART_AG6XX is not set
-# CONFIG_BT_HCIUART_MRVL is not set
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
@@ -1239,7 +1186,6 @@ CONFIG_BT_ATH3K=m
 CONFIG_BT_WILINK=m
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AF_KCM is not set
-# CONFIG_STREAM_PARSER is not set
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_EXT=y
@@ -1278,7 +1224,6 @@ CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
 CONFIG_WIMAX=m
 CONFIG_WIMAX_DEBUG_LEVEL=8
 CONFIG_RFKILL=y
-CONFIG_RFKILL_PM=y
 CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
 # CONFIG_RFKILL_REGULATOR is not set
@@ -1314,8 +1259,6 @@ CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
@@ -1325,7 +1268,7 @@ CONFIG_REGMAP_SPI=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_DMA_FENCE_TRACE is not set
+# CONFIG_FENCE_TRACE is not set
 
 #
 # Bus devices
@@ -1397,7 +1340,6 @@ CONFIG_MTD_CFI_I2=y
 # Disk-On-Chip Device Drivers
 #
 # CONFIG_MTD_DOCG3 is not set
-CONFIG_MTD_NAND_IDS=m
 CONFIG_MTD_NAND_ECC=m
 # CONFIG_MTD_NAND_ECC_SMC is not set
 CONFIG_MTD_NAND=m
@@ -1407,13 +1349,13 @@ CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_DENALI_DT is not set
 # CONFIG_MTD_NAND_GPIO is not set
 # CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set
+CONFIG_MTD_NAND_IDS=m
 # CONFIG_MTD_NAND_RICOH is not set
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_DOCG4 is not set
 # CONFIG_MTD_NAND_CAFE is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
-# CONFIG_MTD_NAND_OXNAS is not set
 # CONFIG_MTD_NAND_HISI504 is not set
 # CONFIG_MTD_NAND_MTK is not set
 CONFIG_MTD_ONENAND=m
@@ -1443,6 +1385,7 @@ CONFIG_OF_NET=y
 CONFIG_OF_MDIO=m
 CONFIG_OF_PCI=y
 CONFIG_OF_PCI_IRQ=y
+CONFIG_OF_MTD=y
 # CONFIG_OF_OVERLAY is not set
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 CONFIG_PARPORT=m
@@ -1515,7 +1458,6 @@ CONFIG_VIRTIO_BLK=y
 # CONFIG_BLK_DEV_RBD is not set
 # CONFIG_BLK_DEV_RSXX is not set
 # CONFIG_BLK_DEV_NVME is not set
-# CONFIG_NVME_FC is not set
 # CONFIG_NVME_TARGET is not set
 
 #
@@ -1538,12 +1480,16 @@ CONFIG_APDS9802ALS=m
 CONFIG_ISL29003=m
 CONFIG_ISL29020=m
 CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1780=m
 CONFIG_SENSORS_BH1770=m
 CONFIG_SENSORS_APDS990X=m
 CONFIG_HMC6352=m
 # CONFIG_DS1682 is not set
 # CONFIG_TI_DAC7512 is not set
 CONFIG_VMWARE_BALLOON=m
+CONFIG_BMP085=m
+CONFIG_BMP085_I2C=m
+CONFIG_BMP085_SPI=m
 CONFIG_USB_SWITCH_FSA9480=m
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 # CONFIG_SRAM is not set
@@ -1551,8 +1497,6 @@ CONFIG_PANEL=m
 CONFIG_PANEL_PARPORT=0
 CONFIG_PANEL_PROFILE=5
 # CONFIG_PANEL_CHANGE_MESSAGE is not set
-# CONFIG_UID_CPUTIME is not set
-# CONFIG_MEMORY_STATE_TIME is not set
 CONFIG_C2PORT=m
 CONFIG_C2PORT_DURAMAR_2150=m
 
@@ -1740,9 +1684,9 @@ CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_MEGARAID_SAS is not set
 # CONFIG_SCSI_MPT3SAS is not set
 # CONFIG_SCSI_MPT2SAS is not set
-# CONFIG_SCSI_SMARTPQI is not set
 CONFIG_SCSI_UFSHCD=y
 # CONFIG_SCSI_UFSHCD_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
 # CONFIG_SCSI_UFSHCD_PLATFORM is not set
 # CONFIG_SCSI_HPTIOP is not set
 # CONFIG_SCSI_BUSLOGIC is not set
@@ -1764,7 +1708,6 @@ CONFIG_HYPERV_STORAGE=y
 # CONFIG_SCSI_IPR is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
 # CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_QEDI is not set
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_AM53C974 is not set
 # CONFIG_SCSI_WD719X is not set
@@ -1884,7 +1827,7 @@ CONFIG_BLK_DEV_DM=y
 # CONFIG_DM_MQ_DEFAULT is not set
 CONFIG_DM_DEBUG=y
 CONFIG_DM_BUFIO=y
-# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
 CONFIG_DM_CRYPT=y
 # CONFIG_DM_SNAPSHOT is not set
 # CONFIG_DM_THIN_PROVISIONING is not set
@@ -1898,8 +1841,6 @@ CONFIG_DM_CRYPT=y
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_FLAKEY is not set
 CONFIG_DM_VERITY=y
-# CONFIG_DM_VERITY_HASH_PREFETCH_MIN_SIZE_128 is not set
-CONFIG_DM_VERITY_HASH_PREFETCH_MIN_SIZE=1
 CONFIG_DM_VERITY_FEC=y
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
@@ -1934,6 +1875,7 @@ CONFIG_NET_TEAM=m
 # CONFIG_NET_TEAM_MODE_LOADBALANCE is not set
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
+# CONFIG_IPVLAN is not set
 # CONFIG_VXLAN is not set
 # CONFIG_GENEVE is not set
 # CONFIG_GTP is not set
@@ -1978,21 +1920,17 @@ CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_NET_VENDOR_AGERE=y
 CONFIG_ET131X=m
-CONFIG_NET_VENDOR_ALACRITECH=y
-CONFIG_SLICOSS=m
 CONFIG_NET_VENDOR_ALTEON=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 CONFIG_ALTERA_TSE=m
-CONFIG_NET_VENDOR_AMAZON=y
-# CONFIG_ENA_ETHERNET is not set
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_AMD8111_ETH=m
 CONFIG_PCNET32=m
 CONFIG_PCMCIA_NMCLAN=m
-# CONFIG_AMD_XGBE is not set
-# CONFIG_AMD_XGBE_HAVE_ECC is not set
 CONFIG_NET_VENDOR_ARC=y
+# CONFIG_ARC_EMAC is not set
+# CONFIG_EMAC_ROCKCHIP is not set
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ATL2=m
 CONFIG_ATL1=m
@@ -2003,7 +1941,6 @@ CONFIG_NET_VENDOR_AURORA=y
 CONFIG_AURORA_NB8800=m
 CONFIG_NET_CADENCE=y
 CONFIG_MACB=m
-# CONFIG_MACB_PCI is not set
 CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_B44=m
 CONFIG_B44_PCI_AUTOSELECT=y
@@ -2022,9 +1959,7 @@ CONFIG_NET_VENDOR_CAVIUM=y
 CONFIG_THUNDER_NIC_PF=m
 # CONFIG_THUNDER_NIC_VF is not set
 CONFIG_THUNDER_NIC_BGX=m
-CONFIG_THUNDER_NIC_RGX=m
 CONFIG_LIQUIDIO=m
-# CONFIG_LIQUIDIO_VF is not set
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
@@ -2086,6 +2021,7 @@ CONFIG_NET_VENDOR_I825XX=y
 CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_MVMDIO=m
+# CONFIG_MVNETA_BM is not set
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
 # CONFIG_SKGE_GENESIS is not set
@@ -2099,10 +2035,7 @@ CONFIG_MLX5_CORE=m
 CONFIG_MLX5_CORE_EN=y
 CONFIG_MLXSW_CORE=m
 CONFIG_MLXSW_CORE_HWMON=y
-CONFIG_MLXSW_CORE_THERMAL=y
 CONFIG_MLXSW_PCI=m
-CONFIG_MLXSW_I2C=m
-CONFIG_MLXSW_MINIMAL=m
 CONFIG_NET_VENDOR_MICREL=y
 CONFIG_KS8842=m
 CONFIG_KS8851=m
@@ -2142,7 +2075,6 @@ CONFIG_QED=m
 CONFIG_QEDE=m
 CONFIG_NET_VENDOR_QUALCOMM=y
 # CONFIG_QCA7000 is not set
-# CONFIG_QCOM_EMAC is not set
 CONFIG_NET_VENDOR_REALTEK=y
 CONFIG_ATP=m
 CONFIG_8139CP=m
@@ -2164,12 +2096,10 @@ CONFIG_SC92031=m
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_SIS900=m
 CONFIG_SIS190=m
-CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
 CONFIG_SFC_MCDI_MON=y
 CONFIG_SFC_MCDI_LOGGING=y
-# CONFIG_SFC_FALCON is not set
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_PCMCIA_SMC91C92=m
 CONFIG_EPIC100=m
@@ -2211,52 +2141,46 @@ CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_NET_SB1000=m
 CONFIG_PHYLIB=m
 CONFIG_SWPHY=y
-# CONFIG_LED_TRIGGER_PHY is not set
-
-#
-# MDIO bus device drivers
-#
-# CONFIG_MDIO_BCM_UNIMAC is not set
-CONFIG_MDIO_BITBANG=m
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-CONFIG_MDIO_CAVIUM=m
-CONFIG_MDIO_GPIO=m
-# CONFIG_MDIO_HISI_FEMAC is not set
-CONFIG_MDIO_OCTEON=m
-CONFIG_MDIO_THUNDER=m
 
 #
 # MII PHY device drivers
 #
-CONFIG_AMD_PHY=m
 # CONFIG_AQUANTIA_PHY is not set
 CONFIG_AT803X_PHY=m
-CONFIG_BCM7XXX_PHY=m
-CONFIG_BCM87XX_PHY=m
+CONFIG_AMD_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+# CONFIG_TERANETICS_PHY is not set
+CONFIG_SMSC_PHY=m
 CONFIG_BCM_NET_PHYLIB=m
 CONFIG_BROADCOM_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_DAVICOM_PHY=m
-# CONFIG_DP83848_PHY is not set
-# CONFIG_DP83867_PHY is not set
-CONFIG_FIXED_PHY=m
+CONFIG_BCM7XXX_PHY=m
+CONFIG_BCM87XX_PHY=m
 CONFIG_ICPLUS_PHY=m
-# CONFIG_INTEL_XWAY_PHY is not set
+CONFIG_REALTEK_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_STE10XP=m
 CONFIG_LSI_ET1011C_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_MARVELL_PHY=m
 CONFIG_MICREL_PHY=m
+# CONFIG_DP83848_PHY is not set
+# CONFIG_DP83867_PHY is not set
 CONFIG_MICROCHIP_PHY=m
-# CONFIG_MICROSEMI_PHY is not set
-CONFIG_NATIONAL_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_STE10XP=m
-# CONFIG_TERANETICS_PHY is not set
-CONFIG_VITESSE_PHY=m
-# CONFIG_XILINX_GMII2RGMII is not set
+CONFIG_FIXED_PHY=m
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_GPIO=m
+CONFIG_MDIO_CAVIUM=m
+CONFIG_MDIO_OCTEON=m
+CONFIG_MDIO_THUNDER=m
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MDIO_BCM_UNIMAC is not set
+# CONFIG_INTEL_XWAY_PHY is not set
+# CONFIG_MDIO_HISI_FEMAC is not set
+# CONFIG_MDIO_XGENE is not set
 CONFIG_MICREL_KS8995MA=m
 CONFIG_PLIP=m
 CONFIG_PPP=m
@@ -2267,8 +2191,6 @@ CONFIG_PPP_MPPE=m
 CONFIG_PPP_MULTILINK=y
 CONFIG_PPPOE=m
 CONFIG_PPPOL2TP=m
-# CONFIG_PPPOLAC is not set
-# CONFIG_PPPOPNS is not set
 CONFIG_PPP_ASYNC=m
 CONFIG_PPP_SYNC_TTY=m
 CONFIG_SLIP=m
@@ -2321,7 +2243,6 @@ CONFIG_USB_SIERRA_NET=m
 CONFIG_USB_VL600=m
 CONFIG_USB_NET_CH9200=m
 CONFIG_WLAN=y
-# CONFIG_WIRELESS_WDS is not set
 CONFIG_WLAN_VENDOR_ADMTEK=y
 CONFIG_ADM8211=m
 CONFIG_ATH_COMMON=m
@@ -2412,6 +2333,7 @@ CONFIG_BRCMFMAC_USB=y
 CONFIG_BRCMFMAC_PCIE=y
 # CONFIG_BRCM_TRACING is not set
 # CONFIG_BRCMDBG is not set
+CONFIG_WL=m
 CONFIG_WLAN_VENDOR_CISCO=y
 CONFIG_AIRO=m
 CONFIG_AIRO_CS=m
@@ -2601,14 +2523,11 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_KEYRESET is not set
-# CONFIG_INPUT_KEYCOMBO is not set
 
 #
 # Input Device Drivers
 #
 CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ADC is not set
 # CONFIG_KEYBOARD_ADP5588 is not set
 # CONFIG_KEYBOARD_ADP5589 is not set
 CONFIG_KEYBOARD_ATKBD=m
@@ -2708,7 +2627,6 @@ CONFIG_TOUCHSCREEN_AD7879_I2C=m
 CONFIG_TOUCHSCREEN_AD7879_SPI=m
 # CONFIG_TOUCHSCREEN_AR1021_I2C is not set
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
 CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
 CONFIG_TOUCHSCREEN_BU21013=m
 CONFIG_TOUCHSCREEN_CHIPONE_ICN8318=m
@@ -2724,11 +2642,11 @@ CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 CONFIG_TOUCHSCREEN_EETI=m
 CONFIG_TOUCHSCREEN_EGALAX=m
 # CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
+CONFIG_TOUCHSCREEN_FT6236=m
 CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GOODIX=m
 CONFIG_TOUCHSCREEN_ILI210X=m
 CONFIG_TOUCHSCREEN_GUNZE=m
-# CONFIG_TOUCHSCREEN_EKTF2127 is not set
 CONFIG_TOUCHSCREEN_ELAN=m
 CONFIG_TOUCHSCREEN_ELO=m
 CONFIG_TOUCHSCREEN_WACOM_W8001=m
@@ -2803,10 +2721,8 @@ CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_GP2A=m
 # CONFIG_INPUT_GPIO_BEEPER is not set
 CONFIG_INPUT_GPIO_TILT_POLLED=m
-# CONFIG_INPUT_GPIO_DECODER is not set
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_ATI_REMOTE2=m
-# CONFIG_INPUT_KEYCHORD is not set
 CONFIG_INPUT_KEYSPAN_REMOTE=m
 CONFIG_INPUT_KXTJ9=m
 # CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
@@ -2816,7 +2732,6 @@ CONFIG_INPUT_CM109=m
 CONFIG_INPUT_REGULATOR_HAPTIC=m
 CONFIG_INPUT_TPS65218_PWRBUTTON=m
 CONFIG_INPUT_UINPUT=y
-# CONFIG_INPUT_GPIO is not set
 CONFIG_INPUT_PCF8574=m
 # CONFIG_INPUT_PWM_BEEPER is not set
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
@@ -2828,6 +2743,7 @@ CONFIG_INPUT_CMA3000=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
 CONFIG_INPUT_SOC_BUTTON_ARRAY=m
+CONFIG_INPUT_SURFACE3_BUTTON_ARRAY=m
 CONFIG_INPUT_DRV260X_HAPTICS=m
 CONFIG_INPUT_DRV2665_HAPTICS=m
 CONFIG_INPUT_DRV2667_HAPTICS=m
@@ -2899,7 +2815,6 @@ CONFIG_SERIAL_8250_RSA=y
 # CONFIG_SERIAL_8250_FSL is not set
 CONFIG_SERIAL_8250_DW=m
 # CONFIG_SERIAL_8250_RT288X is not set
-CONFIG_SERIAL_8250_LPSS=y
 # CONFIG_SERIAL_8250_MID is not set
 # CONFIG_SERIAL_8250_MOXA is not set
 # CONFIG_SERIAL_OF_PLATFORM is not set
@@ -2923,6 +2838,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_RP2 is not set
 # CONFIG_SERIAL_FSL_LPUART is not set
 # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
+CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_TTY_PRINTK is not set
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
@@ -2946,7 +2862,6 @@ CONFIG_NVRAM=m
 # CONFIG_SYNCLINK_CS is not set
 # CONFIG_CARDMAN_4000 is not set
 # CONFIG_CARDMAN_4040 is not set
-# CONFIG_SCR24X is not set
 # CONFIG_IPWIRELESS is not set
 # CONFIG_MWAVE is not set
 CONFIG_RAW_DRIVER=m
@@ -2979,10 +2894,9 @@ CONFIG_I2C_MUX_PCA954x=m
 CONFIG_I2C_MUX_PINCTRL=m
 CONFIG_I2C_MUX_REG=m
 # CONFIG_I2C_DEMUX_PINCTRL is not set
-# CONFIG_I2C_MUX_MLXCPLD is not set
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
-CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_ALGOBIT=m
 CONFIG_I2C_ALGOPCA=m
 
 #
@@ -3045,7 +2959,6 @@ CONFIG_I2C_TINY_USB=m
 #
 # Other I2C/SMBus bus drivers
 #
-# CONFIG_I2C_MLXCPLD is not set
 CONFIG_I2C_CROS_EC_TUNNEL=m
 # CONFIG_I2C_STUB is not set
 CONFIG_I2C_SLAVE=y
@@ -3127,13 +3040,13 @@ CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
 CONFIG_PINCTRL_AMD=y
 CONFIG_PINCTRL_SINGLE=m
-# CONFIG_PINCTRL_SX150X is not set
 CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_CHERRYVIEW=y
 CONFIG_PINCTRL_INTEL=m
 CONFIG_PINCTRL_BROXTON=m
 CONFIG_PINCTRL_SUNRISEPOINT=m
 CONFIG_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
 CONFIG_OF_GPIO=y
 CONFIG_GPIO_ACPI=y
 CONFIG_GPIOLIB_IRQCHIP=y
@@ -3153,10 +3066,10 @@ CONFIG_GPIO_GENERIC_PLATFORM=m
 # CONFIG_GPIO_GRGPIO is not set
 CONFIG_GPIO_ICH=m
 CONFIG_GPIO_LYNXPOINT=m
-# CONFIG_GPIO_MOCKUP is not set
 CONFIG_GPIO_SYSCON=m
 CONFIG_GPIO_VX855=m
 CONFIG_GPIO_XILINX=m
+# CONFIG_GPIO_ZX is not set
 
 #
 # Port-mapped I/O GPIO drivers
@@ -3185,7 +3098,6 @@ CONFIG_GPIO_ARIZONA=m
 CONFIG_GPIO_CRYSTAL_COVE=y
 # CONFIG_GPIO_TPS65218 is not set
 CONFIG_GPIO_UCB1400=m
-# CONFIG_GPIO_WHISKEY_COVE is not set
 
 #
 # PCI GPIO expanders
@@ -3212,8 +3124,6 @@ CONFIG_GPIO_MCP23S08=m
 # USB GPIO expanders
 #
 # CONFIG_W1 is not set
-CONFIG_POWER_AVS=y
-# CONFIG_POWER_RESET is not set
 CONFIG_POWER_SUPPLY=y
 CONFIG_POWER_SUPPLY_DEBUG=y
 CONFIG_PDA_POWER=y
@@ -3240,6 +3150,8 @@ CONFIG_CHARGER_SMB347=m
 # CONFIG_CHARGER_TPS65217 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_CHARGER_RT9455 is not set
+# CONFIG_POWER_RESET is not set
+CONFIG_POWER_AVS=y
 CONFIG_HWMON=m
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -3313,7 +3225,6 @@ CONFIG_SENSORS_DELL_SMM=m
 # CONFIG_SENSORS_MAX6697 is not set
 # CONFIG_SENSORS_MAX31790 is not set
 # CONFIG_SENSORS_MCP3021 is not set
-# CONFIG_SENSORS_TC654 is not set
 # CONFIG_SENSORS_MENF21BMC_HWMON is not set
 # CONFIG_SENSORS_ADCXX is not set
 # CONFIG_SENSORS_LM63 is not set
@@ -3370,7 +3281,6 @@ CONFIG_SENSORS_LM85=m
 # CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_TMP102 is not set
 # CONFIG_SENSORS_TMP103 is not set
-# CONFIG_SENSORS_TMP108 is not set
 # CONFIG_SENSORS_TMP401 is not set
 # CONFIG_SENSORS_TMP421 is not set
 # CONFIG_SENSORS_VIA_CPUTEMP is not set
@@ -3386,7 +3296,6 @@ CONFIG_SENSORS_LM85=m
 # CONFIG_SENSORS_W83L786NG is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_XGENE is not set
 
 #
 # ACPI drivers
@@ -3407,7 +3316,6 @@ CONFIG_THERMAL_GOV_USER_SPACE=y
 # CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
 # CONFIG_CPU_THERMAL is not set
 # CONFIG_THERMAL_EMULATION is not set
-# CONFIG_QORIQ_THERMAL is not set
 CONFIG_INTEL_POWERCLAMP=m
 CONFIG_X86_PKG_TEMP_THERMAL=m
 CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
@@ -3419,7 +3327,6 @@ CONFIG_INTEL_SOC_DTS_THERMAL=m
 CONFIG_INT340X_THERMAL=m
 CONFIG_ACPI_THERMAL_REL=m
 # CONFIG_INT3406_THERMAL is not set
-# CONFIG_INTEL_BXT_PMIC_THERMAL is not set
 CONFIG_INTEL_PCH_THERMAL=m
 # CONFIG_GENERIC_ADC_THERMAL is not set
 CONFIG_WATCHDOG=y
@@ -3433,7 +3340,6 @@ CONFIG_WATCHDOG=y
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_MENF21BMC_WATCHDOG is not set
-# CONFIG_WDAT_WDT is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ZIIRAVE_WATCHDOG is not set
 # CONFIG_CADENCE_WATCHDOG is not set
@@ -3483,11 +3389,6 @@ CONFIG_WATCHDOG=y
 # USB-based Watchdog Cards
 #
 # CONFIG_USBPCWATCHDOG is not set
-
-#
-# Watchdog Pretimeout Governors
-#
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
 CONFIG_SSB_POSSIBLE=y
 
 #
@@ -3606,7 +3507,6 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TPS65086 is not set
 # CONFIG_MFD_TPS65090 is not set
 CONFIG_MFD_TPS65217=m
-# CONFIG_MFD_TI_LP873X is not set
 CONFIG_MFD_TPS65218=m
 # CONFIG_MFD_TPS6586X is not set
 # CONFIG_MFD_TPS65910 is not set
@@ -3654,7 +3554,6 @@ CONFIG_REGULATOR_GPIO=m
 # CONFIG_REGULATOR_LP872X is not set
 # CONFIG_REGULATOR_LP8755 is not set
 # CONFIG_REGULATOR_LTC3589 is not set
-# CONFIG_REGULATOR_LTC3676 is not set
 # CONFIG_REGULATOR_MAX1586 is not set
 # CONFIG_REGULATOR_MAX8649 is not set
 # CONFIG_REGULATOR_MAX8660 is not set
@@ -3691,7 +3590,6 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 CONFIG_MEDIA_RADIO_SUPPORT=y
 # CONFIG_MEDIA_SDR_SUPPORT is not set
 CONFIG_MEDIA_RC_SUPPORT=y
-# CONFIG_MEDIA_CEC_SUPPORT is not set
 CONFIG_MEDIA_CEC_EDID=y
 CONFIG_MEDIA_CONTROLLER=y
 # CONFIG_MEDIA_CONTROLLER_DVB is not set
@@ -3700,7 +3598,6 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_VIDEO_V4L2=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_PCI_SKELETON is not set
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
@@ -3717,7 +3614,6 @@ CONFIG_DVB_NET=y
 CONFIG_TTPCI_EEPROM=m
 CONFIG_DVB_MAX_ADAPTERS=8
 # CONFIG_DVB_DYNAMIC_MINORS is not set
-# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
 
 #
 # Media drivers
@@ -3753,7 +3649,6 @@ CONFIG_IR_IGUANA=m
 CONFIG_IR_TTUSBIR=m
 CONFIG_RC_LOOPBACK=m
 CONFIG_IR_GPIO_CIR=m
-# CONFIG_IR_SERIAL is not set
 CONFIG_MEDIA_USB_SUPPORT=y
 
 #
@@ -3846,7 +3741,6 @@ CONFIG_VIDEO_TM6000_DVB=m
 #
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_DIB3000MC=m
 CONFIG_DVB_USB_A800=m
 CONFIG_DVB_USB_DIBUSB_MB=m
 CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
@@ -3907,7 +3801,6 @@ CONFIG_MEDIA_PCI_SUPPORT=y
 #
 CONFIG_VIDEO_MEYE=m
 # CONFIG_VIDEO_SOLO6X10 is not set
-# CONFIG_VIDEO_TW5864 is not set
 # CONFIG_VIDEO_TW68 is not set
 # CONFIG_VIDEO_TW686X is not set
 # CONFIG_VIDEO_ZORAN is not set
@@ -4024,14 +3917,14 @@ CONFIG_SMS_SIANO_RC=y
 CONFIG_VIDEO_V4L2_TPG=m
 
 #
-# Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
+# Media ancillary drivers (tuners, sensors, i2c, frontends)
 #
 # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
 CONFIG_MEDIA_ATTACH=y
 CONFIG_VIDEO_IR_I2C=m
 
 #
-# I2C Encoders, decoders, sensors and other helper chips
+# Encoders, decoders, sensors and other helper chips
 #
 
 #
@@ -4070,7 +3963,6 @@ CONFIG_VIDEO_BT856=m
 CONFIG_VIDEO_BT866=m
 CONFIG_VIDEO_KS0127=m
 # CONFIG_VIDEO_ML86V7667 is not set
-# CONFIG_VIDEO_AD5820 is not set
 CONFIG_VIDEO_SAA7110=m
 CONFIG_VIDEO_SAA711X=m
 # CONFIG_VIDEO_TC358743 is not set
@@ -4112,7 +4004,6 @@ CONFIG_VIDEO_OV7670=m
 # CONFIG_VIDEO_OV9650 is not set
 CONFIG_VIDEO_VS6624=m
 CONFIG_VIDEO_MT9M032=m
-CONFIG_VIDEO_MT9M111=m
 CONFIG_VIDEO_MT9P031=m
 CONFIG_VIDEO_MT9T001=m
 CONFIG_VIDEO_MT9V011=m
@@ -4173,11 +4064,6 @@ CONFIG_SOC_CAMERA_OV9640=m
 CONFIG_SOC_CAMERA_OV9740=m
 CONFIG_SOC_CAMERA_RJ54N1=m
 CONFIG_SOC_CAMERA_TW9910=m
-
-#
-# SPI helper chips
-#
-# CONFIG_VIDEO_GS1662 is not set
 CONFIG_MEDIA_TUNER=y
 
 #
@@ -4302,7 +4188,6 @@ CONFIG_DVB_RTL2830=m
 CONFIG_DVB_RTL2832=m
 CONFIG_DVB_SI2168=m
 CONFIG_DVB_AS102_FE=m
-CONFIG_DVB_GP8PSK_FE=m
 
 #
 # DVB-C (cable) frontends
@@ -4391,14 +4276,11 @@ CONFIG_VGA_SWITCHEROO=y
 CONFIG_DRM=y
 CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
-# CONFIG_DRM_DEBUG_MM is not set
-# CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 CONFIG_DRM_TTM=m
-CONFIG_DRM_VM=y
 
 #
 # I2C encoder or helper chips
@@ -4406,13 +4288,15 @@ CONFIG_DRM_VM=y
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
 # CONFIG_DRM_RADEON_USERPTR is not set
 CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
 CONFIG_DRM_AMDGPU_CIK=y
 # CONFIG_DRM_AMDGPU_USERPTR is not set
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
+# CONFIG_DRM_AMD_POWERPLAY is not set
 
 #
 # ACP (Audio CoProcessor) Configuration
@@ -4423,9 +4307,7 @@ CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_I915=y
-# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
+CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=y
 CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_I915_GVT is not set
 
@@ -4434,8 +4316,10 @@ CONFIG_DRM_I915_USERPTR=y
 #
 # CONFIG_DRM_I915_WERROR is not set
 # CONFIG_DRM_I915_DEBUG is not set
-# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
-# CONFIG_DRM_I915_SELFTEST is not set
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VMWGFX=m
 CONFIG_DRM_VMWGFX_FBCON=y
@@ -4455,7 +4339,6 @@ CONFIG_DRM_PANEL=y
 # Display Panels
 #
 # CONFIG_DRM_PANEL_SIMPLE is not set
-# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
@@ -4468,19 +4351,12 @@ CONFIG_DRM_BRIDGE=y
 # Display Interface Bridges
 #
 # CONFIG_DRM_ANALOGIX_ANX78XX is not set
-# CONFIG_DRM_DUMB_VGA_DAC is not set
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PARADE_PS8622 is not set
-# CONFIG_DRM_SIL_SII8620 is not set
 # CONFIG_DRM_SII902X is not set
 # CONFIG_DRM_TOSHIBA_TC358767 is not set
-# CONFIG_DRM_TI_TFP410 is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
 # CONFIG_DRM_ARCPGU is not set
-# CONFIG_DRM_HISI_HIBMC is not set
-# CONFIG_DRM_MXSFB is not set
-# CONFIG_DRM_LEGACY is not set
-# CONFIG_DRM_LIB_RANDOM is not set
 
 #
 # Frame buffer Devices
@@ -4495,12 +4371,11 @@ CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-CONFIG_FB_SYS_FILLRECT=y
-CONFIG_FB_SYS_COPYAREA=y
-CONFIG_FB_SYS_IMAGEBLIT=y
-# CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA is not set
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=y
+CONFIG_FB_SYS_FOPS=m
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_SVGALIB=m
 # CONFIG_FB_MACMODES is not set
@@ -4532,6 +4407,7 @@ CONFIG_FB_RIVA=m
 CONFIG_FB_RIVA_BACKLIGHT=y
 # CONFIG_FB_I740 is not set
 # CONFIG_FB_LE80578 is not set
+# CONFIG_FB_INTEL is not set
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -4633,7 +4509,6 @@ CONFIG_SND=m
 CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
 CONFIG_SND_PCM_ELD=y
-CONFIG_SND_PCM_IEC958=y
 CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_HWDEP=m
 CONFIG_SND_RAWMIDI=m
@@ -4836,7 +4711,6 @@ CONFIG_SND_SOC_INTEL_HASWELL=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 # CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set
 # CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set
-# CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
 # CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH is not set
@@ -4847,6 +4721,13 @@ CONFIG_SND_SOC_INTEL_SKYLAKE=m
 CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
 # CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH is not set
 # CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH is not set
+
+#
+# Allwinner SoC Audio support
+#
+# CONFIG_SND_SUN4I_CODEC is not set
+# CONFIG_SND_SUN4I_I2S is not set
+# CONFIG_SND_SUN4I_SPDIF is not set
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
 CONFIG_SND_SOC_I2C_AND_SPI=m
 
@@ -4865,8 +4746,6 @@ CONFIG_SND_SOC_ALC5623=m
 # CONFIG_SND_SOC_BT_SCO is not set
 CONFIG_SND_SOC_CS35L32=m
 # CONFIG_SND_SOC_CS35L33 is not set
-# CONFIG_SND_SOC_CS35L34 is not set
-# CONFIG_SND_SOC_CS42L42 is not set
 CONFIG_SND_SOC_CS42L51=m
 CONFIG_SND_SOC_CS42L51_I2C=m
 CONFIG_SND_SOC_CS42L52=m
@@ -4882,7 +4761,6 @@ CONFIG_SND_SOC_CS42XX8_I2C=m
 CONFIG_SND_SOC_CS4349=m
 # CONFIG_SND_SOC_CS53L30 is not set
 CONFIG_SND_SOC_DMIC=m
-CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_ES8328=m
 # CONFIG_SND_SOC_GTM601 is not set
 CONFIG_SND_SOC_HDAC_HDMI=m
@@ -4890,7 +4768,6 @@ CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_MAX98090=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
-# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 CONFIG_SND_SOC_PCM1681=m
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X_SPI is not set
@@ -4952,12 +4829,9 @@ CONFIG_SND_SOC_WM8962=m
 # CONFIG_SND_SOC_WM8974 is not set
 CONFIG_SND_SOC_WM8978=m
 # CONFIG_SND_SOC_WM8985 is not set
-# CONFIG_SND_SOC_NAU8810 is not set
 CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
-# CONFIG_SND_SIMPLE_SCU_CARD is not set
-# CONFIG_SND_X86 is not set
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
 
@@ -5019,7 +4893,6 @@ CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIWHEELS_FF=y
 CONFIG_HID_MAGICMOUSE=m
-# CONFIG_HID_MAYFLASH is not set
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
 CONFIG_HID_MULTITOUCH=m
@@ -5056,7 +4929,6 @@ CONFIG_HID_TOPSEED=m
 CONFIG_HID_THINGM=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
-# CONFIG_HID_UDRAW_PS3 is not set
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
 CONFIG_HID_XINMO=m
@@ -5078,11 +4950,6 @@ CONFIG_USB_HIDDEV=y
 # I2C HID support
 #
 CONFIG_I2C_HID=m
-
-#
-# Intel ISH HID support
-#
-# CONFIG_INTEL_ISH_HID is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
@@ -5099,7 +4966,7 @@ CONFIG_USB_OTG=y
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 # CONFIG_USB_OTG_FSM is not set
-# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
+# CONFIG_USB_ULPI_BUS is not set
 CONFIG_USB_MON=y
 # CONFIG_USB_WUSB_CBAF is not set
 
@@ -5109,7 +4976,7 @@ CONFIG_USB_MON=y
 # CONFIG_USB_C67X00_HCD is not set
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_PCI=y
-CONFIG_USB_XHCI_PLATFORM=y
+CONFIG_USB_XHCI_PLATFORM=m
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
@@ -5172,8 +5039,6 @@ CONFIG_USB_MDC800=m
 # CONFIG_USB_MICROTEK is not set
 CONFIG_USBIP_CORE=m
 CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_VHCI_HC_PORTS=8
-CONFIG_USBIP_VHCI_NR_HCS=1
 CONFIG_USBIP_HOST=m
 # CONFIG_USBIP_VUDC is not set
 # CONFIG_USBIP_DEBUG is not set
@@ -5225,7 +5090,6 @@ CONFIG_USB_SERIAL_IR=m
 CONFIG_USB_SERIAL_EDGEPORT=m
 CONFIG_USB_SERIAL_EDGEPORT_TI=m
 CONFIG_USB_SERIAL_F81232=m
-# CONFIG_USB_SERIAL_F8153X is not set
 CONFIG_USB_SERIAL_GARMIN=m
 CONFIG_USB_SERIAL_IPW=m
 CONFIG_USB_SERIAL_IUU=m
@@ -5287,7 +5151,6 @@ CONFIG_USB_APPLEDISPLAY=m
 # CONFIG_USB_YUREX is not set
 CONFIG_USB_EZUSB_FX2=m
 # CONFIG_USB_HSIC_USB3503 is not set
-# CONFIG_USB_HSIC_USB4604 is not set
 # CONFIG_USB_LINK_LAYER_TEST is not set
 # CONFIG_USB_CHAOSKEY is not set
 # CONFIG_UCSI is not set
@@ -5296,11 +5159,9 @@ CONFIG_USB_EZUSB_FX2=m
 # USB Physical Layer drivers
 #
 CONFIG_USB_PHY=y
-# CONFIG_USB_OTG_WAKELOCK is not set
 CONFIG_NOP_USB_XCEIV=m
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_ISP1301 is not set
-# CONFIG_DUAL_ROLE_USB_INTF is not set
 CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
 CONFIG_USB_GADGET_DEBUG_FILES=y
@@ -5327,30 +5188,10 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_GADGET_XILINX is not set
 # CONFIG_USB_DUMMY_HCD is not set
 CONFIG_USB_LIBCOMPOSITE=y
-CONFIG_USB_F_FS=y
 CONFIG_USB_F_UVC=m
+CONFIG_USB_F_FS=y
 CONFIG_USB_CONFIGFS=y
-# CONFIG_USB_CONFIGFS_SERIAL is not set
-# CONFIG_USB_CONFIGFS_ACM is not set
-# CONFIG_USB_CONFIGFS_OBEX is not set
-# CONFIG_USB_CONFIGFS_NCM is not set
-# CONFIG_USB_CONFIGFS_ECM is not set
-# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
-# CONFIG_USB_CONFIGFS_RNDIS is not set
-# CONFIG_USB_CONFIGFS_EEM is not set
-# CONFIG_USB_CONFIGFS_PHONET is not set
-# CONFIG_USB_CONFIGFS_MASS_STORAGE is not set
-# CONFIG_USB_CONFIGFS_F_LB_SS is not set
 CONFIG_USB_CONFIGFS_F_FS=y
-# CONFIG_USB_CONFIGFS_F_MTP is not set
-# CONFIG_USB_CONFIGFS_F_ACC is not set
-# CONFIG_USB_CONFIGFS_UEVENT is not set
-# CONFIG_USB_CONFIGFS_F_UAC1 is not set
-# CONFIG_USB_CONFIGFS_F_UAC2 is not set
-# CONFIG_USB_CONFIGFS_F_MIDI is not set
-# CONFIG_USB_CONFIGFS_F_HID is not set
-# CONFIG_USB_CONFIGFS_F_UVC is not set
-# CONFIG_USB_CONFIGFS_F_PRINTER is not set
 # CONFIG_USB_ZERO is not set
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_ETH is not set
@@ -5368,15 +5209,24 @@ CONFIG_USB_CONFIGFS_F_FS=y
 # CONFIG_USB_G_HID is not set
 # CONFIG_USB_G_DBGP is not set
 CONFIG_USB_G_WEBCAM=m
+
+#
+# USB PD and Type-C drivers
+#
+CONFIG_TYPEC=y
+CONFIG_USB_PD_SINK=y
+CONFIG_TYPEC_WCOVE=y
+
 # CONFIG_USB_LED_TRIG is not set
-# CONFIG_USB_ULPI_BUS is not set
 # CONFIG_UWB is not set
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 CONFIG_PWRSEQ_EMMC=y
 CONFIG_PWRSEQ_SIMPLE=y
-# CONFIG_MMC_EMBEDDED_SDIO is not set
-# CONFIG_MMC_PARANOID_SD_INIT is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_BLOCK_BOUNCE=y
@@ -5393,7 +5243,6 @@ CONFIG_MMC_SDHCI_ACPI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 # CONFIG_MMC_SDHCI_OF_ARASAN is not set
 # CONFIG_MMC_SDHCI_OF_AT91 is not set
-# CONFIG_MMC_SDHCI_CADENCE is not set
 CONFIG_MMC_SDHCI_F_SDH30=m
 CONFIG_MMC_WBSD=m
 CONFIG_MMC_TIFM_SD=m
@@ -5460,7 +5309,6 @@ CONFIG_LEDS_GPIO=m
 # CONFIG_LEDS_TLC591XX is not set
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_MENF21BMC is not set
-# CONFIG_LEDS_IS31FL319X is not set
 # CONFIG_LEDS_IS31FL32XX is not set
 
 #
@@ -5468,9 +5316,6 @@ CONFIG_LEDS_GPIO=m
 #
 # CONFIG_LEDS_BLINKM is not set
 # CONFIG_LEDS_SYSCON is not set
-# CONFIG_LEDS_MLXCPLD is not set
-# CONFIG_LEDS_USER is not set
-# CONFIG_LEDS_NIC78BX is not set
 
 #
 # LED Triggers
@@ -5523,7 +5368,6 @@ CONFIG_RTC_DRV_ABB5ZES3=m
 # CONFIG_RTC_DRV_ABX80X is not set
 CONFIG_RTC_DRV_DS1307=m
 CONFIG_RTC_DRV_DS1307_HWMON=y
-# CONFIG_RTC_DRV_DS1307_CENTURY is not set
 CONFIG_RTC_DRV_DS1374=m
 # CONFIG_RTC_DRV_DS1374_WDT is not set
 CONFIG_RTC_DRV_DS1672=m
@@ -5533,6 +5377,7 @@ CONFIG_RTC_DRV_MAX8907=m
 CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_ISL1208=m
 CONFIG_RTC_DRV_ISL12022=m
+# CONFIG_RTC_DRV_ISL12057 is not set
 CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_PCF8523=m
 CONFIG_RTC_DRV_PCF85063=m
@@ -5610,7 +5455,6 @@ CONFIG_RTC_DRV_V3020=m
 #
 # CONFIG_RTC_DRV_SNVS is not set
 # CONFIG_RTC_DRV_MT6397 is not set
-# CONFIG_RTC_DRV_R7301 is not set
 
 #
 # HID Sensor RTC drivers
@@ -5630,9 +5474,9 @@ CONFIG_DMA_OF=y
 CONFIG_INTEL_IOATDMA=m
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_HIDMA is not set
-CONFIG_DW_DMAC_CORE=y
+CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
-CONFIG_DW_DMAC_PCI=y
+CONFIG_DW_DMAC_PCI=m
 
 #
 # DMA Clients
@@ -5644,8 +5488,6 @@ CONFIG_DMA_ENGINE_RAID=y
 #
 # DMABUF options
 #
-CONFIG_SYNC_FILE=y
-CONFIG_SW_SYNC=y
 CONFIG_DCA=m
 # CONFIG_AUXDISPLAY is not set
 CONFIG_UIO=m
@@ -5658,7 +5500,6 @@ CONFIG_UIO=m
 # CONFIG_UIO_NETX is not set
 # CONFIG_UIO_PRUSS is not set
 # CONFIG_UIO_MF624 is not set
-# CONFIG_UIO_HV_GENERIC is not set
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VIRTIO=y
 
@@ -5679,6 +5520,7 @@ CONFIG_HYPERV=y
 CONFIG_HYPERV_UTILS=m
 CONFIG_HYPERV_BALLOON=m
 CONFIG_STAGING=y
+CONFIG_SLICOSS=m
 CONFIG_PRISM2_USB=m
 CONFIG_COMEDI=m
 # CONFIG_COMEDI_DEBUG is not set
@@ -5700,6 +5542,13 @@ CONFIG_RTL8192E=m
 CONFIG_R8712U=m
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
+CONFIG_R8723AU=m
+CONFIG_8723AU_AP_MODE=y
+CONFIG_8723AU_BT_COEXIST=y
+CONFIG_RTL8723BS=m
+CONFIG_RTL8723BU=m
+CONFIG_RTL8821AU=m
+CONFIG_WLAN_SDIO=y
 CONFIG_RTS5208=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
@@ -5715,6 +5564,7 @@ CONFIG_ADIS16201=m
 CONFIG_ADIS16203=m
 CONFIG_ADIS16209=m
 CONFIG_ADIS16240=m
+CONFIG_SCA3000=m
 
 #
 # Analog to digital converters
@@ -5758,7 +5608,9 @@ CONFIG_ADIS16060=m
 #
 # Light sensors
 #
+CONFIG_SENSORS_ISL29018=m
 CONFIG_SENSORS_ISL29028=m
+CONFIG_TSL2583=m
 CONFIG_TSL2x7x=m
 
 #
@@ -5789,7 +5641,9 @@ CONFIG_FB_XGI=m
 # CONFIG_SPEAKUP is not set
 CONFIG_STAGING_MEDIA=y
 # CONFIG_I2C_BCM2048 is not set
+# CONFIG_MEDIA_CEC is not set
 CONFIG_DVB_CXD2099=m
+# CONFIG_VIDEO_TW686X_KH is not set
 # CONFIG_LIRC_STAGING is not set
 
 #
@@ -5797,9 +5651,7 @@ CONFIG_DVB_CXD2099=m
 #
 CONFIG_ASHMEM=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
 # CONFIG_ION is not set
-# CONFIG_FIQ_WATCHDOG is not set
 # CONFIG_STAGING_BOARD is not set
 # CONFIG_LTE_GDM724X is not set
 # CONFIG_MTD_SPINAND_MT29F is not set
@@ -5814,7 +5666,6 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
 # CONFIG_WILC1000_SPI is not set
 # CONFIG_MOST is not set
 # CONFIG_KS7010 is not set
-# CONFIG_GREYBUS is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -5837,7 +5688,6 @@ CONFIG_COMPAL_LAPTOP=m
 CONFIG_SONY_LAPTOP=m
 CONFIG_SONYPI_COMPAT=y
 CONFIG_IDEAPAD_LAPTOP=m
-# CONFIG_SURFACE3_WMI is not set
 CONFIG_THINKPAD_ACPI=m
 CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
 # CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
@@ -5874,12 +5724,8 @@ CONFIG_INTEL_RST=m
 CONFIG_INTEL_SMARTCONNECT=m
 CONFIG_PVPANIC=m
 CONFIG_INTEL_PMC_IPC=y
-# CONFIG_INTEL_BXTWC_PMIC_TMU is not set
 CONFIG_SURFACE_PRO3_BUTTON=m
-# CONFIG_SURFACE_3_BUTTON is not set
 # CONFIG_INTEL_PUNIT_IPC is not set
-# CONFIG_MLX_PLATFORM is not set
-# CONFIG_MLX_CPLD_PLATFORM is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
 # CONFIG_CHROMEOS_PSTORE is not set
@@ -5905,13 +5751,7 @@ CONFIG_COMMON_CLK=y
 # CONFIG_COMMON_CLK_PWM is not set
 # CONFIG_COMMON_CLK_PXA is not set
 # CONFIG_COMMON_CLK_PIC32 is not set
-# CONFIG_COMMON_CLK_MT2701 is not set
-# CONFIG_COMMON_CLK_MT2701_MMSYS is not set
-# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set
-# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set
-# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set
-# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set
-# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set
+# CONFIG_SUNXI_CCU is not set
 
 #
 # Hardware Spinlock drivers
@@ -5928,11 +5768,7 @@ CONFIG_CLKBLD_I8253=y
 # CONFIG_SH_TIMER_MTU2 is not set
 # CONFIG_SH_TIMER_TMU is not set
 # CONFIG_EM_TIMER_STI is not set
-CONFIG_MAILBOX=y
-# CONFIG_PLATFORM_MHU is not set
-CONFIG_PCC=y
-# CONFIG_ALTERA_MBOX is not set
-# CONFIG_MAILBOX_TEST is not set
+# CONFIG_MAILBOX is not set
 CONFIG_IOMMU_SUPPORT=y
 
 #
@@ -5945,7 +5781,7 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # Remoteproc drivers
 #
-# CONFIG_REMOTEPROC is not set
+# CONFIG_STE_MODEM_RPROC is not set
 
 #
 # Rpmsg drivers
@@ -5984,7 +5820,6 @@ CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_ARIZONA=m
 CONFIG_EXTCON_GPIO=m
 # CONFIG_EXTCON_MAX3355 is not set
-# CONFIG_EXTCON_QCOM_SPMI_MISC is not set
 CONFIG_EXTCON_RT8973A=m
 CONFIG_EXTCON_SM5502=m
 CONFIG_EXTCON_USB_GPIO=m
@@ -6008,20 +5843,12 @@ CONFIG_BMA180=m
 CONFIG_BMC150_ACCEL=m
 CONFIG_BMC150_ACCEL_I2C=m
 CONFIG_BMC150_ACCEL_SPI=m
-# CONFIG_DA280 is not set
-# CONFIG_DA311 is not set
-# CONFIG_DMARD06 is not set
-# CONFIG_DMARD09 is not set
-# CONFIG_DMARD10 is not set
 CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_IIO_ST_ACCEL_3AXIS=m
 CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
 CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
 CONFIG_KXSD9=m
-CONFIG_KXSD9_SPI=m
-CONFIG_KXSD9_I2C=m
 CONFIG_KXCJK1013=m
-# CONFIG_MC3230 is not set
 # CONFIG_MMA7455_I2C is not set
 # CONFIG_MMA7455_SPI is not set
 # CONFIG_MMA7660 is not set
@@ -6031,7 +5858,6 @@ CONFIG_MMA9551=m
 CONFIG_MMA9553=m
 CONFIG_MXC4005=m
 # CONFIG_MXC6255 is not set
-CONFIG_SCA3000=m
 CONFIG_STK8312=m
 CONFIG_STK8BA50=m
 
@@ -6043,17 +5869,14 @@ CONFIG_AD_SIGMA_DELTA=m
 # CONFIG_AD7291 is not set
 # CONFIG_AD7298 is not set
 # CONFIG_AD7476 is not set
-# CONFIG_AD7766 is not set
 # CONFIG_AD7791 is not set
 # CONFIG_AD7793 is not set
 # CONFIG_AD7887 is not set
 # CONFIG_AD7923 is not set
 # CONFIG_AD799X is not set
 # CONFIG_CC10001_ADC is not set
-# CONFIG_ENVELOPE_DETECTOR is not set
 # CONFIG_HI8435 is not set
 # CONFIG_INA2XX_ADC is not set
-# CONFIG_LTC2485 is not set
 # CONFIG_MAX1027 is not set
 # CONFIG_MAX1363 is not set
 # CONFIG_MCP320X is not set
@@ -6061,9 +5884,7 @@ CONFIG_AD_SIGMA_DELTA=m
 # CONFIG_NAU7802 is not set
 # CONFIG_TI_ADC081C is not set
 # CONFIG_TI_ADC0832 is not set
-# CONFIG_TI_ADC12138 is not set
 # CONFIG_TI_ADC128S052 is not set
-# CONFIG_TI_ADC161S626 is not set
 # CONFIG_TI_ADS1015 is not set
 # CONFIG_TI_ADS8688 is not set
 # CONFIG_VF610_ADC is not set
@@ -6079,7 +5900,6 @@ CONFIG_AD_SIGMA_DELTA=m
 # CONFIG_ATLAS_PH_SENSOR is not set
 # CONFIG_IAQCORE is not set
 # CONFIG_VZ89X is not set
-# CONFIG_IIO_CROS_EC_SENSORS_CORE is not set
 
 #
 # Hid Sensor IIO Common
@@ -6097,10 +5917,6 @@ CONFIG_IIO_ST_SENSORS_I2C=m
 CONFIG_IIO_ST_SENSORS_SPI=m
 CONFIG_IIO_ST_SENSORS_CORE=m
 
-#
-# Counters
-#
-
 #
 # Digital to analog converters
 #
@@ -6120,8 +5936,6 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_AD5764 is not set
 # CONFIG_AD5791 is not set
 # CONFIG_AD7303 is not set
-# CONFIG_AD8801 is not set
-# CONFIG_DPOT_DAC is not set
 # CONFIG_M62332 is not set
 # CONFIG_MAX517 is not set
 # CONFIG_MAX5821 is not set
@@ -6181,7 +5995,6 @@ CONFIG_ITG3200=m
 # CONFIG_AM2315 is not set
 CONFIG_DHT11=m
 CONFIG_HDC100X=m
-# CONFIG_HTS221 is not set
 CONFIG_HTU21=m
 CONFIG_SI7005=m
 CONFIG_SI7020=m
@@ -6214,7 +6027,6 @@ CONFIG_CM3232=m
 CONFIG_CM3323=m
 CONFIG_CM36651=m
 CONFIG_GP2AP020A00F=m
-CONFIG_SENSORS_ISL29018=m
 CONFIG_ISL29125=m
 CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_PROX=m
@@ -6225,12 +6037,10 @@ CONFIG_LTR501=m
 # CONFIG_MAX44000 is not set
 CONFIG_OPT3001=m
 CONFIG_PA12203001=m
-# CONFIG_SI1145 is not set
 CONFIG_STK3310=m
 CONFIG_TCS3414=m
 CONFIG_TCS3472=m
 CONFIG_SENSORS_TSL2563=m
-CONFIG_TSL2583=m
 CONFIG_TSL4531=m
 CONFIG_US5182D=m
 CONFIG_VCNL4000=m
@@ -6239,7 +6049,6 @@ CONFIG_VCNL4000=m
 #
 # Magnetometer sensors
 #
-# CONFIG_AK8974 is not set
 CONFIG_AK8975=m
 CONFIG_AK09911=m
 # CONFIG_BMC150_MAGN_I2C is not set
@@ -6275,16 +6084,9 @@ CONFIG_IIO_SYSFS_TRIGGER=m
 # CONFIG_MCP4531 is not set
 # CONFIG_TPL0102 is not set
 
-#
-# Digital potentiostats
-#
-# CONFIG_LMP91000 is not set
-
 #
 # Pressure sensors
 #
-# CONFIG_ABP060MG is not set
-# CONFIG_BMP280 is not set
 CONFIG_HID_SENSOR_PRESS=m
 # CONFIG_HP03 is not set
 # CONFIG_MPL115_I2C is not set
@@ -6299,7 +6101,6 @@ CONFIG_IIO_ST_PRESS_I2C=m
 CONFIG_IIO_ST_PRESS_SPI=m
 CONFIG_T5403=m
 # CONFIG_HP206C is not set
-# CONFIG_ZPA2326 is not set
 
 #
 # Lightning sensors
@@ -6315,7 +6116,6 @@ CONFIG_SX9500=m
 #
 # Temperature sensors
 #
-# CONFIG_MAXIM_THERMOCOUPLE is not set
 CONFIG_MLX90614=m
 CONFIG_TMP006=m
 CONFIG_TSYS01=m
@@ -6335,17 +6135,7 @@ CONFIG_IRQCHIP=y
 CONFIG_ARM_GIC_MAX_NR=1
 # CONFIG_IPACK_BUS is not set
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_ATH79 is not set
-# CONFIG_RESET_BERLIN is not set
-# CONFIG_RESET_LPC18XX is not set
-# CONFIG_RESET_MESON is not set
-# CONFIG_RESET_PISTACHIO is not set
-# CONFIG_RESET_SOCFPGA is not set
-# CONFIG_RESET_STM32 is not set
-# CONFIG_RESET_SUNXI is not set
 # CONFIG_TI_SYSCON_RESET is not set
-# CONFIG_RESET_ZYNQ is not set
-# CONFIG_RESET_TEGRA_BPMP is not set
 # CONFIG_FMC is not set
 
 #
@@ -6374,7 +6164,6 @@ CONFIG_THUNDERBOLT=m
 #
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_BINDER_DEVICES="binder"
 # CONFIG_LIBNVDIMM is not set
 CONFIG_NVMEM=m
 # CONFIG_STM is not set
@@ -6388,7 +6177,6 @@ CONFIG_NVMEM=m
 #
 # Firmware Drivers
 #
-# CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_EDD is not set
 CONFIG_FIRMWARE_MEMMAP=y
 # CONFIG_DELL_RBU is not set
@@ -6407,17 +6195,11 @@ CONFIG_EFI_VARS=m
 CONFIG_EFI_ESRT=y
 CONFIG_EFI_VARS_PSTORE=m
 # CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
+CONFIG_EFI_RUNTIME_MAP=y
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_RUNTIME_WRAPPERS=y
 CONFIG_EFI_BOOTLOADER_CONTROL=m
 # CONFIG_EFI_CAPSULE_LOADER is not set
-# CONFIG_EFI_TEST is not set
-CONFIG_APPLE_PROPERTIES=y
-CONFIG_EFI_DEV_PATH_PARSER=y
-
-#
-# Tegra firmware driver
-#
 
 #
 # File systems
@@ -6480,7 +6262,7 @@ CONFIG_FSNOTIFY=y
 CONFIG_INOTIFY_USER=y
 # CONFIG_FANOTIFY is not set
 CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_QUOTA_NETLINK_INTERFACE is not set
 CONFIG_PRINT_QUOTA_WARNING=y
 # CONFIG_QUOTA_DEBUG is not set
 CONFIG_QUOTA_TREE=m
@@ -6533,15 +6315,12 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
-CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
-CONFIG_CONFIGFS_FS=y
+CONFIG_CONFIGFS_FS=m
 CONFIG_EFIVAR_FS=m
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ORANGEFS_FS is not set
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
-# CONFIG_ECRYPT_FS is not set
-# CONFIG_SDCARD_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set
@@ -6549,6 +6328,7 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_EFS_FS is not set
 # CONFIG_JFFS2_FS is not set
 # CONFIG_UBIFS_FS is not set
+# CONFIG_LOGFS is not set
 # CONFIG_CRAMFS is not set
 CONFIG_SQUASHFS=y
 # CONFIG_SQUASHFS_FILE_CACHE is not set
@@ -6599,11 +6379,9 @@ CONFIG_SUNRPC=m
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS is not set
 # CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_UPCALL is not set
 # CONFIG_CIFS_XATTR is not set
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_SMB2 is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
@@ -6670,7 +6448,6 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # printk and dmesg options
 #
 CONFIG_PRINTK_TIME=y
-CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_BOOT_PRINTK_DELAY is not set
 CONFIG_DYNAMIC_DEBUG=y
@@ -6696,7 +6473,6 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
-CONFIG_DEBUG_KERNEL=y
 
 #
 # Memory Debugging
@@ -6734,12 +6510,10 @@ CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
 # CONFIG_DETECT_HUNG_TASK is not set
 # CONFIG_WQ_WATCHDOG is not set
-CONFIG_PANIC_ON_OOPS=y
-CONFIG_PANIC_ON_OOPS_VALUE=1
+CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=5
 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHED_INFO=y
-# CONFIG_PANIC_ON_RT_THROTTLING is not set
 CONFIG_SCHEDSTATS=y
 # CONFIG_SCHED_STACK_END_CHECK is not set
 # CONFIG_DEBUG_TIMEKEEPING is not set
@@ -6766,7 +6540,6 @@ CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_PI_LIST is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
-CONFIG_DEBUG_CREDENTIALS=y
 
 #
 # RCU Debugging
@@ -6785,10 +6558,13 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_NOTIFIER_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
+CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
@@ -6809,7 +6585,6 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_PREEMPT_TRACER is not set
 # CONFIG_SCHED_TRACER is not set
-# CONFIG_HWLAT_TRACER is not set
 # CONFIG_FTRACE_SYSCALLS is not set
 # CONFIG_TRACER_SNAPSHOT is not set
 CONFIG_BRANCH_PROFILE_NONE=y
@@ -6859,15 +6634,12 @@ CONFIG_TRACING_EVENTS_GPIO=y
 # CONFIG_TEST_UDELAY is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_TEST_STATIC_KEYS is not set
-# CONFIG_BUG_ON_DATA_CORRUPTION is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
-# CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set
 # CONFIG_UBSAN is not set
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
-CONFIG_STRICT_DEVMEM=y
 # CONFIG_IO_STRICT_DEVMEM is not set
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_EARLY_PRINTK=y
@@ -6904,42 +6676,22 @@ CONFIG_X86_DEBUG_FPU=y
 #
 # Security options
 #
-CONFIG_KEYS=y
-# CONFIG_PERSISTENT_KEYRINGS is not set
-# CONFIG_BIG_KEYS is not set
-# CONFIG_ENCRYPTED_KEYS is not set
-# CONFIG_KEY_DH_OPERATIONS is not set
+# CONFIG_KEYS is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
-CONFIG_SECURITY=y
 # CONFIG_SECURITYFS is not set
 CONFIG_SECURITY_NETWORK=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
-CONFIG_SECURITY_PATH=y
 CONFIG_LSM_MMAP_MIN_ADDR=65536
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y
-CONFIG_HARDENED_USERCOPY=y
-# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
-CONFIG_SECURITY_SELINUX=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
-CONFIG_SECURITY_SELINUX_DISABLE=y
-CONFIG_SECURITY_SELINUX_DEVELOP=y
-CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 # CONFIG_SECURITY_SMACK is not set
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_SECURITY_LOADPIN is not set
-CONFIG_SECURITY_YAMA=y
 CONFIG_INTEGRITY=y
-# CONFIG_INTEGRITY_SIGNATURE is not set
 CONFIG_INTEGRITY_AUDIT=y
 # CONFIG_IMA is not set
 # CONFIG_EVM is not set
-CONFIG_DEFAULT_SECURITY_SELINUX=y
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_DEFAULT_SECURITY="selinux"
 CONFIG_XOR_BLOCKS=m
 CONFIG_CRYPTO=y
 
@@ -6958,10 +6710,8 @@ CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
-CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_RSA=y
+# CONFIG_CRYPTO_RSA is not set
 # CONFIG_CRYPTO_DH is not set
 # CONFIG_CRYPTO_ECDH is not set
 CONFIG_CRYPTO_MANAGER=y
@@ -6978,7 +6728,6 @@ CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_ABLK_HELPER=y
-CONFIG_CRYPTO_SIMD=m
 CONFIG_CRYPTO_GLUE_HELPER_X86=y
 
 #
@@ -7106,23 +6855,11 @@ CONFIG_CRYPTO_USER_API_HASH=m
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 # CONFIG_CRYPTO_USER_API_RNG is not set
 # CONFIG_CRYPTO_USER_API_AEAD is not set
-CONFIG_CRYPTO_HASH_INFO=y
 # CONFIG_CRYPTO_HW is not set
-CONFIG_ASYMMETRIC_KEY_TYPE=y
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
-CONFIG_X509_CERTIFICATE_PARSER=y
-CONFIG_PKCS7_MESSAGE_PARSER=y
-# CONFIG_PKCS7_TEST_KEY is not set
-# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
 
 #
 # Certificates for signature checking
 #
-CONFIG_MODULE_SIG_KEY="certs/signing_key.pem"
-CONFIG_SYSTEM_TRUSTED_KEYRING=y
-CONFIG_SYSTEM_TRUSTED_KEYS=""
-# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
-# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
 CONFIG_HAVE_KVM=y
 # CONFIG_VIRTUALIZATION is not set
 CONFIG_BINARY_PRINTF=y
@@ -7181,7 +6918,6 @@ CONFIG_TEXTSEARCH_KMP=y
 CONFIG_TEXTSEARCH_BM=y
 CONFIG_TEXTSEARCH_FSM=y
 CONFIG_INTERVAL_TREE=y
-CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
@@ -7191,12 +6927,10 @@ CONFIG_DQL=y
 CONFIG_GLOB=y
 # CONFIG_GLOB_SELFTEST is not set
 CONFIG_NLATTR=y
-CONFIG_CLZ_TAB=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 CONFIG_CORDIC=m
 # CONFIG_DDR is not set
 # CONFIG_IRQ_POLL is not set
-CONFIG_MPILIB=y
-CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
 CONFIG_FONT_SUPPORT=y
 CONFIG_FONTS=y
@@ -7217,5 +6951,94 @@ CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_ARCH_HAS_MMIO_FLUSH=y
-CONFIG_SBITMAP=y
-# CONFIG_PRIME_NUMBERS is not set
+
+
+CONFIG_LOCALVERSION="-android_ia_64"
+CONFIG_DEFAULT_HOSTNAME="android_ia_64"
+CONFIG_SYNC_FILE=y
+CONFIG_SYNC=y
+CONFIG_SW_SYNC=y
+CONFIG_SW_SYNC_USER=y
+CONFIG_DEFAULT_SECURITY_SELINUX=y
+# CONFIG_DEFAULT_SECURITY_DAC is not set
+CONFIG_DEFAULT_SECURITY="selinux"
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_PATH=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_DISABLE=y
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+CONFIG_X86=n
+
+# Make sure kernel page tables have safe permissions.
+CONFIG_DEBUG_KERNEL=y
+
+# Blocks direct physical memory access.
+CONFIG_STRICT_DEVMEM=y
+
+# Provides some protections against SYN flooding.
+CONFIG_SYN_COOKIES=y
+
+# Perform additional validation of credentials.
+CONFIG_DEBUG_CREDENTIALS=y
+
+# Provide userspace with seccomp BPF API for syscall attack surface reduction.
+CONFIG_SECCOMP_FILTER=y
+
+# Randomize allocator freelists.
+CONFIG_SLAB_FREELIST_RANDOM=y
+
+# Allow allocator validation checking to be enabled.
+CONFIG_SLUB_DEBUG=y
+
+# Dangerous; allows direct physical memory writing.
+# CONFIG_ACPI_CUSTOM_METHOD is not set
+
+# Dangerous; disables brk ASLR.
+# CONFIG_COMPAT_BRK is not set
+
+# Dangerous; disables VDSO ASLR.
+# CONFIG_COMPAT_VDSO is not set
+
+# Dangerous; allows replacement of running kernel.
+# CONFIG_KEXEC is not set
+
+# Dangerous; allows replacement of running kernel.
+# CONFIG_HIBERNATION is not set
+
+# Prior to v4.1, assists heap memory attacks; best to keep interface disabled.
+# CONFIG_INET_DIAG is not set
+
+# Easily confused by misconfigured userspace, keep off.
+# CONFIG_BINFMT_MISC is not set
+
+# Reboot devices immediately if kernel experiences an Oops.
+CONFIG_PANIC_ON_OOPS=y
+
+# Disallow allocating the first 64k of memory.
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+
+# Randomize position of kernel and memory.
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_RANDOMIZE_MEMORY=y
+
+# Perform usercopy bounds checking.
+CONFIG_HARDENED_USERCOPY=y
+
+# Use -fstack-protector-strong (gcc 4.9+) for best stack canary coverage.
+CONFIG_CC_STACKPROTECTOR=y
+CONFIG_CC_STACKPROTECTOR_STRONG=y
+
+# Provide userspace with ptrace ancestry protections.
+CONFIG_SECURITY=y
+CONFIG_SECURITY_YAMA=y
+
+# If we build using modules, they must be signed with a per-build key.
+CONFIG_MODULE_SIG=y
+CONFIG_MODULE_SIG_FORCE=y
+CONFIG_MODULE_SIG_ALL=y
+CONFIG_MODULE_SIG_SHA512=y
+CONFIG_MODULE_SIG_HASH="sha512"
+CONFIG_MODULE_SIG_KEY="certs/signing_key.pem"

From a66d67e9eecba453a9bdf37549f06382eaab48ca Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Thu, 23 Feb 2017 10:45:52 -0800
Subject: [PATCH 008/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/BoardConfig.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index d3e7cabcc..19737c20c 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -101,7 +101,7 @@ else
 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
 endif
 
-BOARD_SYSTEMIMAGE_PARTITION_SIZE = 2147483648
+BOARD_SYSTEMIMAGE_PARTITION_SIZE = 3171483648
 
 BOARD_BOOTLOADER_PARTITION_SIZE ?= 62914560
 BOARD_BOOTLOADER_BLOCK_SIZE := 512

From b790d6384e376c129fe8ff35c6e35b8ae16b5f07 Mon Sep 17 00:00:00 2001
From: Carlos Santa <carlos.santa@intel.com>
Date: Thu, 23 Feb 2017 07:10:39 -0800
Subject: [PATCH 009/427] androidia_64: mixins.spec: increase # of cores to 4

Increasing # of cores to 4 by default to increase PnP usecases.

BugID: none
Test: Board boots to UI without issues

Signed-off-by: Carlos Santa <carlos.santa@intel.com>
---
 androidia_64/mixins.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index 0c5d60759..b99d61334 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -22,7 +22,7 @@ boot-arch: android_ia
 audio: android_ia
 wlan: iwlwifi
 cpu-arch: skl
-cpuset: 2cores
+cpuset: 4cores
 rfkill: true(force_disable=)
 dexpreopt: enabled
 disk-bus: auto

From 8428fa85301d46a5a8b6ed5de28e355e83c48d40 Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Thu, 23 Feb 2017 16:04:58 -0800
Subject: [PATCH 010/427] Enable Minigbm by default.

Jira: AIA-133
Test: Build passes.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/mixins.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index b99d61334..17c49f935 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -7,7 +7,7 @@ product.mk: device.mk
 [groups]
 android_ia: default
 sepolicy: permissive
-graphics: android_ia(gen9+=true,hwc2=true,vulkan=true,drmhwc=false,minigbm=false)
+graphics: android_ia(gen9+=true,hwc2=true,vulkan=true,drmhwc=false,minigbm=true)
 media: android_ia
 device-type: tablet
 ethernet: dhcp

From 3fd6b4a3a32912b4b890c324df65b819a487e26c Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Thu, 23 Feb 2017 18:00:49 -0800
Subject: [PATCH 011/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/BoardConfig.mk |  6 +++++-
 androidia_64/device.mk      |  8 ++++----
 androidia_64/init.rc        | 12 ++++++------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 19737c20c..c10fa391f 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -48,8 +48,8 @@ TARGET_USES_HWC2 := true
 BOARD_USES_DRM_HWCOMPOSER := false
 BOARD_USES_IA_HWCOMPOSER := true
 
+BOARD_USES_MINIGBM := true
 
-BOARD_USES_MINIGBM := false
 ##############################################################
 # Source: device/intel/mixins/groups/device-type/tablet/BoardConfig.mk
 ##############################################################
@@ -169,6 +169,10 @@ TARGET_ARCH := x86
 TARGET_CPU_ABI := x86
 endif
 ##############################################################
+# Source: device/intel/mixins/groups/cpuset/4cores/BoardConfig.mk
+##############################################################
+ENABLE_CPUSETS := true
+##############################################################
 # Source: device/intel/mixins/groups/rfkill/true/BoardConfig.mk
 ##############################################################
 BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/rfkill
diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 9bf6ad73a..cadff23bd 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -201,13 +201,13 @@ PRODUCT_PROPERTY_OVERRIDES += \
    hwc.drm.use_overlay_planes=1 \
    ro.hardware.hwcomposer=android_ia
 
-
-#Gralloc
+# Mini gbm
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.hardware.gralloc=drm
+    ro.hardware.gralloc=android_ia
 
 PRODUCT_PACKAGES += \
-    gralloc.drm
+    gralloc.android_ia
+
 
 
 # Mesa
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 0dde5f878..96bdf7e99 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -266,14 +266,14 @@ service wpa_supplicant /system/bin/wpa_supplicant \
     disabled
     oneshot
 ##############################################################
-# Source: device/intel/mixins/groups/cpuset/2cores/init.rc
+# Source: device/intel/mixins/groups/cpuset/4cores/init.rc
 ##############################################################
 on late-init
-    write /dev/cpuset/foreground/cpus 0-1
-    write /dev/cpuset/background/cpus 0-1
-    write /dev/cpuset/system-background/cpus 0-1
-    write /dev/cpuset/top-app/cpus 0-1
-    write /dev/cpuset/foreground/boost/cpus 0-1
+    write /dev/cpuset/foreground/cpus 0-3
+    write /dev/cpuset/background/cpus 0-3
+    write /dev/cpuset/system-background/cpus 0-3
+    write /dev/cpuset/top-app/cpus 0-3
+    write /dev/cpuset/foreground/boost/cpus 0-3
 ##############################################################
 # Source: device/intel/mixins/groups/rfkill/true/init.rc
 ##############################################################

From 6376c7e83ac27abed2386aff3f6e3cf608499494 Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Thu, 23 Feb 2017 23:02:59 -0800
Subject: [PATCH 012/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/BoardConfig.mk | 2 +-
 androidia_64/gpt.ini        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index c10fa391f..0de06baf7 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -101,7 +101,7 @@ else
 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
 endif
 
-BOARD_SYSTEMIMAGE_PARTITION_SIZE = 3171483648
+BOARD_SYSTEMIMAGE_PARTITION_SIZE = 3221225472
 
 BOARD_BOOTLOADER_PARTITION_SIZE ?= 62914560
 BOARD_BOOTLOADER_BLOCK_SIZE := 512
diff --git a/androidia_64/gpt.ini b/androidia_64/gpt.ini
index 5d6719cdf..4c1493ed2 100644
--- a/androidia_64/gpt.ini
+++ b/androidia_64/gpt.ini
@@ -47,7 +47,7 @@ guid = 20ac26be-20b7-11e3-84c5-6cfdb94711e9
 
 [partition.system]
 label = android_system
-len = 2048
+len = 3072
 type = linux
 guid = 38f428e6-d326-425d-9140-6e0ea133647c
 

From 24bc2ebc98a17e7b74b2a3d59bc306eae9ac38e6 Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Tue, 28 Feb 2017 22:54:22 -0800
Subject: [PATCH 013/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/BoardConfig.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 0de06baf7..af862c89a 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -4,6 +4,7 @@
 # Source: device/intel/mixins/groups/android_ia/default/BoardConfig.mk
 ##############################################################
 ANDROID_IA_IMAGE = $(ANDROID_IA-EFI)
+KERNEL_CROSS_COMPILE_WRAPPER := x86_64-linux-android-
 ##############################################################
 # Source: device/intel/mixins/groups/sepolicy/permissive/BoardConfig.mk.1
 ##############################################################

From d321e6d50f5d48720360552ad9e7e5dfa273a89b Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Wed, 1 Mar 2017 22:51:54 -0800
Subject: [PATCH 014/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/BoardConfig.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index af862c89a..70e40361a 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -138,7 +138,6 @@ BOARD_FLASHFILES += $(PRODUCT_OUT)/bootloader
 BOARD_FLASHFILES += $(PRODUCT_OUT)/fastboot-usb.img
 BOARD_FLASHFILES += $(PRODUCT_OUT)/recovery.img
 BOARD_FLASHFILES += $(PRODUCT_OUT)/cache.img
-BOARD_FLASHFILES += $(PRODUCT_OUT)/userdata.img
 BOARD_FLASHFILES += $(PRODUCT_OUT)/config.img
 #HACK: comment this out until we fix the vendor partition
 #BOARD_FLASHFILES += $(PRODUCT_OUT)/vendor.img

From 8b333b7283f28c607d0d258fa5a1f9d3e8a0d31a Mon Sep 17 00:00:00 2001
From: Kishore Kadiyala <kishore.kadiyala@intel.com>
Date: Wed, 1 Mar 2017 13:11:11 +0530
Subject: [PATCH 015/427] Enable Vendor partition

Enabling vendor partition

Jira: AIA-123
Test: On booting the device the vendor partition should be mounted and accessed.

Signed-off-by: Kishore Kadiyala <kishore.kadiyala@intel.com>
---
 androidia_64/init.rc     | 8 ++++----
 androidia_64/mixins.spec | 1 +
 common/firmware.mk       | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 96bdf7e99..f1dab9a52 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -314,12 +314,12 @@ on early-init
     mount binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
 
 on property:ro.enable.native.bridge.exec=1
-    copy /system/vendor/etc/binfmt_misc/arm_exe /proc/sys/fs/binfmt_misc/register
-    copy /system/vendor/etc/binfmt_misc/arm_dyn /proc/sys/fs/binfmt_misc/register
+    copy /vendor/etc/binfmt_misc/arm_exe /proc/sys/fs/binfmt_misc/register
+    copy /vendor/etc/binfmt_misc/arm_dyn /proc/sys/fs/binfmt_misc/register
 
 on property:ro.enable.native.bridge.exec64=1
-    copy /system/vendor/etc/binfmt_misc/arm64_exe /proc/sys/fs/binfmt_misc/register
-    copy /system/vendor/etc/binfmt_misc/arm64_dyn /proc/sys/fs/binfmt_misc/register
+    copy /vendor/etc/binfmt_misc/arm64_exe /proc/sys/fs/binfmt_misc/register
+    copy /vendor/etc/binfmt_misc/arm64_dyn /proc/sys/fs/binfmt_misc/register
 
 on boot
 service nativebridge /system/bin/enable_nativebridge
diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index 17c49f935..17695e739 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -29,3 +29,4 @@ disk-bus: auto
 usb: host+acc
 lights: true
 config-partition: enabled
+vendor-partition: true(partition_size=1500,partition_name=android_vendor)
diff --git a/common/firmware.mk b/common/firmware.mk
index 57d7d9b1f..f10b88565 100644
--- a/common/firmware.mk
+++ b/common/firmware.mk
@@ -36,4 +36,4 @@ LOCAL_FIRMWARE_SRC += $(foreach f,$(LOCAL_FIRMWARE_PATTERN),$(shell cd $(FIRMWAR
 LOCAL_FIRMWARE_SRC += $(foreach f,$(LOCAL_FIRMWARE_DIR),$(shell cd $(FIRMWARES_DIR) && find $(f) -type f) )
 
 PRODUCT_COPY_FILES := \
-    $(foreach f,$(LOCAL_FIRMWARE_SRC),$(FIRMWARES_DIR)/$(f):system/vendor/firmware/$(f))
+    $(foreach f,$(LOCAL_FIRMWARE_SRC),$(FIRMWARES_DIR)/$(f):vendor/firmware/$(f))

From 68675db431014f7e2b4fbacb7dbd63f19476bec6 Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Fri, 3 Mar 2017 19:06:52 -0800
Subject: [PATCH 016/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/AndroidBoard.mk | 20 +++++++++++++-------
 androidia_64/BoardConfig.mk  | 15 ++++++++++-----
 androidia_64/device.mk       |  6 +++++-
 androidia_64/fstab           |  7 +++++++
 androidia_64/installer.cmd   |  1 +
 5 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/androidia_64/AndroidBoard.mk b/androidia_64/AndroidBoard.mk
index a00b8ecbb..112a18357 100644
--- a/androidia_64/AndroidBoard.mk
+++ b/androidia_64/AndroidBoard.mk
@@ -25,7 +25,7 @@ KERNEL_NAME := bzImage
 # Set the output for the kernel build products.
 KERNEL_OUT := $(abspath $(TARGET_OUT_INTERMEDIATES)/kernel)
 KERNEL_BIN := $(KERNEL_OUT)/arch/$(TARGET_KERNEL_ARCH)/boot/$(KERNEL_NAME)
-KERNEL_MODULES_INSTALL := $(TARGET_OUT)/lib/modules
+KERNEL_MODULES_INSTALL := $(PRODUCT_OUT)/vendor/lib/modules
 
 KERNELRELEASE = $(shell cat $(KERNEL_OUT)/include/config/kernel.release)
 
@@ -36,7 +36,7 @@ build_kernel := $(MAKE) -C $(TARGET_KERNEL_SRC) \
 		KCFLAGS="$(KERNEL_CFLAGS)" \
 		KAFLAGS="$(KERNEL_AFLAGS)" \
 		$(if $(SHOW_COMMANDS),V=1) \
-		INSTALL_MOD_PATH=$(abspath $(TARGET_OUT))
+		INSTALL_MOD_PATH=$(abspath "$(PRODUCT_OUT)/vendor")
 
 KERNEL_CONFIG_FILE := device/intel/android_ia/kernel_config/$(TARGET_KERNEL_CONFIG)
 
@@ -59,16 +59,15 @@ $(ALL_EXTRA_MODULES): $(TARGET_OUT_INTERMEDIATES)/kmodule/%: $(PRODUCT_OUT)/kern
 # First copy modules keeping directory hierarchy lib/modules/`uname-r`for libkmod
 # Second, create flat hierarchy for insmod linking to previous hierarchy
 $(KERNEL_MODULES_INSTALL): $(PRODUCT_OUT)/kernel $(ALL_EXTRA_MODULES)
-	$(hide) rm -rf $(TARGET_OUT)/lib/modules
+	$(hide) rm -rf $(PRODUCT_OUT)/vendor/lib/modules
 	$(build_kernel) modules_install
 	$(hide) for kmod in "$(TARGET_EXTRA_KERNEL_MODULES)" ; do \
 		echo Installing additional kernel module $${kmod} ; \
 		$(subst +,,$(subst $(hide),,$(build_kernel))) M=$(abspath $(TARGET_OUT_INTERMEDIATES))/$${kmod}.kmodule modules_install ; \
 	done
-	$(hide) rm -f $(TARGET_OUT)/lib/modules/*/{build,source}
-	$(hide) rm -rf $(PRODUCT_OUT)/system/vendor/lib/modules
-	$(hide) mkdir -p $(PRODUCT_OUT)/system/vendor/lib/
-	$(hide) cp -rf $(TARGET_OUT)/lib/modules/$(KERNELRELEASE)/ $(PRODUCT_OUT)/system/vendor/lib/modules
+	$(hide) rm -f $(PRODUCT_OUT)/vendor/lib/modules/*/{build,source}
+	$(hide) mv $(PRODUCT_OUT)/vendor/lib/modules/$(KERNELRELEASE)/* $(PRODUCT_OUT)/vendor/lib/modules
+	$(hide) rm -rf $(PRODUCT_OUT)/vendor/lib/modules/$(KERNELRELEASE)
 	$(hide) touch $@
 
 # Makes sure any built modules will be included in the system image build.
@@ -248,4 +247,11 @@ $(INSTALLED_CONFIGIMAGE_TARGET) : $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK)
 		$(BOARD_CONFIGIMAGE_PARTITION_SIZE)
 
 INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_CONFIGIMAGE_TARGET)
+##############################################################
+# Source: device/intel/mixins/groups/vendor-partition/true/AndroidBoard.mk
+##############################################################
+
+# This is to ensure that kernel modules are installed before
+# vendor.img is generated.
+$(PRODUCT_OUT)/vendor.img : $(KERNEL_MODULES_INSTALL)
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 70e40361a..16ed587aa 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -30,8 +30,6 @@ INTEL_VA := true
 BOARD_GRAPHIC_IS_GEN := true
 BOARD_GPU_DRIVERS := i965
 BOARD_USE_MESA := true
-GRALLOC_DRM := true
-BOARD_USES_IA_PLANNER := true
 
 # System's VSYNC phase offsets in nanoseconds
 VSYNC_EVENT_PHASE_OFFSET_NS := 7500000
@@ -104,7 +102,7 @@ endif
 
 BOARD_SYSTEMIMAGE_PARTITION_SIZE = 3221225472
 
-BOARD_BOOTLOADER_PARTITION_SIZE ?= 62914560
+BOARD_BOOTLOADER_PARTITION_SIZE ?= 42914560
 BOARD_BOOTLOADER_BLOCK_SIZE := 512
 TARGET_BOOTLOADER_BOARD_NAME := $(TARGET_DEVICE)
 
@@ -139,8 +137,7 @@ BOARD_FLASHFILES += $(PRODUCT_OUT)/fastboot-usb.img
 BOARD_FLASHFILES += $(PRODUCT_OUT)/recovery.img
 BOARD_FLASHFILES += $(PRODUCT_OUT)/cache.img
 BOARD_FLASHFILES += $(PRODUCT_OUT)/config.img
-#HACK: comment this out until we fix the vendor partition
-#BOARD_FLASHFILES += $(PRODUCT_OUT)/vendor.img
+BOARD_FLASHFILES += $(PRODUCT_OUT)/vendor.img
 ##############################################################
 # Source: device/intel/mixins/groups/audio/android_ia/BoardConfig.mk
 ##############################################################
@@ -190,6 +187,14 @@ BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/set_storage
 # Source: device/intel/mixins/groups/config-partition/enabled/BoardConfig.mk
 ##############################################################
 BOARD_CONFIGIMAGE_PARTITION_SIZE := 8388608
+##############################################################
+# Source: device/intel/mixins/groups/vendor-partition/true/BoardConfig.mk
+##############################################################
+# Those 3 lines are required to enable vendor image generation.
+# Remove them if vendor partition is not used.
+TARGET_COPY_OUT_VENDOR := vendor
+BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_VENDORIMAGE_PARTITION_SIZE := 524288000
 # ------------------ END MIX-IN DEFINITIONS ------------------
 
 # Install Native Bridge
diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index cadff23bd..0e5d62783 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -289,7 +289,7 @@ TARGET_KERNEL_ARCH := x86_64
 BOARD_USE_64BIT_KERNEL := true
 
 
-KERNEL_MODULES_ROOT_PATH ?= /system/lib/modules
+KERNEL_MODULES_ROOT_PATH ?= /vendor/lib/modules
 KERNEL_MODULES_ROOT ?= $(KERNEL_MODULES_ROOT_PATH)
 
 FIRMWARES_DIR ?= vendor/linux/firmware
@@ -371,6 +371,10 @@ PRODUCT_PACKAGES += \
 # Source: device/intel/mixins/groups/lights/true/product.mk
 ##############################################################
 PRODUCT_PACKAGES += lights.android_ia
+##############################################################
+# Source: device/intel/mixins/groups/vendor-partition/true/product.mk
+##############################################################
+PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/mmcblk1p10
 # ------------------ END MIX-IN DEFINITIONS ------------------
 PRODUCT_PACKAGES += libhoudini houdini
 PRODUCT_PROPERTY_OVERRIDES += ro.dalvik.vm.isa.arm=x86 ro.enable.native.bridge.exec=1
diff --git a/androidia_64/fstab b/androidia_64/fstab
index 4a1633951..6729e017e 100644
--- a/androidia_64/fstab
+++ b/androidia_64/fstab
@@ -26,4 +26,11 @@
 # Source: device/intel/mixins/groups/config-partition/enabled/fstab
 ##############################################################
 /dev/block/mmcblk1p11	/config         ext4    noatime,nosuid,nodev,errors=panic          wait,check
+##############################################################
+# Source: device/intel/mixins/groups/vendor-partition/true/fstab
+##############################################################
+# Following line is required if you use a vendor image.
+# If the vendor image is not used,
+# following line should be commented with the related ones in BoardConfig.mk
+/dev/block/mmcblk1p10	/vendor         ext4    ro                                         wait,verify=/dev/block/mmcblk1p6
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/installer.cmd b/androidia_64/installer.cmd
index 0a4da4040..c1f87d80e 100644
--- a/androidia_64/installer.cmd
+++ b/androidia_64/installer.cmd
@@ -11,6 +11,7 @@ erase metadata
 format config
 format cache
 format data
+flash vendor vendor.img
 flash boot boot.img
 flash recovery recovery.img
 flash system system.img

From 3a1b900366170cbfbde7598f5e36c1bbc2a9df43 Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Thu, 9 Mar 2017 16:45:15 -0800
Subject: [PATCH 017/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/BoardConfig.mk | 2 +-
 androidia_64/gpt.ini        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 16ed587aa..247b09905 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -100,7 +100,7 @@ else
 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
 endif
 
-BOARD_SYSTEMIMAGE_PARTITION_SIZE = 3221225472
+BOARD_SYSTEMIMAGE_PARTITION_SIZE = 3489660928
 
 BOARD_BOOTLOADER_PARTITION_SIZE ?= 42914560
 BOARD_BOOTLOADER_BLOCK_SIZE := 512
diff --git a/androidia_64/gpt.ini b/androidia_64/gpt.ini
index 4c1493ed2..1133c42e4 100644
--- a/androidia_64/gpt.ini
+++ b/androidia_64/gpt.ini
@@ -47,7 +47,7 @@ guid = 20ac26be-20b7-11e3-84c5-6cfdb94711e9
 
 [partition.system]
 label = android_system
-len = 3072
+len = 3328
 type = linux
 guid = 38f428e6-d326-425d-9140-6e0ea133647c
 

From c1080392e61a2a3f65d4974d37c9d3fbcf692dac Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Sat, 11 Mar 2017 02:47:45 -0800
Subject: [PATCH 018/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/BoardConfig.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 247b09905..0ab7fe8be 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -38,16 +38,15 @@ SF_VSYNC_EVENT_PHASE_OFFSET_NS := 5000000
 BOARD_GPU_DRIVERS ?= i965 swrast
 ifneq ($(strip $(BOARD_GPU_DRIVERS)),)
 TARGET_HARDWARE_3D := true
-endif
-
 TARGET_USES_HWC2 := true
-
+endif
 
 
 BOARD_USES_DRM_HWCOMPOSER := false
 BOARD_USES_IA_HWCOMPOSER := true
 
 BOARD_USES_MINIGBM := true
+BOARD_ENABLE_EXPLICIT_SYNC := true
 
 ##############################################################
 # Source: device/intel/mixins/groups/device-type/tablet/BoardConfig.mk

From 6bc517baa8a1cd322f4699626db00bc146cd281f Mon Sep 17 00:00:00 2001
From: Michael Goffioul <michael.goffioul@lincor.com>
Date: Sat, 11 Mar 2017 18:55:44 -0500
Subject: [PATCH 019/427] Enable CONFIG_CPUSETS in the kernel.

ENABLE_CPUSET is enable in Android through the use of the 4cores mixins.
This requires support in the kernel.

JIRA: AIA-210
Test: No more schedpolicy errors seen in logcat.
      i.e. SchedPolicy: add_tid_to_cgroup failed; fd=-1

Signed-off-by: Michael Goffioul <michael.goffioul@lincor.com>
---
 kernel_config/kernel_64_defconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 4cbaca2be..48aad803e 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -146,7 +146,9 @@ CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
 # CONFIG_CGROUP_PIDS is not set
 CONFIG_CGROUP_FREEZER=y
-# CONFIG_CPUSETS is not set
+CONFIG_CPUSETS=y
+# TODO: Enable this when switching to Android Common Kernel
+# CONFIG_SCHEDTUNE is not set
 # CONFIG_CGROUP_DEVICE is not set
 CONFIG_CGROUP_CPUACCT=y
 # CONFIG_CGROUP_PERF is not set

From d9285622ceb98d083388dd30551986202147a96c Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Mon, 13 Mar 2017 20:54:24 -0700
Subject: [PATCH 020/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/device.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 0e5d62783..b39be13c9 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -234,6 +234,14 @@ PRODUCT_PROPERTY_OVERRIDES += \
 ##############################################################
 # Source: device/intel/mixins/groups/media/android_ia/product.mk
 ##############################################################
+# libva, vaapi
+PRODUCT_PACKAGES += \
+    libva \
+    libva-android \
+    libva-egl \
+    libva-tpi \
+    i965_drv_video
+
 # Audio/video codec support.
 PRODUCT_COPY_FILES += \
     frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \

From 146d6591978516428c0ac94655caaf04412f76b2 Mon Sep 17 00:00:00 2001
From: Harish Krupo <harish.krupo.kps@intel.com>
Date: Fri, 14 Apr 2017 06:14:35 +0530
Subject: [PATCH 021/427] Enable squashfs compression

Use squashfs compression for system and vendor image

JIRA: AIA-113
Test: Boots to homescreen

Signed-off-by: Harish Krupo <harish.krupo.kps@intel.com>
---
 kernel_config/kernel_64_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 48aad803e..20f931e0b 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -6340,9 +6340,9 @@ CONFIG_SQUASHFS_FILE_DIRECT=y
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_ZLIB=y
-# CONFIG_SQUASHFS_LZ4 is not set
-# CONFIG_SQUASHFS_LZO is not set
-# CONFIG_SQUASHFS_XZ is not set
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
 CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3

From 29bae014ee4b1fdadd3d2fec284e25eebc54e38b Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Tue, 14 Mar 2017 12:46:06 -0700
Subject: [PATCH 022/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/BoardConfig.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 0ab7fe8be..1b0d15158 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -97,6 +97,7 @@ ifeq ($(SPARSE_IMG),true)
 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false
 else
 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
+BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := squashfs
 endif
 
 BOARD_SYSTEMIMAGE_PARTITION_SIZE = 3489660928
@@ -192,8 +193,12 @@ BOARD_CONFIGIMAGE_PARTITION_SIZE := 8388608
 # Those 3 lines are required to enable vendor image generation.
 # Remove them if vendor partition is not used.
 TARGET_COPY_OUT_VENDOR := vendor
-BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_VENDORIMAGE_PARTITION_SIZE := 524288000
+ifeq ($(SPARSE_IMG),true)
+BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
+else
+BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := squashfs
+endif
 # ------------------ END MIX-IN DEFINITIONS ------------------
 
 # Install Native Bridge

From fd25db0efe35adc69a7d551c071f03a7f40ee33f Mon Sep 17 00:00:00 2001
From: Michael Goffioul <michael.goffioul@lincor.com>
Date: Tue, 14 Mar 2017 18:06:08 -0400
Subject: [PATCH 023/427] Use TARGET_COPY_OUT_VENDOR instead of hardcoded
 /vendor path.

Jira: None
Test: Boot to home screen

Signed-off-by: Michael Goffioul <michael.goffioul@gmail.com>
---
 common/firmware.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/firmware.mk b/common/firmware.mk
index f10b88565..36ce2129e 100644
--- a/common/firmware.mk
+++ b/common/firmware.mk
@@ -36,4 +36,4 @@ LOCAL_FIRMWARE_SRC += $(foreach f,$(LOCAL_FIRMWARE_PATTERN),$(shell cd $(FIRMWAR
 LOCAL_FIRMWARE_SRC += $(foreach f,$(LOCAL_FIRMWARE_DIR),$(shell cd $(FIRMWARES_DIR) && find $(f) -type f) )
 
 PRODUCT_COPY_FILES := \
-    $(foreach f,$(LOCAL_FIRMWARE_SRC),$(FIRMWARES_DIR)/$(f):vendor/firmware/$(f))
+    $(foreach f,$(LOCAL_FIRMWARE_SRC),$(FIRMWARES_DIR)/$(f):$(TARGET_COPY_OUT_VENDOR)/firmware/$(f))

From b74048406568753bd35c0aec3d3942406461c866 Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Tue, 14 Mar 2017 23:13:14 -0700
Subject: [PATCH 024/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/AndroidBoard.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/androidia_64/AndroidBoard.mk b/androidia_64/AndroidBoard.mk
index 112a18357..86d68e4d0 100644
--- a/androidia_64/AndroidBoard.mk
+++ b/androidia_64/AndroidBoard.mk
@@ -25,7 +25,7 @@ KERNEL_NAME := bzImage
 # Set the output for the kernel build products.
 KERNEL_OUT := $(abspath $(TARGET_OUT_INTERMEDIATES)/kernel)
 KERNEL_BIN := $(KERNEL_OUT)/arch/$(TARGET_KERNEL_ARCH)/boot/$(KERNEL_NAME)
-KERNEL_MODULES_INSTALL := $(PRODUCT_OUT)/vendor/lib/modules
+KERNEL_MODULES_INSTALL := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules
 
 KERNELRELEASE = $(shell cat $(KERNEL_OUT)/include/config/kernel.release)
 
@@ -36,7 +36,7 @@ build_kernel := $(MAKE) -C $(TARGET_KERNEL_SRC) \
 		KCFLAGS="$(KERNEL_CFLAGS)" \
 		KAFLAGS="$(KERNEL_AFLAGS)" \
 		$(if $(SHOW_COMMANDS),V=1) \
-		INSTALL_MOD_PATH=$(abspath "$(PRODUCT_OUT)/vendor")
+		INSTALL_MOD_PATH=$(abspath "$(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)")
 
 KERNEL_CONFIG_FILE := device/intel/android_ia/kernel_config/$(TARGET_KERNEL_CONFIG)
 
@@ -59,15 +59,15 @@ $(ALL_EXTRA_MODULES): $(TARGET_OUT_INTERMEDIATES)/kmodule/%: $(PRODUCT_OUT)/kern
 # First copy modules keeping directory hierarchy lib/modules/`uname-r`for libkmod
 # Second, create flat hierarchy for insmod linking to previous hierarchy
 $(KERNEL_MODULES_INSTALL): $(PRODUCT_OUT)/kernel $(ALL_EXTRA_MODULES)
-	$(hide) rm -rf $(PRODUCT_OUT)/vendor/lib/modules
+	$(hide) rm -rf $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules
 	$(build_kernel) modules_install
 	$(hide) for kmod in "$(TARGET_EXTRA_KERNEL_MODULES)" ; do \
 		echo Installing additional kernel module $${kmod} ; \
 		$(subst +,,$(subst $(hide),,$(build_kernel))) M=$(abspath $(TARGET_OUT_INTERMEDIATES))/$${kmod}.kmodule modules_install ; \
 	done
-	$(hide) rm -f $(PRODUCT_OUT)/vendor/lib/modules/*/{build,source}
-	$(hide) mv $(PRODUCT_OUT)/vendor/lib/modules/$(KERNELRELEASE)/* $(PRODUCT_OUT)/vendor/lib/modules
-	$(hide) rm -rf $(PRODUCT_OUT)/vendor/lib/modules/$(KERNELRELEASE)
+	$(hide) rm -f $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/*/{build,source}
+	$(hide) mv $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/$(KERNELRELEASE)/* $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules
+	$(hide) rm -rf $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/$(KERNELRELEASE)
 	$(hide) touch $@
 
 # Makes sure any built modules will be included in the system image build.

From 9e72f629d3d4cbad599ab4540abd123dc3d2c4ae Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Wed, 15 Mar 2017 21:52:28 -0700
Subject: [PATCH 025/427] Enable CONFIG_SCHEDTUNE.

Jira: None.
Test: Boots to home screen.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 kernel_config/kernel_64_defconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 20f931e0b..74b170dad 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -147,8 +147,7 @@ CONFIG_RT_GROUP_SCHED=y
 # CONFIG_CGROUP_PIDS is not set
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CPUSETS=y
-# TODO: Enable this when switching to Android Common Kernel
-# CONFIG_SCHEDTUNE is not set
+CONFIG_SCHEDTUNE=y
 # CONFIG_CGROUP_DEVICE is not set
 CONFIG_CGROUP_CPUACCT=y
 # CONFIG_CGROUP_PERF is not set

From fda59c5633497613a60a62bc9a4229ad596f62bf Mon Sep 17 00:00:00 2001
From: Sameer Lattannavar <sameer.lattannavar@intel.com>
Date: Mon, 13 Mar 2017 22:42:21 +0530
Subject: [PATCH 026/427] Enable the generic interactive governor

Summary: Enabling generic interactive governor.
       The interactive governor can be used with the acpi-cpufreq
       driver to scale cpu frequencies.

Jira: none

Test: Able to boot with Interactive governor enabled by default,
      and CPU changing the frequencies based on the load.

Signed-off-by: Sameer Lattannavar <sameer.lattannavar@intel.com>
---
 kernel_config/kernel_64_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 74b170dad..8e2ffae58 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -607,6 +607,7 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 # CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set
+CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
 
 #
 # CPU frequency scaling drivers

From 77557994ad85112dc538195775698e13e6180af3 Mon Sep 17 00:00:00 2001
From: Kishore Kadiyala <kishore.kadiyala@intel.com>
Date: Fri, 17 Mar 2017 16:22:21 +0530
Subject: [PATCH 027/427] Enable adb over USB

enabling adb over usb in mixins and tested on Joule

Bug Id: https://01.org/jira/browse/AIA-67
Test: adb devices and adb shell works from the host

Signed-off-by: Carlos Santa <carlos.santa@intel.com>
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Signed-off-by: Kishore Kadiyala <kishore.kadiyala@intel.com>
---
 androidia_64/mixins.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index 17695e739..ba7689a1d 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -14,7 +14,7 @@ ethernet: dhcp
 debugfs: default
 storage: default
 display-density: default
-usb-gadget: default
+usb-gadget: g_ffs
 adb_net: true
 kernel: android_ia
 bluetooth: btusb

From dd73199370e9748d8bbd9811508ffeadaa9ba1d2 Mon Sep 17 00:00:00 2001
From: Shobhit Kumar <shobhit.kumar@intel.com>
Date: Fri, 17 Mar 2017 17:45:35 +0530
Subject: [PATCH 028/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Shobhit Kumar <shobhit.kumar@intel.com>
---
 androidia_64/init.rc | 47 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index f1dab9a52..7c7a19972 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -68,6 +68,9 @@ on boot
     chmod 0660 /sys/devices/system/cpu/intel_pstate/max_perf_pct
     write /sys/kernel/debug/pstate_snb/setpoint 75
 
+    # adb over ethernet
+    setprop service.adb.tcp.port 5555
+
 service watchdogd /sbin/watchdogd 10 30
     user root
     class core
@@ -147,24 +150,44 @@ on init
     symlink /sdcard /storage/sdcard0
 
 ##############################################################
-# Source: device/intel/mixins/groups/usb-gadget/default/init.rc
+# Source: device/intel/mixins/groups/usb-gadget/g_ffs/init.rc
 ##############################################################
 on fs
+    write /sys/class/android_usb/android0/f_ffs/aliases adb
+    write /sys/class/android_usb/android0/iSerial ${ro.serialno}
+
+on boot
+    # Create mount-point for ConfigFS USB gadgets
+    # Add standard gadget entries
+    mount configfs none /config
+    mkdir /config/usb_gadget/g1 0770 shell shell
+    write /config/usb_gadget/g1/idVendor 0x18d1
+    mkdir /config/usb_gadget/g1/strings/0x409 0770 shell shell
+    write /config/usb_gadget/g1/strings/0x409/serialnumber ${ro.serialno}
+    write /config/usb_gadget/g1/strings/0x409/manufacturer ${ro.product.manufacturer}
+    write /config/usb_gadget/g1/strings/0x409/product ${ro.product.model}
+    mkdir /config/usb_gadget/g1/functions/ffs.adb 0770 shell shell
+    mkdir /config/usb_gadget/g1/configs/b.1 0770 shell shell
+    mkdir /config/usb_gadget/g1/configs/b.1/strings/0x409 0770 shell shell
+    write /config/usb_gadget/g1/configs/b.1/MaxPower 500
+    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f1
+
+    # Create adb+ffs gadget function
     mkdir /dev/usb-ffs 0770 shell shell
     mkdir /dev/usb-ffs/adb 0770 shell shell
     mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=2000
 
-on boot
-    # USB Gadget initialization
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/iManufacturer ${ro.product.manufacturer}
-    write /sys/class/android_usb/android0/iProduct ${ro.product.model}
-    write /sys/class/android_usb/android0/iSerial ${ro.serialno}
-    write /sys/class/android_usb/android0/f_ffs/aliases adb
-    write /sys/class/android_usb/android0/functions adb
-    write /sys/class/android_usb/android0/idVendor 8087
-    write /sys/class/android_usb/android0/idProduct 09ef
-    write /sys/class/android_usb/android0/enable 1
+    # Enable USB Gadget Configfs interface and make DWC3 the controller
+    setprop sys.usb.configfs 1
+    setprop sys.usb.controller dwc3.0.auto
+    write /config/usb_gadget/g1/UDC dwc3.0.auto
+
+on property:sys.usb.config=none && property:sys.usb.configfs=1
+    write /config/usb_gadget/g1/os_desc/use 0
+    setprop sys.usb.ffs.ready 0
+
+on property:init.svc.adbd=stopped
+    setprop sys.usb.ffs.ready 0
 ##############################################################
 # Source: device/intel/mixins/groups/adb_net/true/init.rc
 ##############################################################

From cbbfb169732c26c679040605bbd76505edc45445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tapani=20P=C3=A4lli?= <tapani.palli@intel.com>
Date: Mon, 20 Mar 2017 13:52:45 +0200
Subject: [PATCH 029/427] rename vulkan.mesa_intel.so -> libvulkan_intel.so
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

JIRA: None
Test: Pass Vulkan dEQP-VK.wsi.android.swapchain.render.basic
      and see triangle rendered on the screen

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
---
 androidia_64/device.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index b39be13c9..fcc99c663 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -227,7 +227,7 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_PACKAGES += \
     vulkan.android_ia \
-    vulkan.mesa_intel
+    libvulkan_intel
 
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.hardware.vulkan=android_ia

From ed315a3922f374ed8761019c88534e83bc54e7be Mon Sep 17 00:00:00 2001
From: Abhilash Kesavan <abhilash.kesavan@intel.com>
Date: Fri, 17 Mar 2017 21:10:11 +0530
Subject: [PATCH 030/427] Enable Intel Telemetry driver

The telemetry driver can give us useful information regarding
entry into S0ix states from APL platforms onwards. The information
can be accessed via attributes in /sys/kernel/debug/telemetry.

Jira: none
Test: Boot to homescreen and access the telemetry debugfs
      attributes.

Signed-off-by: Abhilash Kesavan <abhilash.kesavan@intel.com>
---
 kernel_config/kernel_64_defconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 8e2ffae58..5f46ee72e 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -5727,7 +5727,8 @@ CONFIG_INTEL_SMARTCONNECT=m
 CONFIG_PVPANIC=m
 CONFIG_INTEL_PMC_IPC=y
 CONFIG_SURFACE_PRO3_BUTTON=m
-# CONFIG_INTEL_PUNIT_IPC is not set
+CONFIG_INTEL_PUNIT_IPC=y
+CONFIG_INTEL_TELEMETRY=y
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
 # CONFIG_CHROMEOS_PSTORE is not set

From 0d8221e6c81b0bde31f57177637e6fbbc5b95eea Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Tue, 21 Mar 2017 12:14:28 -0700
Subject: [PATCH 031/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/AndroidBoard.mk | 4 ++--
 androidia_64/BoardConfig.mk  | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/androidia_64/AndroidBoard.mk b/androidia_64/AndroidBoard.mk
index 86d68e4d0..4bfd25881 100644
--- a/androidia_64/AndroidBoard.mk
+++ b/androidia_64/AndroidBoard.mk
@@ -3,8 +3,8 @@
 ##############################################################
 # Source: device/intel/mixins/groups/android_ia/default/AndroidBoard.mk
 ##############################################################
-droid: android_ia-efi
-	-$(hide) $(ACP) $(ANDROID_IA_IMAGE) $(DIST_DIR)
+droid: flashfiles
+	-$(hide) $(ACP) $(out_flashfiles) $(DIST_DIR)
 ##############################################################
 # Source: device/intel/mixins/groups/kernel/android_ia/AndroidBoard.mk
 ##############################################################
diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 1b0d15158..00fd27ab6 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -3,7 +3,6 @@
 ##############################################################
 # Source: device/intel/mixins/groups/android_ia/default/BoardConfig.mk
 ##############################################################
-ANDROID_IA_IMAGE = $(ANDROID_IA-EFI)
 KERNEL_CROSS_COMPILE_WRAPPER := x86_64-linux-android-
 ##############################################################
 # Source: device/intel/mixins/groups/sepolicy/permissive/BoardConfig.mk.1

From 4f868389aa339038f330615c6aa8e6b55f5fe8a5 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Tue, 21 Mar 2017 01:23:46 +0530
Subject: [PATCH 032/427] Remove unwanted firmware configs from kernel
 defconfig

Unused firmware binaries are getting generated in vendor/lib/firmware.
These firmwares are generated by kernel.
Hence, Remove unwanted firmware configs from kernel defconfig.

Jira : AIA-241
Test : Device boots to home screen. Adb, wifi, bt works fine.

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 kernel_config/kernel_64_defconfig | 72 +++++++++++++++----------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 5f46ee72e..9aae019bd 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -688,7 +688,7 @@ CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
+# CONFIG_PCMCIA_LOAD_CIS is not set
 CONFIG_CARDBUS=y
 
 #
@@ -1913,17 +1913,17 @@ CONFIG_ARCNET_COM20020_PCI=m
 #
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_PCMCIA_3C574 is not set
+# CONFIG_PCMCIA_3C589 is not set
 CONFIG_VORTEX=m
 CONFIG_TYPHOON=m
-CONFIG_NET_VENDOR_ADAPTEC=y
-CONFIG_ADAPTEC_STARFIRE=m
+# CONFIG_NET_VENDOR_ADAPTEC is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
 CONFIG_NET_VENDOR_AGERE=y
 CONFIG_ET131X=m
 CONFIG_NET_VENDOR_ALTEON=y
-CONFIG_ACENIC=m
+# CONFIG_ACENIC is not set
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 CONFIG_ALTERA_TSE=m
 CONFIG_NET_VENDOR_AMD=y
@@ -1951,8 +1951,8 @@ CONFIG_B44_PCI=y
 CONFIG_BCMGENET=m
 CONFIG_BNX2=m
 CONFIG_CNIC=m
-CONFIG_TIGON3=m
-CONFIG_BNX2X=m
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2X is not set
 # CONFIG_SYSTEMPORT is not set
 CONFIG_BNXT=m
 CONFIG_NET_VENDOR_BROCADE=y
@@ -1965,7 +1965,7 @@ CONFIG_LIQUIDIO=m
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
+# CONFIG_CHELSIO_T3 is not set
 CONFIG_CHELSIO_T4=m
 CONFIG_CHELSIO_T4VF=m
 CONFIG_NET_VENDOR_CISCO=y
@@ -2003,7 +2003,7 @@ CONFIG_PCMCIA_FMVJ18X=m
 CONFIG_NET_VENDOR_HP=y
 CONFIG_HP100=m
 CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E100=m
+# CONFIG_E100 is not set
 CONFIG_E1000=m
 CONFIG_E1000E=m
 CONFIG_E1000E_HWTS=y
@@ -2059,7 +2059,7 @@ CONFIG_NET_VENDOR_NETRONOME=y
 CONFIG_NET_VENDOR_8390=y
 CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
-CONFIG_PCMCIA_PCNET=m
+# CONFIG_PCMCIA_PCNET is not set
 CONFIG_NET_VENDOR_NVIDIA=y
 CONFIG_FORCEDETH=m
 CONFIG_NET_VENDOR_OKI=y
@@ -2103,7 +2103,7 @@ CONFIG_SFC_MTD=y
 CONFIG_SFC_MCDI_MON=y
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_NET_VENDOR_SMSC=y
-CONFIG_PCMCIA_SMC91C92=m
+# CONFIG_PCMCIA_SMC91C92 is not set
 CONFIG_EPIC100=m
 CONFIG_SMSC911X=m
 # CONFIG_SMSC911X_ARCH_HOOKS is not set
@@ -2113,15 +2113,15 @@ CONFIG_STMMAC_ETH=m
 CONFIG_STMMAC_PLATFORM=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_STMMAC_PCI=m
-CONFIG_NET_VENDOR_SUN=y
+# CONFIG_NET_VENDOR_SUN is not set
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
 CONFIG_CASSINI=m
 CONFIG_NIU=m
 CONFIG_NET_VENDOR_SYNOPSYS=y
 CONFIG_SYNOPSYS_DWC_ETH_QOS=m
-CONFIG_NET_VENDOR_TEHUTI=y
-CONFIG_TEHUTI=m
+# CONFIG_NET_VENDOR_TEHUTI is not set
+# CONFIG_TEHUTI is not set
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_ALE is not set
 CONFIG_TLAN=m
@@ -2202,7 +2202,7 @@ CONFIG_SLHC=m
 # CONFIG_SLIP_MODE_SLIP6 is not set
 CONFIG_USB_NET_DRIVERS=y
 CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
+# CONFIG_USB_KAWETH is not set
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
@@ -2806,7 +2806,7 @@ CONFIG_SERIAL_8250_PNP=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_DMA=y
 CONFIG_SERIAL_8250_PCI=m
-CONFIG_SERIAL_8250_CS=m
+# CONFIG_SERIAL_8250_CS is not set
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_8250_EXTENDED=y
@@ -3711,7 +3711,7 @@ CONFIG_USB_GSPCA_ZC3XX=m
 CONFIG_USB_PWC=m
 # CONFIG_USB_PWC_DEBUG is not set
 CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_VIDEO_CPIA2=m
+# CONFIG_VIDEO_CPIA2 is not set
 CONFIG_USB_ZR364XX=m
 CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
@@ -3781,7 +3781,7 @@ CONFIG_DVB_USB_LME2510=m
 CONFIG_DVB_USB_MXL111SF=m
 CONFIG_DVB_USB_RTL28XXU=m
 # CONFIG_DVB_USB_DVBSKY is not set
-CONFIG_DVB_TTUSB_BUDGET=m
+# CONFIG_DVB_TTUSB_BUDGET is not set
 CONFIG_DVB_TTUSB_DEC=m
 CONFIG_SMS_USB_DRV=m
 CONFIG_DVB_B2C2_FLEXCOP_USB=m
@@ -3843,9 +3843,9 @@ CONFIG_VIDEO_SAA7164=m
 #
 # Media digital TV PCI Adapters
 #
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
+# CONFIG_DVB_AV7110_IR is not set
+# CONFIG_DVB_AV7110 is not set
+# CONFIG_DVB_AV7110_OSD is not set
 CONFIG_DVB_BUDGET_CORE=m
 CONFIG_DVB_BUDGET=m
 CONFIG_DVB_BUDGET_CI=m
@@ -4292,7 +4292,7 @@ CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
+# CONFIG_DRM_RADEON is not set
 # CONFIG_DRM_RADEON_USERPTR is not set
 CONFIG_DRM_AMDGPU=m
 CONFIG_DRM_AMDGPU_CIK=y
@@ -4551,7 +4551,7 @@ CONFIG_SND_DUMMY=m
 # CONFIG_SND_ALOOP is not set
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
+# CONFIG_SND_MTS64 is not set
 CONFIG_SND_SERIAL_U16550=m
 CONFIG_SND_MPU401=m
 CONFIG_SND_PORTMAN2X4=m
@@ -4611,10 +4611,10 @@ CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
+# CONFIG_SND_KORG1212 is not set
 CONFIG_SND_LOLA=m
 CONFIG_SND_LX6464ES=m
-CONFIG_SND_MAESTRO3=m
+# CONFIG_SND_MAESTRO3 is not set
 CONFIG_SND_MAESTRO3_INPUT=y
 CONFIG_SND_MIXART=m
 CONFIG_SND_NM256=m
@@ -4629,7 +4629,7 @@ CONFIG_SND_VIA82XX=m
 CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
+# CONFIG_SND_YMFPCI is not set
 
 #
 # HD-Audio
@@ -5080,7 +5080,7 @@ CONFIG_USB_SERIAL_AIRCABLE=m
 CONFIG_USB_SERIAL_ARK3116=m
 CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
 CONFIG_USB_SERIAL_CP210X=m
 CONFIG_USB_SERIAL_CYPRESS_M8=m
@@ -5089,13 +5089,13 @@ CONFIG_USB_SERIAL_FTDI_SIO=m
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_IPAQ=m
 CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
 CONFIG_USB_SERIAL_F81232=m
 CONFIG_USB_SERIAL_GARMIN=m
 CONFIG_USB_SERIAL_IPW=m
 CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
 CONFIG_USB_SERIAL_KEYSPAN=m
 CONFIG_USB_SERIAL_KLSI=m
 CONFIG_USB_SERIAL_KOBIL_SCT=m
@@ -5115,9 +5115,9 @@ CONFIG_USB_SERIAL_SAFE=m
 # CONFIG_USB_SERIAL_SAFE_PADDED is not set
 CONFIG_USB_SERIAL_SIERRAWIRELESS=m
 CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
+# CONFIG_USB_SERIAL_TI is not set
 CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
+# CONFIG_USB_SERIAL_XIRCOM is not set
 CONFIG_USB_SERIAL_WWAN=m
 CONFIG_USB_SERIAL_OPTION=m
 CONFIG_USB_SERIAL_OMNINET=m
@@ -5131,8 +5131,8 @@ CONFIG_USB_SERIAL_QT2=m
 #
 # USB Miscellaneous drivers
 #
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
 # CONFIG_USB_ADUTUX is not set
 # CONFIG_USB_SEVSEG is not set
 # CONFIG_USB_RIO500 is not set

From c097f3fa6e380a9c60326507cc2199ea2c30001e Mon Sep 17 00:00:00 2001
From: Michael Goffioul <michael.goffioul@lincor.com>
Date: Tue, 14 Mar 2017 19:50:47 -0400
Subject: [PATCH 033/427] Enable built-in mic.

After boot, the built-in mic doesn't work, because it's not enabled in
the mixer settings. One needs to set:
- Capture Switch => 1
- Capture Volume => non-zero (63 in my case)

Jira: https://01.org/jira/browse/AIA-228
Test: mic is working after boot

Signed-off-by: Michael Goffioul <michael.goffioul@gmail.com>
---
 common/audio/mixer_paths.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/audio/mixer_paths.xml b/common/audio/mixer_paths.xml
index a329af79a..60a02e71f 100644
--- a/common/audio/mixer_paths.xml
+++ b/common/audio/mixer_paths.xml
@@ -193,6 +193,8 @@
     <ctl name="HDMI Mixer MultiMedia4" value="0" />
     <ctl name="Master Playback Volume" value="100" />
     <ctl name="Master Playback Switch" value="100" />
+    <ctl name="Capture Switch" value="1" />
+    <ctl name="Capture Volume" value="63" />
     <!-- echo reference -->
     <ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />
     <!-- usb headset -->

From 289ddb4c30513522d1c46000dd703718eb7b80d6 Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Thu, 23 Mar 2017 09:29:06 -0700
Subject: [PATCH 034/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/AndroidBoard.mk |  1 -
 androidia_64/BoardConfig.mk  | 15 +++++++++------
 androidia_64/device.mk       |  8 +++++++-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/androidia_64/AndroidBoard.mk b/androidia_64/AndroidBoard.mk
index 4bfd25881..034a52bfe 100644
--- a/androidia_64/AndroidBoard.mk
+++ b/androidia_64/AndroidBoard.mk
@@ -16,7 +16,6 @@ TARGET_KERNEL_SRC ?= kernel/android_ia
 
 TARGET_KERNEL_ARCH := x86_64
 TARGET_KERNEL_CONFIG ?= kernel_64_defconfig
-ADDITIONAL_DEFAULT_PROPERTIES += ro.boot.moduleslocation=/vendor/lib/modules
 
 KERNEL_CONFIG_DIR := device/intel/android_ia/kernel_config
 
diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 00fd27ab6..0225bb2a9 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -55,11 +55,6 @@ DEVICE_PACKAGE_OVERLAYS += device/intel/common/device-type/overlay-tablet
 # Source: device/intel/mixins/groups/debugfs/default/BoardConfig.mk
 ##############################################################
 BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/debugfs
-##############################################################
-# Source: device/intel/mixins/groups/display-density/default/BoardConfig.mk
-##############################################################
-ADDITIONAL_DEFAULT_PROPERTIES += ro.sf.lcd_density=160
-
 ##############################################################
 # Source: device/intel/mixins/groups/kernel/android_ia/BoardConfig.mk
 ##############################################################
@@ -71,7 +66,15 @@ TARGET_SUPPORTS_64_BIT_APPS := true
 TARGET_PRELINK_MODULE := false
 TARGET_NO_KERNEL ?= false
 
-BOARD_KERNEL_CMDLINE += root=/dev/ram0 androidboot.hardware=$(TARGET_PRODUCT) androidboot.selinux=permissive firmware_class.path=/vendor/firmware
+SERIAL_PARAMETER := console=tty0 console=ttyS2,115200n8
+
+BOARD_KERNEL_CMDLINE += root=/dev/ram0  androidboot.hardware=$(TARGET_PRODUCT) androidboot.selinux=permissive firmware_class.path=/vendor/firmware
+
+ifneq ($(TARGET_BUILD_VARIANT),user)
+ifeq ($(SPARSE_IMG),true)
+BOARD_KERNEL_CMDLINE += $(SERIAL_PARAMETER)
+endif
+endif
 ##############################################################
 # Source: device/intel/mixins/groups/bluetooth/btusb/BoardConfig.mk
 ##############################################################
diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index fcc99c663..deffb1fe5 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -267,7 +267,7 @@ PRODUCT_COPY_FILES += \
         frameworks/native/data/etc/tablet_core_hardware.xml:system/etc/permissions/tablet_core_hardware.xml
 
 PRODUCT_AAPT_CONFIG := normal large xlarge mdpi hdpi xhdpi
-PRODUCT_AAPT_PREF_CONFIG := hdpi
+PRODUCT_AAPT_PREF_CONFIG := mdpi
 
 PRODUCT_PROPERTY_OVERRIDES += \
    ro.sf.lcd_density=160
@@ -283,6 +283,11 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PROPERTY_OVERRIDES += \
    net.eth0.startonboot=1
 
+##############################################################
+# Source: device/intel/mixins/groups/display-density/default/product.mk
+##############################################################
+ADDITIONAL_DEFAULT_PROPERTIES += ro.sf.lcd_density=160
+
 ##############################################################
 # Source: device/intel/mixins/groups/adb_net/true/product.mk
 ##############################################################
@@ -299,6 +304,7 @@ BOARD_USE_64BIT_KERNEL := true
 
 KERNEL_MODULES_ROOT_PATH ?= /vendor/lib/modules
 KERNEL_MODULES_ROOT ?= $(KERNEL_MODULES_ROOT_PATH)
+ADDITIONAL_DEFAULT_PROPERTIES += ro.boot.moduleslocation=/vendor/lib/modules
 
 FIRMWARES_DIR ?= vendor/linux/firmware
 

From cec199bada8f37e7d1dd3909093d65a1337b357c Mon Sep 17 00:00:00 2001
From: Qin Chao <chao.qin@intel.com>
Date: Tue, 21 Mar 2017 14:00:35 +0800
Subject: [PATCH 035/427] Fix: enable UART console on Joule

Jira: None
Test: Serial logs come out on Joule when add kernel cmdline console=/dev/ttyS2.

Signed-off-by: Qin Chao chao.qin@intel.com
---
 kernel_config/kernel_64_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 9aae019bd..2deef0cc1 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -2815,7 +2815,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
 CONFIG_SERIAL_8250_DETECT_IRQ=y
 CONFIG_SERIAL_8250_RSA=y
 # CONFIG_SERIAL_8250_FSL is not set
-CONFIG_SERIAL_8250_DW=m
+CONFIG_SERIAL_8250_DW=y
 # CONFIG_SERIAL_8250_RT288X is not set
 # CONFIG_SERIAL_8250_MID is not set
 # CONFIG_SERIAL_8250_MOXA is not set
@@ -3460,9 +3460,9 @@ CONFIG_MFD_CROS_EC_I2C=m
 CONFIG_LPC_ICH=m
 CONFIG_LPC_SCH=m
 CONFIG_INTEL_SOC_PMIC=y
-CONFIG_MFD_INTEL_LPSS=m
+CONFIG_MFD_INTEL_LPSS=y
 CONFIG_MFD_INTEL_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_INTEL_LPSS_PCI=y
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
 CONFIG_MFD_88PM800=m

From 9ed70d298e96283793dfc894e43a39246231ca8c Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Fri, 24 Mar 2017 05:42:34 -0700
Subject: [PATCH 036/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/device.mk | 68 +++++++++++++++++++++++++++++++++++++++++-
 androidia_64/init.rc   | 12 ++++++++
 2 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index deffb1fe5..dc3fd0a26 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -287,7 +287,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 # Source: device/intel/mixins/groups/display-density/default/product.mk
 ##############################################################
 ADDITIONAL_DEFAULT_PROPERTIES += ro.sf.lcd_density=160
-
 ##############################################################
 # Source: device/intel/mixins/groups/adb_net/true/product.mk
 ##############################################################
@@ -389,6 +388,73 @@ PRODUCT_PACKAGES += lights.android_ia
 # Source: device/intel/mixins/groups/vendor-partition/true/product.mk
 ##############################################################
 PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/mmcblk1p10
+##############################################################
+# Source: device/intel/mixins/groups/debug-logs/true/product.mk
+##############################################################
+ifneq ($(TARGET_BUILD_VARIANT),user)
+MIXIN_DEBUG_LOGS := true
+endif
+
+ifeq ($(MIXIN_DEBUG_LOGS),true)
+PRODUCT_COPY_FILES += $(LOCAL_PATH)/init.logs.rc:root/init.logs.rc
+PRODUCT_PACKAGES += \
+    elogs.sh \
+    start_log_srv.sh \
+    logcat_ep.sh
+endif
+
+ifeq ($(MIXIN_DEBUG_LOGS),true)
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.service.default_logfs=apklogfs
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.intel.logger=/system/bin/logcat
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += logd.kernel.raw_message=False
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.intel.logger.rot_cnt=20
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.intel.logger.rot_size=5000
+BOARD_SEPOLICY_DIRS += device/intel/sepolicy/debug-logs
+BOARD_SEPOLICY_M4DEFS += module_debug_logs=true
+endif
+##############################################################
+# Source: device/intel/mixins/groups/debug-crashlogd/true/product.mk
+##############################################################
+ifeq ($(MIXIN_DEBUG_LOGS),true)
+PRODUCT_COPY_FILES += \
+	$(LOCAL_PATH)/init.crashlogd.rc:root/init.crashlogd.rc \
+	$(call add-to-product-copy-files-if-exists,$(LOCAL_PATH)/ingredients.conf:$(TARGET_COPY_OUT_VENDOR)/etc/ingredients.conf) \
+	$(call add-to-product-copy-files-if-exists,$(LOCAL_PATH)/crashlog.conf:$(TARGET_COPY_OUT_VENDOR)/etc/crashlog.conf)
+PRODUCT_PACKAGES += crashlogd \
+	dumpstate_dropbox.sh
+endif
+
+ifeq ($(MIXIN_DEBUG_LOGS),true)
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.crashlogd.data_quota=50
+BOARD_SEPOLICY_DIRS += device/intel/sepolicy/crashlogd
+
+CRASHLOGD_LOGS_PATH := "/data/logs"
+CRASHLOGD_APLOG := true
+CRASHLOGD_FULL_REPORT := true
+CRASHLOGD_MODULE_MODEM ?= true
+CRASHLOGD_USE_SD := false
+endif
+##############################################################
+# Source: device/intel/mixins/groups/debug-kernel/default/product.mk
+##############################################################
+ifneq ($(TARGET_BUILD_VARIANT),user)
+PRODUCT_COPY_FILES += $(LOCAL_PATH)/init.kernel.rc:root/init.kernel.rc
+endif
+##############################################################
+# Source: device/intel/mixins/groups/debug-unresponsive/default/product.mk
+##############################################################
+ifneq ($(TARGET_BUILD_VARIANT),user)
+
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += sys.dropbox.max_size_kb=4096
+
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += sys.dump.binder_stats.uiwdt=1
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += sys.dump.binder_stats.anr=1
+
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += sys.dump.peer_depth=3
+
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += sys.dump.stacks_timeout=1500
+
+endif
 # ------------------ END MIX-IN DEFINITIONS ------------------
 PRODUCT_PACKAGES += libhoudini houdini
 PRODUCT_PROPERTY_OVERRIDES += ro.dalvik.vm.isa.arm=x86 ro.enable.native.bridge.exec=1
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 7c7a19972..3e8d48a57 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -331,6 +331,18 @@ on charger
 # Enable SELinux labeling
 on post-fs
     restorecon_recursive /config
+##############################################################
+# Source: device/intel/mixins/groups/debug-logs/true/init.rc
+##############################################################
+import /init.logs.rc
+##############################################################
+# Source: device/intel/mixins/groups/debug-crashlogd/true/init.rc
+##############################################################
+import /init.crashlogd.rc
+##############################################################
+# Source: device/intel/mixins/groups/debug-kernel/default/init.rc
+##############################################################
+import /init.kernel.rc
 # ------------------ END MIX-IN DEFINITIONS ------------------
 # Enable native bridge for target executables
 on early-init

From 53dcdd47fbc3c25471641018b8397221d1abda8c Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Fri, 24 Mar 2017 11:31:30 +0530
Subject: [PATCH 037/427] "/data/logs" folder is not available in latest
 Android IA Build.

Enable following mixin configs to enable logs generation in /data/logs :
debug-crashlogd: true
debug-logs: true

Jira: None
Test: '/data/logs' created and logs are generated.
Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/mixins.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index ba7689a1d..8ee9975c4 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -30,3 +30,5 @@ usb: host+acc
 lights: true
 config-partition: enabled
 vendor-partition: true(partition_size=1500,partition_name=android_vendor)
+debug-crashlogd: true
+debug-logs: true

From 9017e8c330a7e5decaa6063d6b0292410ed8fffd Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Sat, 25 Mar 2017 01:24:03 -0700
Subject: [PATCH 038/427] Add missing files.

Jira: None.
Test: Eng build passes.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/init.crashlogd.rc | 28 ++++++++++++++++
 androidia_64/init.kernel.rc    | 12 +++++++
 androidia_64/init.logs.rc      | 58 ++++++++++++++++++++++++++++++++++
 3 files changed, 98 insertions(+)
 create mode 100644 androidia_64/init.crashlogd.rc
 create mode 100644 androidia_64/init.kernel.rc
 create mode 100644 androidia_64/init.logs.rc

diff --git a/androidia_64/init.crashlogd.rc b/androidia_64/init.crashlogd.rc
new file mode 100644
index 000000000..c94ad194c
--- /dev/null
+++ b/androidia_64/init.crashlogd.rc
@@ -0,0 +1,28 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/debug-crashlogd/true/init.crashlogd.rc
+##############################################################
+on init
+    write /proc/sys/fs/suid_dumpable 1
+
+on post-fs-data
+##    mkdir /data/tombstones 0775 system system
+    mkdir /data/system 0755 system system
+    mkdir /data/system/dropbox 0700 system system
+    mkdir /data/logs/modemcrash 0775 system system
+    mkdir /data/logs/stats 0775 system system
+    mkdir /data/logs/aplogs 0775 system log
+    trigger delayed-fs-data
+
+on delayed-fs-data
+    mkdir /data/tombstones 0775 system system
+
+service crashlogd /system/vendor/bin/crashlogd
+    class late_start
+
+# started by vendor/intel/log_capture/crashlog
+service logsystemstate /system/vendor/bin/dumpstate_dropbox.sh -v
+    disabled
+    oneshot
+# ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/init.kernel.rc b/androidia_64/init.kernel.rc
new file mode 100644
index 000000000..e249cdc6e
--- /dev/null
+++ b/androidia_64/init.kernel.rc
@@ -0,0 +1,12 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/debug-kernel/default/init.kernel.rc
+##############################################################
+on early-init
+    write /proc/sys/kernel/panic_on_stackoverflow 1
+
+on fs
+    # Overwrite system/core/rootdir/init.rc config declared "on init"
+    write /proc/sys/kernel/hung_task_timeout_secs 120
+# ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/init.logs.rc b/androidia_64/init.logs.rc
new file mode 100644
index 000000000..04907eae8
--- /dev/null
+++ b/androidia_64/init.logs.rc
@@ -0,0 +1,58 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/debug-logs/true/init.logs.rc
+##############################################################
+on post-fs-data
+    mkdir /data/logs 0770 system log
+
+on property:persist.service.aplogfs.enable=0
+    stop ap_logfs
+
+on property:persist.service.aplogfs.enable=1
+    setprop persist.service.apklogfs.enable 0
+    restart ap_log_srv
+
+on property:persist.service.apklogfs.enable=0
+    stop apk_logfs
+
+on property:persist.service.apklogfs.enable=1
+    setprop persist.service.aplogfs.enable 0
+    restart ap_log_srv
+
+service apk_logfs /system/vendor/bin/logcat_ep.sh auto \
+        -b main -b system -b radio -b events -b crash -b kernel \
+        -v threadtime -f /data/logs/aplog
+    disabled
+
+service ap_logfs /system/vendor/bin/logcat_ep.sh auto \
+        -b main -b system -b radio -b events -b crash \
+        -v threadtime -f /data/logs/aplog
+    disabled
+
+# Service called at boot time after data is decrypted
+#
+# This is done through the late_start class or through persist properties
+# that are only available after data is decrypted.
+# The service may be called again when the properties are updated.
+service ap_log_srv /system/vendor/bin/start_log_srv.sh
+    class late_start
+    oneshot
+
+service earlylogs /system/vendor/bin/elogs.sh
+    class core
+    oneshot
+
+on nonencrypted
+    stop earlylogs
+
+on property:vold.decrypt=trigger_restart_framework
+    stop earlylogs
+
+on property:persist.service.elogs.enable=1
+    mkdir /cache/elogs 0770 system log
+    restorecon /cache/elogs
+
+on property:persist.service.elogs.enable=0
+    exec -- /system/bin/rm -rf /cache/elogs
+# ------------------ END MIX-IN DEFINITIONS ------------------

From 61bdde3bc185360f75c79529ba9856f2a5d683f4 Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Sun, 26 Mar 2017 16:54:37 -0700
Subject: [PATCH 039/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/BoardConfig.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 0225bb2a9..0f19ee436 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -46,6 +46,7 @@ BOARD_USES_IA_HWCOMPOSER := true
 
 BOARD_USES_MINIGBM := true
 BOARD_ENABLE_EXPLICIT_SYNC := true
+INTEL_MINIGBM := external/minigbm
 
 ##############################################################
 # Source: device/intel/mixins/groups/device-type/tablet/BoardConfig.mk

From 914e96b9c363b940c483c296e44bac77c827d61a Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Sun, 26 Mar 2017 23:07:22 -0700
Subject: [PATCH 040/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/device.mk | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index dc3fd0a26..8cb2e86cc 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -283,10 +283,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PROPERTY_OVERRIDES += \
    net.eth0.startonboot=1
 
-##############################################################
-# Source: device/intel/mixins/groups/display-density/default/product.mk
-##############################################################
-ADDITIONAL_DEFAULT_PROPERTIES += ro.sf.lcd_density=160
 ##############################################################
 # Source: device/intel/mixins/groups/adb_net/true/product.mk
 ##############################################################
@@ -303,7 +299,6 @@ BOARD_USE_64BIT_KERNEL := true
 
 KERNEL_MODULES_ROOT_PATH ?= /vendor/lib/modules
 KERNEL_MODULES_ROOT ?= $(KERNEL_MODULES_ROOT_PATH)
-ADDITIONAL_DEFAULT_PROPERTIES += ro.boot.moduleslocation=/vendor/lib/modules
 
 FIRMWARES_DIR ?= vendor/linux/firmware
 
@@ -321,9 +316,6 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \
 		frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml
-
-ADDITIONAL_BUILD_PROPERTIES += bluetooth.hwcfg=stop \
-                bluetooth.rfkill=1
 ##############################################################
 # Source: device/intel/mixins/groups/audio/android_ia/product.mk
 ##############################################################

From eca793b8844ec6f51d5a69912007ef31b8ed77e7 Mon Sep 17 00:00:00 2001
From: Jeevaka Prabu Badrappan <jeevaka.badrappan@intel.com>
Date: Fri, 17 Mar 2017 19:27:40 +0530
Subject: [PATCH 041/427] Fix for bluetooth tethering AP mode

Update to routing table fails due to files
not found for reverse path filtering.

Enables support for reverse path filtering by setting
CONFIG_IP6_NF_MATCH_RPFILTER and CONFIG_IP_NF_MATCH_RPFILTER.

Jira: https://01.org/jira/browse/AIA-261
Test: Bluetooth tethering in AP mode works

Signed-off-by: Jeevaka Prabu Badrappan <jeevaka.badrappan@intel.com>
---
 kernel_config/kernel_64_defconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 2deef0cc1..ac31b635e 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -965,7 +965,7 @@ CONFIG_NF_NAT_H323=y
 CONFIG_IP_NF_IPTABLES=y
 CONFIG_IP_NF_MATCH_AH=y
 CONFIG_IP_NF_MATCH_ECN=y
-# CONFIG_IP_NF_MATCH_RPFILTER is not set
+CONFIG_IP_NF_MATCH_RPFILTER=y
 CONFIG_IP_NF_MATCH_TTL=y
 CONFIG_IP_NF_FILTER=y
 CONFIG_IP_NF_TARGET_REJECT=y
@@ -1002,7 +1002,7 @@ CONFIG_IP6_NF_IPTABLES=y
 # CONFIG_IP6_NF_MATCH_HL is not set
 CONFIG_IP6_NF_MATCH_IPV6HEADER=y
 # CONFIG_IP6_NF_MATCH_MH is not set
-# CONFIG_IP6_NF_MATCH_RPFILTER is not set
+CONFIG_IP6_NF_MATCH_RPFILTER=y
 # CONFIG_IP6_NF_MATCH_RT is not set
 # CONFIG_IP6_NF_TARGET_HL is not set
 CONFIG_IP6_NF_FILTER=y

From 21349ee0d8edf68d04c25f78e28fb527fed4fa5b Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Tue, 28 Mar 2017 08:47:12 +0530
Subject: [PATCH 042/427] Add missing kernel configs

Add all missing android base configs &
android recommended configs.

Jira : None
Test : Device should boot to home screen.
       Wifi BT should work fine.
       Adb should work fine.

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 kernel_config/kernel_64_defconfig | 38 +++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index ac31b635e..1f08e37a7 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -7045,3 +7045,41 @@ CONFIG_MODULE_SIG_ALL=y
 CONFIG_MODULE_SIG_SHA512=y
 CONFIG_MODULE_SIG_HASH="sha512"
 CONFIG_MODULE_SIG_KEY="certs/signing_key.pem"
+
+## Android recommended configs
+CONFIG_ANDROID_TIMED_GPIO=y
+CONFIG_ARM_KERNMEM_PERMS=y
+CONFIG_ARM64_SW_TTBR0_PAN=y
+CONFIG_CPU_SW_DOMAIN_PAN=y
+CONFIG_ENABLE_DEFAULT_TRACERS=y
+CONFIG_INPUT_GPIO=y
+CONFIG_INPUT_KEYCHORD=y
+CONFIG_INPUT_KEYRESET=y
+CONFIG_ION=y
+CONFIG_PM_RUNTIME=y
+CONFIG_SUSPEND_TIME=y
+CONFIG_MEMORY_STATE_TIME=y
+
+## Android base configs
+CONFIG_ARMV8_DEPRECATED=y
+CONFIG_CP15_BARRIER_EMULATION=y
+CONFIG_IPV6_PRIVACY=y
+CONFIG_NETFILTER_TPROXY=y
+CONFIG_NETFILTER_XT_MATCH_QTAGUID=y
+CONFIG_NETFILTER_XT_MATCH_QUOTA2=y
+CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y
+CONFIG_PPPOLAC=y
+CONFIG_PPPOPNS=y
+CONFIG_QFMT_V2=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
+CONFIG_SETEND_EMULATION=y
+CONFIG_SWP_EMULATION=y
+CONFIG_UID_SYS_STATS=y
+CONFIG_USB_CONFIGFS_F_MTP=y
+CONFIG_USB_CONFIGFS_F_PTP=y
+CONFIG_USB_CONFIGFS_F_ACC=y
+CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
+CONFIG_USB_CONFIGFS_UEVENT=y
+CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_OTG_WAKELOCK=y

From 9b4486f9c691aa95c6d834f3d2d8cd0de4124fd3 Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Tue, 28 Mar 2017 02:52:42 -0700
Subject: [PATCH 043/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/device.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 8cb2e86cc..56fcb0d9d 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -267,7 +267,7 @@ PRODUCT_COPY_FILES += \
         frameworks/native/data/etc/tablet_core_hardware.xml:system/etc/permissions/tablet_core_hardware.xml
 
 PRODUCT_AAPT_CONFIG := normal large xlarge mdpi hdpi xhdpi
-PRODUCT_AAPT_PREF_CONFIG := mdpi
+PRODUCT_AAPT_PREF_CONFIG :=
 
 PRODUCT_PROPERTY_OVERRIDES += \
    ro.sf.lcd_density=160

From 608813dbab967eaa15b321ac2624aaff3b3f5360 Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Tue, 28 Mar 2017 10:21:57 -0700
Subject: [PATCH 044/427] Remove duplicate config entries.

Jira: None.
Test: Kernel builds and not warnings seen during build.
      ".config:7060:warning: override: reassigning to symbol ION
       .config:7075:warning: override: reassigning to symbol QFMT_V2
       .config:7076:warning: override: reassigning to symbol QUOTA_NETLINK_INTERFACE"
---
 kernel_config/kernel_64_defconfig | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 1f08e37a7..2035f58a9 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -5653,7 +5653,6 @@ CONFIG_DVB_CXD2099=m
 #
 CONFIG_ASHMEM=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
-# CONFIG_ION is not set
 # CONFIG_STAGING_BOARD is not set
 # CONFIG_LTE_GDM724X is not set
 # CONFIG_MTD_SPINAND_MT29F is not set
@@ -6265,12 +6264,10 @@ CONFIG_FSNOTIFY=y
 CONFIG_INOTIFY_USER=y
 # CONFIG_FANOTIFY is not set
 CONFIG_QUOTA=y
-# CONFIG_QUOTA_NETLINK_INTERFACE is not set
 CONFIG_PRINT_QUOTA_WARNING=y
 # CONFIG_QUOTA_DEBUG is not set
 CONFIG_QUOTA_TREE=m
 # CONFIG_QFMT_V1 is not set
-# CONFIG_QFMT_V2 is not set
 CONFIG_QUOTACTL=y
 CONFIG_QUOTACTL_COMPAT=y
 # CONFIG_AUTOFS4_FS is not set

From 00724a00fde3b529df15212326cbcf5d1e3bc1c0 Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Thu, 30 Mar 2017 16:42:35 -0700
Subject: [PATCH 045/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/BoardConfig.mk |  3 ++-
 androidia_64/device.mk      |  4 ++++
 androidia_64/init.rc        | 18 ++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 0f19ee436..56f522926 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -98,6 +98,7 @@ BOARD_FLASH_BLOCK_SIZE := 512
 
 ifeq ($(SPARSE_IMG),true)
 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false
+BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4
 else
 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
 BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := squashfs
@@ -196,7 +197,7 @@ BOARD_CONFIGIMAGE_PARTITION_SIZE := 8388608
 # Those 3 lines are required to enable vendor image generation.
 # Remove them if vendor partition is not used.
 TARGET_COPY_OUT_VENDOR := vendor
-BOARD_VENDORIMAGE_PARTITION_SIZE := 524288000
+BOARD_VENDORIMAGE_PARTITION_SIZE := 1572864000
 ifeq ($(SPARSE_IMG),true)
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 else
diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 56fcb0d9d..ce77e89d5 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -283,6 +283,10 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PROPERTY_OVERRIDES += \
    net.eth0.startonboot=1
 
+##############################################################
+# Source: device/intel/mixins/groups/display-density/default/product.mk
+##############################################################
+# Do not remove this file. Unable to update mixins without this.
 ##############################################################
 # Source: device/intel/mixins/groups/adb_net/true/product.mk
 ##############################################################
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 3e8d48a57..7bc1d9f01 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -87,6 +87,16 @@ service bugreport /system/bin/dumpstate -d -p -B \
     disabled
     oneshot
     keycodes 114 115 116
+
+on init
+   # Load persistent dm-verity state and detect if a restart was
+   # triggered after dm-verity detected a corrupted block
+   verity_load_state
+
+on fs
+   # Update dm-verity persistent state and set partition.*.verified
+   # properties
+   verity_update_state
 ##############################################################
 # Source: device/intel/mixins/groups/graphics/android_ia/init.rc
 ##############################################################
@@ -182,6 +192,12 @@ on boot
     setprop sys.usb.controller dwc3.0.auto
     write /config/usb_gadget/g1/UDC dwc3.0.auto
 
+    # Allow auto-suspend of USB gadget devices
+    write /sys/devices/pci0000\:00/0000\:00\:15.1/power/control auto
+    write /sys/devices/pci0000\:00/0000\:00\:15.1/dwc3.0.auto/power/control auto
+    write /sys/devices/pci0000\:00/0000\:00\:15.1/dwc3.0.auto/gadget/power/control auto
+    write /sys/devices/pci0000\:00/0000\:00\:15.1/dwc3.0.auto/udc/dwc3.0.auto/power/control auto
+
 on property:sys.usb.config=none && property:sys.usb.configfs=1
     write /config/usb_gadget/g1/os_desc/use 0
     setprop sys.usb.ffs.ready 0
@@ -322,6 +338,8 @@ on init
 ##############################################################
 on boot
     write /sys/devices/pci0000\:00/0000\:00\:14.0/power/control auto
+    write /sys/devices/pci0000\:00/0000\:00\:15.0/power/control auto
+    write /sys/devices/pci0000\:00/0000\:00\:15.0/usb1/1-3/power/control auto
 
 on charger
     write /sys/devices/pci0000\:00/0000\:00\:14.0/power/control auto

From 3a8ec39fe7adb4c24f358fc5d1ed83ef90c548d5 Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Thu, 30 Mar 2017 19:23:48 -0700
Subject: [PATCH 046/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/device.mk |  7 ++++---
 androidia_64/init.rc   | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index ce77e89d5..f3806ef1a 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -349,10 +349,11 @@ PRODUCT_PACKAGES += \
     wpa_supplicant
 
 PRODUCT_COPY_FILES += \
-  device/intel/common/wlan/wpa_supplicant-common.conf:/system/etc/wifi/wpa_supplicant.conf \
-  hardware/broadcom/wlan/bcmdhd/config/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \
+  device/intel/common/wlan/wpa_supplicant-common.conf:system/etc/wifi/wpa_supplicant.conf \
+  device/intel/common/wlan/iwlwifi/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \
   frameworks/native/data/etc/android.software.app_widgets.xml:system/etc/permissions/android.software.app_widgets.xml \
-  frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml
+  frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
+  frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml
 
 # Wifi configuration
 BOARD_WPA_SUPPLICANT_DRIVER := NL80211
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 7bc1d9f01..2d7bd1b18 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -304,6 +304,27 @@ service wpa_supplicant /system/bin/wpa_supplicant \
     socket wpa_wlan0 dgram 660 wifi wifi
     disabled
     oneshot
+
+service p2p_supplicant /system/bin/wpa_supplicant \
+   -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
+   -I/system/etc/wifi/wpa_supplicant_overlay.conf \
+   -m/data/misc/wifi/p2p_supplicant.conf \
+   -O/data/misc/wifi/sockets \
+   -e/data/misc/wifi/entropy.bin \
+   -dt -g@android:wpa_wlan0
+    class main
+    socket wpa_wlan0 dgram 660 wifi wifi
+    disabled
+    oneshot
+
+service dhcpcd_p2p /system/bin/dhcpcd -aABKL
+    disabled
+    oneshot
+
+service iprenew_p2p /system/bin/dhcpcd -n
+    disabled
+    oneshot
+
 ##############################################################
 # Source: device/intel/mixins/groups/cpuset/4cores/init.rc
 ##############################################################

From 0ea9c3978b21fb395b29e4265ed1ab9cb63be83f Mon Sep 17 00:00:00 2001
From: Michael Goffioul <michael.goffioul@lincor.com>
Date: Fri, 24 Mar 2017 12:33:26 -0400
Subject: [PATCH 047/427] Increase number of serial ports to 8.

Jira: None
Test: There are 8 serial devices (/dev/ttyS[0-7]) after boot

Signed-off-by: Michael Goffioul <michael.goffioul@gmail.com>
---
 kernel_config/kernel_64_defconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 2035f58a9..d6a22399e 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -2807,8 +2807,8 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_DMA=y
 CONFIG_SERIAL_8250_PCI=m
 # CONFIG_SERIAL_8250_CS is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_NR_UARTS=8
+CONFIG_SERIAL_8250_RUNTIME_UARTS=8
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y

From 681c36256064a2fa1daad4ef74a5f326eff60a52 Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Fri, 31 Mar 2017 10:09:08 -0700
Subject: [PATCH 048/427] Revert "Increase number of serial ports to 8."

Broke Joule boards.

This reverts commit 0ea9c3978b21fb395b29e4265ed1ab9cb63be83f.
---
 kernel_config/kernel_64_defconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index d6a22399e..2035f58a9 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -2807,8 +2807,8 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_DMA=y
 CONFIG_SERIAL_8250_PCI=m
 # CONFIG_SERIAL_8250_CS is not set
-CONFIG_SERIAL_8250_NR_UARTS=8
-CONFIG_SERIAL_8250_RUNTIME_UARTS=8
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y

From 76cf9f84bd2e609e9aace222aefc12b83d37fce1 Mon Sep 17 00:00:00 2001
From: Kishore Kadiyala <kishore.kadiyala@intel.com>
Date: Fri, 31 Mar 2017 14:37:17 +0530
Subject: [PATCH 049/427] FIx : Micro SD card detection on Joule

Currently the pinctrl driver fo bxt is a module which is causing the micro
card issue not getting detected during boot.
Setting the pinctrl driver for Broxton as builtin and not as a module fixes
the issue.

Jira: https://01.org/jira/browse/AIA-213
Test: Insertion/Removal of SD card in slot on Joule should work

Signed-off-by: Kishore Kadiyala <kishore.kadiyala@intel.com>
---
 kernel_config/kernel_64_defconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 2035f58a9..69acf531f 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -3044,8 +3044,8 @@ CONFIG_PINCTRL_AMD=y
 CONFIG_PINCTRL_SINGLE=m
 CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_CHERRYVIEW=y
-CONFIG_PINCTRL_INTEL=m
-CONFIG_PINCTRL_BROXTON=m
+CONFIG_PINCTRL_INTEL=y
+CONFIG_PINCTRL_BROXTON=y
 CONFIG_PINCTRL_SUNRISEPOINT=m
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_DEVRES=y

From 5037f17d27a5634349008eff8dce4e3df9a7aa35 Mon Sep 17 00:00:00 2001
From: zangkeminx <keminx.zang@intel.com>
Date: Sat, 1 Apr 2017 09:46:41 +0800
Subject: [PATCH 050/427] Enabled kernel kmemleak.

Kmemleak provides a way of detecting possible kernel memory leaks.

Jira: None.
Test: Build and boots on joule.

Signed-off-by: btian1  <baofeng.tian@intel.com>
Signed-off-by: zangkeminx  <keminx.zang@intel.com>
---
 kernel_config/kernel_64_defconfig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 69acf531f..329de6c5d 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -6484,7 +6484,10 @@ CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_DEBUG_SLAB is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
+CONFIG_DEBUG_KMEMLEAK=y
+CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=4000
+# CONFIG_DEBUG_KMEMLEAK_TEST is not set
+CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_VIRTUAL is not set

From b5609510ce03c8552ff33936d026fda480f6de0a Mon Sep 17 00:00:00 2001
From: Kishore Kadiyala <kishore.kadiyala@intel.com>
Date: Fri, 7 Apr 2017 17:59:39 +0530
Subject: [PATCH 051/427] FIX : SD card Auto mount in Android

Enabling the mixin to have the SD card automount

Jira: https://01.org/jira/browse/AIA-381
Test: Boot the Joule with SD card inserted and SD card should auto mount
      and an Icon on left corner should be used to configure and access.

Signed-off-by: Kishore Kadiyala <kishore.kadiyala@intel.com>
---
 androidia_64/mixins.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index 8ee9975c4..152e003e8 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -12,7 +12,7 @@ media: android_ia
 device-type: tablet
 ethernet: dhcp
 debugfs: default
-storage: default
+storage: sdcard-mmc0-usb-sd(adoptablesd=true,adoptableusb=false)
 display-density: default
 usb-gadget: g_ffs
 adb_net: true

From 0f83a303815baecc7a7aa6b54cb57865dbd83344 Mon Sep 17 00:00:00 2001
From: Sebastien Guiriec <sebastien.guiriec@intel.com>
Date: Fri, 31 Mar 2017 19:51:50 +0200
Subject: [PATCH 052/427] audio: Create package for Audio configuration files.

This patch creating an AndroidBoard package in order to be
able to customize Audio configuration without forking mixins.

Jira: None.
Test: Audio still works.

Signed-off-by: Sebastien Guiriec <sebastien.guiriec@intel.com>
---
 androidia_64/AndroidBoard.mk |  5 +++++
 androidia_64/device.mk       |  6 ++----
 common/audio/AndroidBoard.mk | 39 ++++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 common/audio/AndroidBoard.mk

diff --git a/androidia_64/AndroidBoard.mk b/androidia_64/AndroidBoard.mk
index 034a52bfe..519d61525 100644
--- a/androidia_64/AndroidBoard.mk
+++ b/androidia_64/AndroidBoard.mk
@@ -231,6 +231,11 @@ $(BOOTLOADER_POLICY_OEMVARS): sign-efi-sig-list
 		$(BOOTLOADER_POLICY_OEMVARS)
 endif
 ##############################################################
+# Source: device/intel/mixins/groups/audio/android_ia/AndroidBoard.mk
+##############################################################
+# Target specific audio configuration files
+include device/intel/android_ia/common/audio/AndroidBoard.mk
+##############################################################
 # Source: device/intel/mixins/groups/config-partition/enabled/AndroidBoard.mk
 ##############################################################
 INSTALLED_CONFIGIMAGE_TARGET := $(PRODUCT_OUT)/config.img
diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index f3806ef1a..769a3bd3b 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -335,11 +335,9 @@ PRODUCT_PACKAGES += \
     audio.hdmi.android_ia \
     audio.primary.android_ia \
     audio.usb.default \
-    audio_policy.default.so
+    audio_policy.default.so \
+    audio_configuration_files
 
-PRODUCT_COPY_FILES += \
-    device/intel/android_ia/common/audio/mixer_paths.xml:system/etc/mixer_paths.xml \
-    device/intel/android_ia/common/audio/audio_policy.conf:system/etc/audio_policy.conf
 ##############################################################
 # Source: device/intel/mixins/groups/wlan/iwlwifi/product.mk
 ##############################################################
diff --git a/common/audio/AndroidBoard.mk b/common/audio/AndroidBoard.mk
new file mode 100644
index 000000000..9cb57a6d0
--- /dev/null
+++ b/common/audio/AndroidBoard.mk
@@ -0,0 +1,39 @@
+LOCAL_PATH := $(call my-dir)
+
+###########################################
+# Audio stack Package
+###########################################
+include $(CLEAR_VARS)
+LOCAL_MODULE := audio_configuration_files
+LOCAL_MODULE_TAGS := optional
+LOCAL_REQUIRED_MODULES := \
+    audio_policy.conf \
+    mixer_paths.xml
+
+include $(BUILD_PHONY_PACKAGE)
+
+###########################################
+# Audio Policy Configuration file
+###########################################
+include $(CLEAR_VARS)
+LOCAL_MODULE := audio_policy.conf
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
+LOCAL_SRC_FILES := audio_policy.conf
+include $(BUILD_PREBUILT)
+###########################################
+
+###########################################
+# Audio HAL Custom configuration file
+###########################################
+include $(CLEAR_VARS)
+LOCAL_MODULE := mixer_paths.xml
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
+LOCAL_SRC_FILES := mixer_paths.xml
+include $(BUILD_PREBUILT)
+###########################################

From 1a9fb52d3653d4a689ee50206ba8d2832ff7e160 Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Mon, 17 Apr 2017 04:15:27 -0700
Subject: [PATCH 053/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/AndroidBoard.mk | 4 ++++
 androidia_64/fstab           | 5 +++++
 androidia_64/init.rc         | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/androidia_64/AndroidBoard.mk b/androidia_64/AndroidBoard.mk
index 519d61525..2d3a2492a 100644
--- a/androidia_64/AndroidBoard.mk
+++ b/androidia_64/AndroidBoard.mk
@@ -83,7 +83,11 @@ define generate_flashfiles
 zip -qj $(1) $(2)
 endef
 
+ifneq ($(BUILD_NUMBER),)
+out_flashfiles := $(PRODUCT_OUT)/$(TARGET_PRODUCT)-flashfiles-$(BUILD_NUMBER).zip
+else
 out_flashfiles := $(PRODUCT_OUT)/$(TARGET_PRODUCT).flashfiles.$(TARGET_BUILD_VARIANT).$(USER).zip
+endif
 
 $(PRODUCT_OUT)/efi/installer.cmd:
 	$(ACP) $(TARGET_DEVICE_DIR)/$(@F) $@
diff --git a/androidia_64/fstab b/androidia_64/fstab
index 6729e017e..4014af5bf 100644
--- a/androidia_64/fstab
+++ b/androidia_64/fstab
@@ -1,6 +1,11 @@
 # ----------------- BEGIN MIX-IN DEFINITIONS -----------------
 # Mix-In definitions are auto-generated by mixin-update
 ##############################################################
+# Source: device/intel/mixins/groups/storage/sdcard-mmc0-usb-sd/fstab
+##############################################################
+*/usb*/*/host*/*/block/sd*              auto             auto    defaults                                   voldmanaged=usbdisk:auto
+*/mmc0/*/block/mmcblk*                  auto             auto    defaults                                   voldmanaged=sdcard1:auto,encryptable=userdata
+##############################################################
 # Source: device/intel/mixins/groups/boot-arch/android_ia/fstab
 ##############################################################
 # Android fstab file.
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 2d7bd1b18..70e8aea80 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -152,7 +152,7 @@ on early-boot
     # tracefs is mounted after 1st access to it
     chmod 0755 /sys/kernel/debug/tracing
 ##############################################################
-# Source: device/intel/mixins/groups/storage/default/init.rc
+# Source: device/intel/mixins/groups/storage/sdcard-mmc0-usb-sd/init.rc
 ##############################################################
 on init
     # Support legacy paths

From 139237ad5ae6250e732c8127eab1fcf3430561be Mon Sep 17 00:00:00 2001
From: karanx <karanx.bhagoji@intel.com>
Date: Tue, 18 Apr 2017 19:19:04 +0530
Subject: [PATCH 054/427] Fixes zygote kill on network reset

This patch resolves the network reset issue. The issue
is caused by the disabling the bandwidth module in the
network management service. It disables the config
NETFILTER_XT_MATCH_OWNER as required by NETFILTER_XT_MATCH_QTAGUID
for the data usage monitoring and tracking functionality
maintained in the xt_qtaguid file by the kernel.
Disable CONFIG_NETFILTER_XT_MATCH_OWNER to enable
CONFIG_NETFILTER_XT_MATCH_QTAGUID logging.

Jira: AIA-385

Test: Go to settings-> Wireless & networks-> Networks
 settings reset->reset settings-> Reset settings
The network should display a pop up "network settings
have been reset"

Signed-off-by: Karan Bhagoji <karanx.bhagoji@intel.com>
---
 kernel_config/kernel_64_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 329de6c5d..eb12f5e46 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -928,7 +928,7 @@ CONFIG_NETFILTER_XT_MATCH_MARK=y
 # CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
 # CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
 # CONFIG_NETFILTER_XT_MATCH_OSF is not set
-CONFIG_NETFILTER_XT_MATCH_OWNER=y
+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
 CONFIG_NETFILTER_XT_MATCH_POLICY=y
 # CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y

From 0d5eaaa5e4e056fc6cf2b2bca3cdda6de990185e Mon Sep 17 00:00:00 2001
From: btian1 <baofeng.tian@intel.com>
Date: Fri, 14 Apr 2017 14:47:36 +0800
Subject: [PATCH 055/427] [debug and trace]add phone doctor support

Tracked-By: https://jira01.devtools.intel.com/browse/OAM-43943
Signed-off-by: btian1 <baofeng.tian@intel.com>
Signed-off-by: jiankunx <jiankunx.liu@intel.com>
---
 androidia_64/device.mk   | 6 ++++++
 androidia_64/mixins.spec | 1 +
 2 files changed, 7 insertions(+)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 769a3bd3b..2c402e19e 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -467,3 +467,9 @@ ifeq ($(ENABLE_NATIVEBRIDGE_64BIT),true)
   PRODUCT_PROPERTY_OVERRIDES += ro.dalvik.vm.isa.arm64=x86_64 ro.enable.native.bridge.exec64=1
 endif
 $(call inherit-product,build/target/product/verity.mk)
+##############################################################
+# Source: device/intel/mixins/groups/debug-phonedoctor/true/product.mk
+##############################################################
+ifeq ($(MIXIN_DEBUG_LOGS),true)
+PRODUCT_PACKAGES += crash_package
+endif
diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index 152e003e8..6b85407c5 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -32,3 +32,4 @@ config-partition: enabled
 vendor-partition: true(partition_size=1500,partition_name=android_vendor)
 debug-crashlogd: true
 debug-logs: true
+debug-phonedoctor: true

From d852041ed23d948790bf28a0e0f02156a720a429 Mon Sep 17 00:00:00 2001
From: Jeevaka Prabu Badrappan <jeevaka.badrappan@intel.com>
Date: Thu, 20 Apr 2017 02:23:02 +0530
Subject: [PATCH 056/427] Remove mobile type from network attributes

Change is done to enable only wifi and ethernet network types.
networkAttributes can be overrided as per device type
in device specific overlays.

Jira: https://01.org/jira/browse/AIA-331

Tests: Boot, Wifi enable/disable

Signed-off-by: Jeevaka Prabu Badrappan <jeevaka.badrappan@intel.com>
---
 .../frameworks/base/core/res/res/values/config.xml        | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/common/overlay/frameworks/base/core/res/res/values/config.xml b/common/overlay/frameworks/base/core/res/res/values/config.xml
index d7c564cfb..cf2bceb94 100644
--- a/common/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/common/overlay/frameworks/base/core/res/res/values/config.xml
@@ -31,14 +31,7 @@
     <!-- the 6th element indicates boot-time dependency-met value. -->
     <string-array translatable="false" name="networkAttributes">
         <item>"wifi,1,1,1,-1,true"</item>
-        <item>"mobile,0,0,0,-1,true"</item>
-        <item>"mobile_mms,2,0,2,60000,true"</item>
-        <item>"mobile_supl,3,0,2,60000,true"</item>
-        <item>"mobile_hipri,5,0,3,60000,true"</item>
         <item>"ethernet,9,9,1,-1,true"</item>
-        <item>"mobile_fota,10,0,2,60000,true"</item>
-        <item>"mobile_ims,11,0,2,60000,true"</item>
-        <item>"mobile_cbs,12,0,2,60000,true"</item>
         <item>"wifi_p2p,13,1,0,-1,true"</item>
     </string-array>
 
@@ -49,7 +42,6 @@
                                [# simultaneous connection types]"  -->
     <string-array translatable="false" name="radioAttributes">
         <item>"1,1"</item>
-        <item>"0,1"</item>
         <item>"9,1"</item>
     </string-array>
 

From 190af4c196d3b94c432d2549f82a22225a9e9957 Mon Sep 17 00:00:00 2001
From: btian1 <baofeng.tian@intel.com>
Date: Fri, 21 Apr 2017 03:28:47 +0800
Subject: [PATCH 057/427] peeknpoke for androidIA

Signed-off-by: btian1 <baofeng.tian@intel.com>
---
 androidia_64/device.mk   | 9 +++++++++
 androidia_64/mixins.spec | 1 +
 2 files changed, 10 insertions(+)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 2c402e19e..862e8d34e 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -430,6 +430,15 @@ CRASHLOGD_MODULE_MODEM ?= true
 CRASHLOGD_USE_SD := false
 endif
 ##############################################################
+# Source: device/intel/mixins/groups/debug-tools/true/product.mk
+##############################################################
+PRODUCT_PACKAGES_DEBUG += \
+    AndroidTerm \
+    libjackpal-androidterm4 \
+    peeknpoke \
+    pytimechart-record \
+    lspci
+##############################################################
 # Source: device/intel/mixins/groups/debug-kernel/default/product.mk
 ##############################################################
 ifneq ($(TARGET_BUILD_VARIANT),user)
diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index 6b85407c5..a08f86e59 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -33,3 +33,4 @@ vendor-partition: true(partition_size=1500,partition_name=android_vendor)
 debug-crashlogd: true
 debug-logs: true
 debug-phonedoctor: true
+debug-tools: true

From b979cf57c2b509668e6f3cba3df53ec64afceb2d Mon Sep 17 00:00:00 2001
From: gkdeepa <g.k.deepa@intel.com>
Date: Wed, 19 Apr 2017 21:47:20 +0530
Subject: [PATCH 058/427] As we donot have inbuilt speaker, marking USB output
 as primary device. This fixes the hangouts issue of voice  not heard to the
 other party once the call gets connected.

Tracked-On: https://jira01.devtools.intel.com/browse/OAM-44350
---
 common/audio/audio_policy.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/audio/audio_policy.conf b/common/audio/audio_policy.conf
index 39ce05a11..dedb3cf4b 100644
--- a/common/audio/audio_policy.conf
+++ b/common/audio/audio_policy.conf
@@ -62,6 +62,7 @@ audio_hw_modules {
         channel_masks AUDIO_CHANNEL_OUT_STEREO
         formats AUDIO_FORMAT_PCM_16_BIT
         devices AUDIO_DEVICE_OUT_USB_DEVICE
+        flags AUDIO_OUTPUT_FLAG_PRIMARY
       }
     }
     inputs {

From 1e2b7b4242dd759661d80a45579d893c3f6cac89 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Fri, 21 Apr 2017 14:08:39 -0500
Subject: [PATCH 059/427] Revert "As we donot have inbuilt speaker, marking USB
 output as primary device."

This reverts commit b979cf57c2b509668e6f3cba3df53ec64afceb2d.

The fix is not right, when there is no connected device the stub hal needs
to be used. The USB device cannot be the PRIMARY, it's not what is expected
by Android, sorry.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 common/audio/audio_policy.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/audio/audio_policy.conf b/common/audio/audio_policy.conf
index dedb3cf4b..39ce05a11 100644
--- a/common/audio/audio_policy.conf
+++ b/common/audio/audio_policy.conf
@@ -62,7 +62,6 @@ audio_hw_modules {
         channel_masks AUDIO_CHANNEL_OUT_STEREO
         formats AUDIO_FORMAT_PCM_16_BIT
         devices AUDIO_DEVICE_OUT_USB_DEVICE
-        flags AUDIO_OUTPUT_FLAG_PRIMARY
       }
     }
     inputs {

From b3f2ac613ae36bcf2b6078aa9bfbb122b2b9eb00 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Fri, 17 Mar 2017 16:06:02 -0500
Subject: [PATCH 060/427] android_ia: fix audio policy, mixer paths and add
 directories

cleanups and files organized by hardware. For now we have no way
of detecting audio hardware so it's required to select the
relevant directory containing audio policy and mixer files.
The default mixer file only tries to set the relevant switches
which should work for most HDaudio platforms.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 androidia_64/device.mk                        |    3 +-
 common/audio/AndroidBoard.mk                  |   14 +-
 .../audio/{ => PCH-CX20724}/audio_policy.conf |   16 +-
 common/audio/PCH-CX20724/mixer_paths_0.xml    |   33 +
 common/audio/default/audio_policy.conf        |   76 +
 common/audio/default/mixer_paths_0.xml        |   26 +
 common/audio/mixer_paths.xml                  | 2386 -----------------
 7 files changed, 154 insertions(+), 2400 deletions(-)
 rename common/audio/{ => PCH-CX20724}/audio_policy.conf (83%)
 create mode 100644 common/audio/PCH-CX20724/mixer_paths_0.xml
 create mode 100644 common/audio/default/audio_policy.conf
 create mode 100644 common/audio/default/mixer_paths_0.xml
 delete mode 100644 common/audio/mixer_paths.xml

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 862e8d34e..53fc3cceb 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -331,9 +331,8 @@ PRODUCT_PACKAGES_DEBUG += \
 
 # Extended Audio HALs
 PRODUCT_PACKAGES += \
-    audio.r_submix.default \
-    audio.hdmi.android_ia \
     audio.primary.android_ia \
+    audio.r_submix.default \
     audio.usb.default \
     audio_policy.default.so \
     audio_configuration_files
diff --git a/common/audio/AndroidBoard.mk b/common/audio/AndroidBoard.mk
index 9cb57a6d0..dfa2df805 100644
--- a/common/audio/AndroidBoard.mk
+++ b/common/audio/AndroidBoard.mk
@@ -1,5 +1,11 @@
 LOCAL_PATH := $(call my-dir)
 
+# audio hardware is not discoverable, select hardware or use basic default
+AUDIO_HARDWARE := default
+#AUDIO_HARDWARE := PCH-CX20724
+#AUDIO_HARDWARE := nuc
+#AUDIO_HARDWARE := nuc-skull-canyon
+
 ###########################################
 # Audio stack Package
 ###########################################
@@ -8,7 +14,7 @@ LOCAL_MODULE := audio_configuration_files
 LOCAL_MODULE_TAGS := optional
 LOCAL_REQUIRED_MODULES := \
     audio_policy.conf \
-    mixer_paths.xml
+    mixer_paths_0.xml
 
 include $(BUILD_PHONY_PACKAGE)
 
@@ -21,7 +27,7 @@ LOCAL_MODULE_OWNER := intel
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
-LOCAL_SRC_FILES := audio_policy.conf
+LOCAL_SRC_FILES := $(AUDIO_HARDWARE)/audio_policy.conf
 include $(BUILD_PREBUILT)
 ###########################################
 
@@ -29,11 +35,11 @@ include $(BUILD_PREBUILT)
 # Audio HAL Custom configuration file
 ###########################################
 include $(CLEAR_VARS)
-LOCAL_MODULE := mixer_paths.xml
+LOCAL_MODULE := mixer_paths_0.xml
 LOCAL_MODULE_OWNER := intel
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
-LOCAL_SRC_FILES := mixer_paths.xml
+LOCAL_SRC_FILES := $(AUDIO_HARDWARE)/mixer_paths_0.xml
 include $(BUILD_PREBUILT)
 ###########################################
diff --git a/common/audio/audio_policy.conf b/common/audio/PCH-CX20724/audio_policy.conf
similarity index 83%
rename from common/audio/audio_policy.conf
rename to common/audio/PCH-CX20724/audio_policy.conf
index 39ce05a11..23d901e9a 100644
--- a/common/audio/audio_policy.conf
+++ b/common/audio/PCH-CX20724/audio_policy.conf
@@ -26,7 +26,7 @@ audio_hw_modules {
         sampling_rates 48000
         channel_masks AUDIO_CHANNEL_OUT_STEREO
         formats AUDIO_FORMAT_PCM_16_BIT
-        devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL
+        devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE
         flags AUDIO_OUTPUT_FLAG_PRIMARY
       }
     }
@@ -35,7 +35,7 @@ audio_hw_modules {
         sampling_rates 8000|11025|16000|22050|24000|32000|44100|48000
         channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO
         formats AUDIO_FORMAT_PCM_16_BIT
-        devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_WIRED_HEADSET
+        devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_WIRED_HEADSET
       }
     }
   }
@@ -58,17 +58,17 @@ audio_hw_modules {
         devices AUDIO_DEVICE_OUT_USB_ACCESSORY
       }
       usb_device {
-        sampling_rates 44100
-        channel_masks AUDIO_CHANNEL_OUT_STEREO
-        formats AUDIO_FORMAT_PCM_16_BIT
+        sampling_rates dynamic
+        channel_masks dynamic
+        formats dynamic
         devices AUDIO_DEVICE_OUT_USB_DEVICE
       }
     }
     inputs {
       usb_device {
-        sampling_rates 44100
-        channel_masks AUDIO_CHANNEL_IN_STEREO
-        formats AUDIO_FORMAT_PCM_16_BIT
+        sampling_rates dynamic
+        channel_masks dynamic
+        formats dynamic
         devices AUDIO_DEVICE_IN_USB_DEVICE
       }
     }
diff --git a/common/audio/PCH-CX20724/mixer_paths_0.xml b/common/audio/PCH-CX20724/mixer_paths_0.xml
new file mode 100644
index 000000000..9aafc86c3
--- /dev/null
+++ b/common/audio/PCH-CX20724/mixer_paths_0.xml
@@ -0,0 +1,33 @@
+<mixer>
+  <!-- These are the initial mixer settings -->
+  <ctl name="Master Playback Volume" value="74" />
+  <ctl name="Headphone Playback Volume" value="74 74" />
+  <ctl name="Speaker Playback Volume" value="74 74" />
+  <ctl name="Auto-Mute Mode" value="Enabled" />
+  <ctl name="Capture Volume" value="80" />
+  <ctl name="Internal Mic Boost Volume" value="0 0" />
+  <ctl name="Mic Boost Volume" value="0 0" />
+
+  <ctl name="Master Playback Switch" value="0" />
+  <ctl name="Headphone Playback Switch" value="0 0" />
+  <ctl name="Speaker Playback Switch" value="0 0" />
+  <ctl name="Capture Switch" value="0 0" />
+
+  <path name="speaker">
+    <ctl name="Master Playback Switch" value="1" />
+    <ctl name="Speaker Playback Switch" value="1 1" />
+  </path>
+
+  <path name="headphone">
+    <ctl name="Master Playback Switch" value="1" />
+    <ctl name="Headphone Playback Switch" value="1 1" />
+  </path>
+
+  <path name="main-mic">
+    <ctl name="Capture Switch" value="1 1" />
+  </path>
+
+  <path name="headset-mic">
+    <ctl name="Capture Switch" value="1 1" />
+  </path>
+</mixer>
diff --git a/common/audio/default/audio_policy.conf b/common/audio/default/audio_policy.conf
new file mode 100644
index 000000000..23d901e9a
--- /dev/null
+++ b/common/audio/default/audio_policy.conf
@@ -0,0 +1,76 @@
+# Global configuration section: lists input and output devices always present on the device
+# as well as the output device selected by default.
+# Devices are designated by a string that corresponds to the enum in audio.h
+
+global_configuration {
+  attached_output_devices AUDIO_DEVICE_OUT_SPEAKER
+  default_output_device AUDIO_DEVICE_OUT_SPEAKER
+  attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC
+}
+
+# audio hardware module section: contains descriptors for all audio hw modules present on the
+# device. Each hw module node is named after the corresponding hw module library base name.
+# For instance, "primary" corresponds to audio.primary.<device>.so.
+# The "primary" module is mandatory and must include at least one output with
+# AUDIO_OUTPUT_FLAG_PRIMARY flag.
+# Each module descriptor contains one or more output profile descriptors and zero or more
+# input profile descriptors. Each profile lists all the parameters supported by a given output
+# or input stream category.
+# The "channel_masks", "formats", "devices" and "flags" are specified using strings corresponding
+# to enums in audio.h and audio_policy.h. They are concatenated by use of "|" without space or "\n".
+
+audio_hw_modules {
+  primary {
+    outputs {
+      primary {
+        sampling_rates 48000
+        channel_masks AUDIO_CHANNEL_OUT_STEREO
+        formats AUDIO_FORMAT_PCM_16_BIT
+        devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE
+        flags AUDIO_OUTPUT_FLAG_PRIMARY
+      }
+    }
+    inputs {
+      primary {
+        sampling_rates 8000|11025|16000|22050|24000|32000|44100|48000
+        channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO
+        formats AUDIO_FORMAT_PCM_16_BIT
+        devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_WIRED_HEADSET
+      }
+    }
+  }
+  a2dp {
+    outputs {
+      a2dp {
+        sampling_rates 44100
+        channel_masks AUDIO_CHANNEL_OUT_STEREO
+        formats AUDIO_FORMAT_PCM_16_BIT
+        devices AUDIO_DEVICE_OUT_ALL_A2DP
+      }
+    }
+  }
+  usb {
+    outputs {
+      usb_accessory {
+        sampling_rates 44100
+        channel_masks AUDIO_CHANNEL_OUT_STEREO
+        formats AUDIO_FORMAT_PCM_16_BIT
+        devices AUDIO_DEVICE_OUT_USB_ACCESSORY
+      }
+      usb_device {
+        sampling_rates dynamic
+        channel_masks dynamic
+        formats dynamic
+        devices AUDIO_DEVICE_OUT_USB_DEVICE
+      }
+    }
+    inputs {
+      usb_device {
+        sampling_rates dynamic
+        channel_masks dynamic
+        formats dynamic
+        devices AUDIO_DEVICE_IN_USB_DEVICE
+      }
+    }
+  }
+}
diff --git a/common/audio/default/mixer_paths_0.xml b/common/audio/default/mixer_paths_0.xml
new file mode 100644
index 000000000..161f6794e
--- /dev/null
+++ b/common/audio/default/mixer_paths_0.xml
@@ -0,0 +1,26 @@
+<mixer>
+  <!-- These are the initial mixer settings -->
+  <ctl name="Master Playback Volume" value="50" />
+  <ctl name="Master Playback Switch" value="0" />
+  <ctl name="Headphone Playback Switch" value="0 0" />
+  <ctl name="Speaker Playback Switch" value="0 0" />
+  <ctl name="Capture Switch" value="0 0" />
+
+  <path name="speaker">
+    <ctl name="Master Playback Switch" value="1" />
+    <ctl name="Speaker Playback Switch" value="1 1" />
+  </path>
+
+  <path name="headphone">
+    <ctl name="Master Playback Switch" value="1" />
+    <ctl name="Headphone Playback Switch" value="1 1" />
+  </path>
+
+  <path name="main-mic">
+    <ctl name="Capture Switch" value="1 1" />
+  </path>
+
+  <path name="headset-mic">
+    <ctl name="Capture Switch" value="1 1" />
+  </path>
+</mixer>
diff --git a/common/audio/mixer_paths.xml b/common/audio/mixer_paths.xml
deleted file mode 100644
index 60a02e71f..000000000
--- a/common/audio/mixer_paths.xml
+++ /dev/null
@@ -1,2386 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<mixer>
-    <!-- These are the initial mixer settings -->
-    <ctl name="Voice Rx Device Mute" id="0" value="0" />
-    <ctl name="Voice Rx Device Mute" id="1" value="-1" />
-    <ctl name="Voice Rx Device Mute" id="2" value="20" />
-    <ctl name="Voice Tx Mute" id="0" value="0" />
-    <ctl name="Voice Tx Mute" id="1" value="-1" />
-    <ctl name="Voice Tx Mute" id="2" value="500" />
-    <ctl name="Voice Rx Gain" id="0" value="0" />
-    <ctl name="Voice Rx Gain" id="1" value="-1" />
-    <ctl name="Voice Rx Gain" id="2" value="20" />
-    <ctl name="Voip Tx Mute" id="0" value="0" />
-    <ctl name="Voip Tx Mute" id="1" value="500" />
-    <ctl name="Voip Rx Gain" id="0" value="0" />
-    <ctl name="Voip Rx Gain" id="1" value="20" />
-    <ctl name="Voip Mode Config" value="12" />
-    <ctl name="Voip Rate Config" value="0" />
-    <ctl name="Voip Evrc Min Max Rate Config" id="0" value="1" />
-    <ctl name="Voip Evrc Min Max Rate Config" id="1" value="4" />
-    <ctl name="Voip Dtx Mode" value="0" />
-    <ctl name="TTY Mode" value="OFF" />
-    <ctl name="LINEOUT1 Volume" value="13" />
-    <ctl name="LINEOUT2 Volume" value="13" />
-    <ctl name="LINEOUT3 Volume" value="13" />
-    <ctl name="LINEOUT4 Volume" value="13" />
-    <ctl name="HPHL Volume" value="20" />
-    <ctl name="HPHR Volume" value="20" />
-    <ctl name="RX1 Digital Volume" value="84" />
-    <ctl name="RX2 Digital Volume" value="84" />
-    <ctl name="RX3 Digital Volume" value="84" />
-    <ctl name="RX4 Digital Volume" value="84" />
-    <ctl name="RX5 Digital Volume" value="84" />
-    <ctl name="RX6 Digital Volume" value="84" />
-    <ctl name="RX7 Digital Volume" value="84" />
-    <ctl name="RX8 Digital Volume" value="84" />
-    <ctl name="ADC1 Volume" value="19" />
-    <ctl name="ADC2 Volume" value="19" />
-    <ctl name="ADC3 Volume" value="0" />
-    <ctl name="ADC4 Volume" value="0" />
-    <ctl name="ADC5 Volume" value="19" />
-    <ctl name="ADC6 Volume" value="19" />
-    <ctl name="DEC1 Volume" value="84" />
-    <ctl name="DEC2 Volume" value="84" />
-    <ctl name="DEC3 Volume" value="84" />
-    <ctl name="DEC4 Volume" value="84" />
-    <ctl name="DEC5 Volume" value="84" />
-    <ctl name="DEC6 Volume" value="84" />
-    <ctl name="DEC7 Volume" value="84" />
-    <ctl name="DEC8 Volume" value="84" />
-    <ctl name="DEC9 Volume" value="84" />
-    <ctl name="DEC10 Volume" value="84" />
-    <ctl name="COMP0 Switch" value="0" />
-    <ctl name="COMP1 Switch" value="0" />
-    <ctl name="COMP2 Switch" value="0" />
-    <ctl name="SLIMBUS_3_RX Port Mixer MI2S_TX" value="0" />
-    <ctl name="HDMI_RX Port Mixer MI2S_TX" value="0" />
-    <ctl name="SLIMBUS_0_RX Port Mixer SLIM_0_TX" value="0" />
-    <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia1" value="0" />
-    <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia2" value="0" />
-    <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia3" value="0" />
-    <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia4" value="0" />
-    <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia5" value="0" />
-    <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia6" value="0" />
-    <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia7" value="0" />
-    <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia10" value="0" />
-    <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia11" value="0" />
-    <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia12" value="0" />
-    <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia13" value="0" />
-    <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia14" value="0" />
-    <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia15" value="0" />
-    <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia16" value="0" />
-    <ctl name="SLIMBUS_4_RX Audio Mixer MultiMedia1" value="0" />
-    <ctl name="SLIMBUS_4_RX Audio Mixer MultiMedia2" value="0" />
-    <ctl name="MultiMedia5 Mixer SLIM_0_TX" value="0" />
-    <ctl name="MultiMedia5 Mixer AFE_PCM_TX" value="0" />
-    <ctl name="MultiMedia4 Mixer MI2S_TX" value="0" />
-    <ctl name="MultiMedia1 Mixer MI2S_TX" value="0" />
-    <ctl name="MultiMedia7 Mixer MI2S_TX" value="0" />
-    <ctl name="MultiMedia10 Mixer MI2S_TX" value="0" />
-    <ctl name="MultiMedia11 Mixer MI2S_TX" value="0" />
-    <ctl name="MultiMedia12 Mixer MI2S_TX" value="0" />
-    <ctl name="MultiMedia13 Mixer MI2S_TX" value="0" />
-    <ctl name="MultiMedia14 Mixer MI2S_TX" value="0" />
-    <ctl name="MultiMedia15 Mixer MI2S_TX" value="0" />
-    <ctl name="MultiMedia16 Mixer MI2S_TX" value="0" />
-    <ctl name="MultiMedia1 Mixer SLIM_0_TX" value="0" />
-    <ctl name="MultiMedia1 Mixer SLIM_4_TX" value="0" />
-    <ctl name="MultiMedia1 Mixer SEC_AUX_PCM_UL_TX" value="0" />
-    <ctl name="HDMI Mixer MultiMedia1" value="0" />
-    <ctl name="HDMI Mixer MultiMedia2" value="0" />
-    <ctl name="HDMI Mixer MultiMedia3" value="0" />
-    <ctl name="HDMI Mixer MultiMedia2" value="0" />
-    <ctl name="HDMI Mixer MultiMedia3" value="0" />
-    <ctl name="HDMI Mixer MultiMedia4" value="0" />
-    <ctl name="HDMI Mixer MultiMedia5" value="0" />
-    <ctl name="HDMI Mixer MultiMedia7" value="0" />
-    <ctl name="HDMI Mixer MultiMedia10" value="0" />
-    <ctl name="HDMI Mixer MultiMedia11" value="0" />
-    <ctl name="HDMI Mixer MultiMedia12" value="0" />
-    <ctl name="HDMI Mixer MultiMedia13" value="0" />
-    <ctl name="HDMI Mixer MultiMedia14" value="0" />
-    <ctl name="HDMI Mixer MultiMedia15" value="0" />
-    <ctl name="HDMI Mixer MultiMedia16" value="0" />
-    <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="0" />
-    <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="0" />
-    <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia3" value="0" />
-    <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="0" />
-    <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia5" value="0" />
-    <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia7" value="0" />
-    <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="0" />
-    <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia11" value="0" />
-    <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia12" value="0" />
-    <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia13" value="0" />
-    <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia14" value="0" />
-    <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia15" value="0" />
-    <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia16" value="0" />
-    <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia1" value="0" />
-    <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia2" value="0" />
-    <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia3" value="0" />
-    <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia4" value="0" />
-    <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia5" value="0" />
-    <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia7" value="0" />
-    <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia10" value="0" />
-    <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia11" value="0" />
-    <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia12" value="0" />
-    <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia13" value="0" />
-    <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia14" value="0" />
-    <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia15" value="0" />
-    <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia16" value="0" />
-    <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" />
-    <ctl name="IIR1 INP1 MUX" value="ZERO" />
-    <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="ZERO" />
-    <ctl name="SLIM0_RX_VI_FB_RCH_MUX" value="ZERO" />
-    <ctl name="VI_FEED_TX Channels" value="One" />
-    <ctl name="AIF4_VI Mixer SPKR_VI_1" value="0" />
-    <ctl name="AIF4_VI Mixer SPKR_VI_2" value="0" />
-    <ctl name="SLIM TX10 MUX" value="ZERO" />
-    <ctl name="SLIM TX9 MUX" value="ZERO" />
-    <ctl name="SLIM TX8 MUX" value="ZERO" />
-    <ctl name="SLIM TX7 MUX" value="ZERO" />
-    <ctl name="SLIM TX6 MUX" value="ZERO" />
-    <ctl name="SLIM TX5 MUX" value="ZERO" />
-    <ctl name="SLIM TX4 MUX" value="ZERO" />
-    <ctl name="SLIM TX3 MUX" value="ZERO" />
-    <ctl name="SLIM TX2 MUX" value="ZERO" />
-    <ctl name="SLIM TX1 MUX" value="ZERO" />
-    <ctl name="DEC10 MUX" value="ZERO" />
-    <ctl name="DEC9 MUX" value="ZERO" />
-    <ctl name="DEC8 MUX" value="ZERO" />
-    <ctl name="DEC7 MUX" value="ZERO" />
-    <ctl name="DEC6 MUX" value="ZERO" />
-    <ctl name="DEC5 MUX" value="ZERO" />
-    <ctl name="DEC4 MUX" value="ZERO" />
-    <ctl name="DEC3 MUX" value="ZERO" />
-    <ctl name="DEC2 MUX" value="ZERO" />
-    <ctl name="DEC1 MUX" value="ZERO" />
-    <ctl name="RX2 MIX2 INP2" value="ZERO" />
-    <ctl name="RX2 MIX2 INP1" value="ZERO" />
-    <ctl name="RX1 MIX2 INP2" value="ZERO" />
-    <ctl name="RX1 MIX2 INP1" value="ZERO" />
-    <ctl name="RX7 MIX1 INP2" value="ZERO" />
-    <ctl name="RX7 MIX1 INP1" value="ZERO" />
-    <ctl name="RX6 MIX1 INP2" value="ZERO" />
-    <ctl name="RX6 MIX1 INP1" value="ZERO" />
-    <ctl name="RX5 MIX1 INP2" value="ZERO" />
-    <ctl name="RX5 MIX1 INP1" value="ZERO" />
-    <ctl name="RX4 MIX1 INP2" value="ZERO" />
-    <ctl name="RX4 MIX1 INP1" value="ZERO" />
-    <ctl name="RX3 MIX1 INP2" value="ZERO" />
-    <ctl name="RX3 MIX1 INP1" value="ZERO" />
-    <ctl name="RX2 MIX1 INP2" value="ZERO" />
-    <ctl name="RX2 MIX1 INP1" value="ZERO" />
-    <ctl name="RX1 MIX1 INP3" value="ZERO" />
-    <ctl name="RX1 MIX1 INP2" value="ZERO" />
-    <ctl name="RX1 MIX1 INP1" value="ZERO" />
-    <ctl name="HPHL DAC Switch" value="0" />
-    <ctl name="DAC1 Switch" value="0" />
-    <ctl name="SLIM_0_RX Channels" value="One" />
-    <ctl name="SLIM_0_TX Channels" value="One" />
-    <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
-    <ctl name="EAR PA Gain" value="POS_6_DB" />
-    <ctl name="SLIM RX2 MUX" value="ZERO" />
-    <ctl name="SLIM RX3 MUX" value="ZERO" />
-    <ctl name="SLIM RX4 MUX" value="ZERO" />
-    <ctl name="SPK DRV Volume" value="8" />
-    <ctl name="AIF1_CAP Mixer SLIM TX7" value="0" />
-    <ctl name="AIF1_CAP Mixer SLIM TX8" value="0"/>
-    <ctl name="CLASS_H_DSM MUX" value="DSM_HPHL_RX1" />
-    <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="0" />
-    <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia4" value="0" />
-    <ctl name="HDMI Mixer MultiMedia4" value="0" />
-    <ctl name="Master Playback Volume" value="100" />
-    <ctl name="Master Playback Switch" value="100" />
-    <ctl name="Capture Switch" value="1" />
-    <ctl name="Capture Volume" value="63" />
-    <!-- echo reference -->
-    <ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />
-    <!-- usb headset -->
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia3" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia7" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia11" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia12" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia13" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia14" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia15" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia16" value="0" />
-    <ctl name="MultiMedia1 Mixer AFE_PCM_TX" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="0" />
-    <!-- usb headset end -->
-    <!-- fm -->
-    <ctl name="SLIMBUS_0_RX Port Mixer PRI_MI2S_TX" value="0" />
-    <ctl name="SLIMBUS_DL_HL Switch" value="0" />
-    <ctl name="MultiMedia1 Mixer PRI_MI2S_TX" value="0" />
-    <ctl name="MultiMedia2 Mixer PRI_MI2S_TX" value="0" />
-    <!-- fm end -->
-
-    <!-- Voice -->
-    <ctl name="SLIM_0_RX_Voice Mixer CSVoice" value="0" />
-    <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="0" />
-    <!-- Voice Headphones -->
-    <ctl name="SLIM_5_RX_Voice Mixer CSVoice" value="0" />
-    <!-- Voice HDMI -->
-    <ctl name="HDMI_RX_Voice Mixer CSVoice" value="0" />
-    <!-- Voice BTSCO -->
-    <ctl name="AUX PCM SampleRate" value="8000" />
-    <ctl name="SEC_AUX_PCM_RX_Voice Mixer CSVoice" value="0" />
-    <ctl name="Voice_Tx Mixer SEC_AUX_PCM_TX_Voice" value="0" />
-    <!-- Voice USB headset -->
-    <ctl name="AFE_PCM_RX_Voice Mixer CSVoice" value="0" />
-    <ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="0" />
-    <!-- Voice end-->
-
-    <!-- Voice2 -->
-    <ctl name="SLIM_0_RX_Voice Mixer Voice2" value="0" />
-    <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="0" />
-    <!-- Voice2 Headphones -->
-    <ctl name="SLIM_5_RX_Voice Mixer Voice2" value="0" />
-    <!-- Voice2 HDMI -->
-    <ctl name="HDMI_RX_Voice Mixer Voice2" value="0" />
-    <!-- Voice2 BTSCO -->
-    <ctl name="SEC_AUX_PCM_RX_Voice Mixer Voice2" value="0" />
-    <ctl name="Voice2_Tx Mixer SEC_AUX_PCM_TX_Voice2" value="0" />
-    <!-- Voice2 USB headset -->
-    <ctl name="AFE_PCM_RX_Voice Mixer Voice2" value="0" />
-    <ctl name="Voice2_Tx Mixer AFE_PCM_TX_Voice2" value="0" />
-    <!-- Voice2 end-->
-
-    <!-- VoLTE -->
-    <ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="0" />
-    <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="0" />
-    <!-- VoLTE Headphones -->
-    <ctl name="SLIM_5_RX_Voice Mixer VoLTE" value="0" />
-    <!-- VoLTE HDMI -->
-    <ctl name="HDMI_RX_Voice Mixer VoLTE" value="0" />
-    <!-- VoLTE BTSCO -->
-    <ctl name="SEC_AUX_PCM_RX_Voice Mixer VoLTE" value="0" />
-    <ctl name="VoLTE_Tx Mixer SEC_AUX_PCM_TX_VoLTE" value="0" />
-    <!-- VoLTE USB headset -->
-    <ctl name="AFE_PCM_RX_Voice Mixer VoLTE" value="0" />
-    <ctl name="VoLTE_Tx Mixer AFE_PCM_TX_VoLTE" value="0" />
-    <!-- VoLTE end-->
-
-    <!-- Incall Recording -->
-    <ctl name="MultiMedia1 Mixer VOC_REC_UL" value="0" />
-    <ctl name="MultiMedia1 Mixer VOC_REC_DL" value="0" />
-    <ctl name="MultiMedia8 Mixer VOC_REC_UL" value="0" />
-    <ctl name="MultiMedia8 Mixer VOC_REC_DL" value="0" />
-    <!-- Incall Recording End -->
-
-    <!-- Incall Music -->
-    <ctl name="Incall_Music Audio Mixer MultiMedia2" value="0" />
-    <ctl name="Incall_Music_2 Audio Mixer MultiMedia9" value="0" />
-    <!-- Incall Music End -->
-
-    <!-- compress-voip-call start -->
-    <ctl name="SLIM_0_RX_Voice Mixer Voip" value="0" />
-    <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="0" />
-    <ctl name="SLIM_5_RX_Voice Mixer Voip" value="0" />
-    <ctl name="SEC_AUX_PCM_RX_Voice Mixer Voip" value="0" />
-    <ctl name="Voip_Tx Mixer SEC_AUX_PCM_TX_Voip" value="0" />
-    <ctl name="AFE_PCM_RX_Voice Mixer Voip" value="0" />
-    <ctl name="Voip_Tx Mixer AFE_PCM_TX_Voip" value="0" />
-    <!-- compress-voip-call end-->
-
-    <!-- QCHAT start -->
-    <ctl name="SLIM_0_RX_Voice Mixer QCHAT" value="0" />
-    <ctl name="QCHAT_Tx Mixer SLIM_0_TX_QCHAT" value="0" />
-    <ctl name="SLIM_5_RX_Voice Mixer QCHAT" value="0" />
-    <ctl name="SEC_AUX_PCM_RX_Voice Mixer QCHAT" value="0" />
-    <ctl name="QCHAT_Tx Mixer SEC_AUX_PCM_TX_QCHAT" value="0" />
-    <!-- QCHAT end-->
-
-    <!-- VoWLAN start -->
-    <ctl name="SLIM_0_RX_Voice Mixer VoWLAN" value="0" />
-    <ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="0" />
-    <ctl name="SLIM_5_RX_Voice Mixer VoWLAN" value="0" />
-    <ctl name="HDMI_RX_Voice Mixer VoWLAN" value="0" />
-    <ctl name="SEC_AUX_PCM_RX_Voice Mixer VoWLAN" value="0" />
-    <ctl name="VoWLAN_Tx Mixer SEC_AUX_PCM_TX_VoWLAN" value="0" />
-    <ctl name="AFE_PCM_RX_Voice Mixer VoWLAN" value="0" />
-    <ctl name="VoWLAN_Tx Mixer AFE_PCM_TX_VoWLAN" value="0" />
-    <!-- VoWLAN end-->
-
-    <!-- Audio BTSCO -->
-    <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia1" value="0" />
-    <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia2" value="0" />
-    <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia3" value="0" />
-    <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia4" value="0" />
-    <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia5" value="0" />
-    <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia6" value="0" />
-    <ctl name="MultiMedia1 Mixer SEC_AUX_PCM_UL_TX" value="0" />
-    <!-- anc headset -->
-    <!-- speaker anc combo -->
-    <ctl name="RX4 DSM MUX" value="CIC_OUT" />
-    <ctl name="RX6 DSM MUX" value="CIC_OUT" />
-    <!-- speaker anc combo end -->
-    <!-- IIR/voice anc -->
-    <ctl name="IIR1 Band1" id ="0" value="268435456" />
-    <ctl name="IIR1 Band1" id ="1" value="0" />
-    <ctl name="IIR1 Band1" id ="2" value="0" />
-    <ctl name="IIR1 Band1" id ="3" value="0" />
-    <ctl name="IIR1 Band1" id ="4" value="0" />
-    <ctl name="IIR1 Band2" id ="0" value="268435456" />
-    <ctl name="IIR1 Band2" id ="1" value="0" />
-    <ctl name="IIR1 Band2" id ="2" value="0" />
-    <ctl name="IIR1 Band2" id ="3" value="0" />
-    <ctl name="IIR1 Band2" id ="4" value="0" />
-    <ctl name="IIR1 Band3" id ="0" value="268435456" />
-    <ctl name="IIR1 Band3" id ="1" value="0" />
-    <ctl name="IIR1 Band3" id ="2" value="0" />
-    <ctl name="IIR1 Band3" id ="3" value="0" />
-    <ctl name="IIR1 Band3" id ="4" value="0" />
-    <ctl name="IIR1 Band4" id ="0" value="268435456" />
-    <ctl name="IIR1 Band4" id ="1" value="0" />
-    <ctl name="IIR1 Band4" id ="2" value="0" />
-    <ctl name="IIR1 Band4" id ="3" value="0" />
-    <ctl name="IIR1 Band4" id ="4" value="0" />
-    <ctl name="IIR1 Band5" id ="0" value="268435456" />
-    <ctl name="IIR1 Band5" id ="1" value="0" />
-    <ctl name="IIR1 Band5" id ="2" value="0" />
-    <ctl name="IIR1 Band5" id ="3" value="0" />
-    <ctl name="IIR1 Band5" id ="4" value="0" />
-    <ctl name="IIR1 Enable Band1" value="0" />
-    <ctl name="IIR1 Enable Band2" value="0" />
-    <ctl name="IIR1 Enable Band3" value="0" />
-    <ctl name="IIR1 Enable Band4" value="0" />
-    <ctl name="IIR1 Enable Band5" value="0" />
-    <ctl name="IIR1 INP1 Volume" value="84" />
-    <!-- IIR/voice anc end -->
-    <!-- anc handset -->
-    <ctl name="ANC Slot" value="0" />
-    <ctl name="ANC1 FB MUX" value="ZERO" />
-    <!-- anc handset end -->
-    <ctl name="ANC1 MUX" value="ZERO" />
-    <ctl name="ANC2 MUX" value="ZERO" />
-    <ctl name="ANC Function" value="OFF" />
-    <!-- anc headset end-->
-    <!-- aanc handset mic -->
-    <ctl name="AIF1_CAP Mixer SLIM TX9" value="0" />
-    <ctl name="AANC_SLIM_0_RX MUX" value="ZERO" />
-    <!-- aanc handset mic end -->
-    <!-- ssr qmic -->
-    <ctl name="AIF1_CAP Mixer SLIM TX10" value="0" />
-    <!-- ssr qmic end-->
-    <!-- audio record compress-->
-    <ctl name="MultiMedia8 Mixer SLIM_0_TX" value="0" />
-    <ctl name="MultiMedia1 Mixer SEC_AUX_PCM_UL_TX" value="0" />
-    <ctl name="MultiMedia8 Mixer AFE_PCM_TX" value="0" />
-    <!-- audio record compress end-->
-    <!-- listen -->
-    <ctl name="LSM1 MUX" value="None" />
-    <ctl name="LSM2 MUX" value="None" />
-    <ctl name="LSM3 MUX" value="None" />
-    <ctl name="LSM4 MUX" value="None" />
-    <ctl name="LSM5 MUX" value="None" />
-    <ctl name="LSM6 MUX" value="None" />
-    <ctl name="LSM7 MUX" value="None" />
-    <ctl name="LSM8 MUX" value="None" />
-    <ctl name="SLIMBUS_5_TX LSM Function" value="None" />
-    <ctl name="MADONOFF Switch" value="0" />
-    <ctl name="MAD Input" value="DMIC1" />
-    <!-- listen end-->
-    <!-- afe-proxy -->
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="0" />
-    <!-- afe-proxy end-->
-    <ctl name="AFE_PCM_RX Port Mixer PRI_MI2S_TX" value="0" />
-
-    <!-- ADSP testfwk -->
-    <ctl name="SLIMBUS_DL_HL Switch" value="0" />
-    <!-- ADSP testfwk end-->
-
-    <!-- These are audio route (FE to BE) specific mixer settings -->
-    <path name="audio-tts-playback">
-        <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="1" />
-    </path>
-
-    <path name="deep-buffer-playback">
-        <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="1" />
-    </path>
-
-    <path name="deep-buffer-playback speaker-protected">
-        <path name="deep-buffer-playback" />
-    </path>
-
-    <path name="deep-buffer-playback headphones">
-        <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia1" value="1" />
-    </path>
-
-    <path name="deep-buffer-playback speaker-and-headphones">
-        <path name="deep-buffer-playback" />
-        <path name="deep-buffer-playback headphones" />
-    </path>
-    <path name="echo-reference">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_RX" />
-    </path>
-
-    <path name="quat-mi2s-internal-echo-reference">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="QUAT_MI2S_RX" />
-    </path>
-
-    <path name="echo-reference headphones">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_5_RX" />
-    </path>
-
-    <path name="bt-sco-echo-reference">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="SEC_AUX_PCM_RX" />
-    </path>
-
-    <path name="echo-reference bt-sco">
-        <path name="bt-sco-echo-reference" />
-    </path>
-
-    <path name="echo-reference bt-sco-wb">
-        <path name="bt-sco-echo-reference" />
-    </path>
-
-    <path name="deep-buffer-playback hdmi">
-        <ctl name="HDMI Mixer MultiMedia1" value="1" />
-    </path>
-
-    <path name="deep-buffer-playback speaker-and-hdmi">
-        <path name="deep-buffer-playback hdmi" />
-        <path name="deep-buffer-playback" />
-    </path>
-
-    <path name="deep-buffer-playback bt-sco">
-        <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia1" value="1" />
-    </path>
-
-    <path name="deep-buffer-playback bt-sco-wb">
-        <ctl name="AUX PCM SampleRate" value="16000" />
-        <path name="deep-buffer-playback bt-sco" />
-    </path>
-
-    <path name="deep-buffer-playback afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="1" />
-    </path>
-
-    <path name="deep-buffer-playback usb-headphones">
-        <path name="deep-buffer-playback afe-proxy" />
-    </path>
-
-    <path name="deep-buffer-playback speaker-and-usb-headphones">
-        <path name="deep-buffer-playback usb-headphones" />
-        <path name="deep-buffer-playback" />
-    </path>
-
-    <path name="low-latency-playback">
-        <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia5" value="1" />
-    </path>
-
-    <path name="low-latency-playback speaker-protected">
-        <path name="low-latency-playback" />
-    </path>
-
-    <path name="low-latency-playback headphones">
-        <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia5" value="1" />
-    </path>
-
-    <path name="low-latency-playback speaker-and-headphones">
-        <path name="low-latency-playback" />
-        <path name="low-latency-playback headphones" />
-    </path>
-
-    <path name="low-latency-playback hdmi">
-        <ctl name="HDMI Mixer MultiMedia5" value="1" />
-    </path>
-
-    <path name="low-latency-playback bt-sco">
-        <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia5" value="1" />
-    </path>
-
-    <path name="low-latency-playback bt-sco-wb">
-        <ctl name="AUX PCM SampleRate" value="16000" />
-        <path name="low-latency-playback bt-sco" />
-    </path>
-
-    <path name="low-latency-playback speaker-and-hdmi">
-        <path name="low-latency-playback hdmi" />
-        <path name="low-latency-playback" />
-    </path>
-
-    <path name="low-latency-playback afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="1" />
-    </path>
-
-    <path name="low-latency-playback usb-headphones">
-        <path name="low-latency-playback afe-proxy" />
-    </path>
-
-    <path name="low-latency-playback speaker-and-usb-headphones">
-        <path name="low-latency-playback usb-headphones" />
-        <path name="low-latency-playback" />
-    </path>
-
-    <path name="audio-ull-playback">
-        <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia3" value="1" />
-    </path>
-
-    <path name="audio-ull-playback speaker-protected">
-        <path name="audio-ull-playback" />
-    </path>
-
-    <path name="audio-ull-playback headphones">
-        <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia3" value="1" />
-    </path>
-
-    <path name="audio-ull-playback speaker-and-headphones">
-        <path name="audio-ull-playback" />
-        <path name="audio-ull-playback headphones" />
-    </path>
-
-    <path name="audio-ull-playback hdmi">
-        <ctl name="HDMI Mixer MultiMedia3" value="1" />
-    </path>
-
-    <path name="audio-ull-playback bt-sco">
-        <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia3" value="1" />
-    </path>
-
-    <path name="audio-ull-playback bt-sco-wb">
-        <ctl name="AUX PCM SampleRate" value="16000" />
-        <path name="audio-ull-playback bt-sco" />
-    </path>
-
-    <path name="audio-ull-playback speaker-and-hdmi">
-        <path name="audio-ull-playback hdmi" />
-        <path name="audio-ull-playback" />
-    </path>
-
-    <path name="audio-ull-playback afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia3" value="1" />
-    </path>
-
-    <path name="multi-channel-playback hdmi">
-        <ctl name="HDMI Mixer MultiMedia2" value="1" />
-    </path>
-
-    <path name="multi-channel-playback afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" />
-    </path>
-
-    <path name="compress-offload-playback">
-        <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="1" />
-    </path>
-
-    <path name="compress-offload-playback speaker-protected">
-        <path name="compress-offload-playback" />
-    </path>
-
-    <path name="compress-offload-playback headphones">
-        <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia4" value="1" />
-    </path>
-
-    <path name="compress-offload-playback speaker-and-headphones">
-        <path name="compress-offload-playback" />
-        <path name="compress-offload-playback headphones" />
-    </path>
-
-    <path name="compress-offload-playback hdmi">
-        <ctl name="HDMI Mixer MultiMedia4" value="1" />
-    </path>
-
-    <path name="compress-offload-playback bt-sco">
-        <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia4" value="1" />
-    </path>
-
-    <path name="compress-offload-playback bt-sco-wb">
-        <ctl name="AUX PCM SampleRate" value="16000" />
-        <path name="compress-offload-playback bt-sco" />
-    </path>
-
-    <path name="compress-offload-playback speaker-and-hdmi">
-        <path name="compress-offload-playback hdmi" />
-        <path name="compress-offload-playback" />
-    </path>
-
-    <path name="compress-offload-playback afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="1" />
-    </path>
-
-    <path name="compress-offload-playback usb-headphones">
-        <path name="compress-offload-playback afe-proxy" />
-    </path>
-
-    <path name="compress-offload-playback speaker-and-usb-headphones">
-        <path name="compress-offload-playback usb-headphones" />
-        <path name="compress-offload-playback" />
-    </path>
-
-    <path name="compress-offload-playback2">
-        <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia7" value="1" />
-    </path>
-
-    <path name="compress-offload-playback2 headphones">
-        <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia7" value="1" />
-    </path>
-
-    <path name="compress-offload-playback2 speaker-and-headphones">
-        <path name="compress-offload-playback2" />
-        <path name="compress-offload-playback2 headphones" />
-    </path>
-
-    <path name="compress-offload-playback2 hdmi">
-        <ctl name="HDMI Mixer MultiMedia7" value="1" />
-    </path>
-
-    <path name="compress-offload-playback2 bt-sco">
-        <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia7" value="1" />
-    </path>
-
-    <path name="compress-offload-playback2 bt-sco-wb">
-        <ctl name="AUX PCM SampleRate" value="16000" />
-        <path name="compress-offload-playback2 bt-sco" />
-    </path>
-
-    <path name="compress-offload-playback2 speaker-and-hdmi">
-        <path name="compress-offload-playback2 hdmi" />
-        <path name="compress-offload-playback2" />
-    </path>
-
-    <path name="compress-offload-playback2 afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia7" value="1" />
-    </path>
-
-    <path name="compress-offload-playback2 usb-headphones">
-        <path name="compress-offload-playback2 afe-proxy" />
-    </path>
-
-    <path name="compress-offload-playback2 speaker-and-usb-headphones">
-        <path name="compress-offload-playback2 usb-headphones" />
-        <path name="compress-offload-playback2" />
-    </path>
-
-    <path name="compress-offload-playback3">
-        <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="1" />
-    </path>
-
-    <path name="compress-offload-playback3 headphones">
-        <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia10" value="1" />
-    </path>
-
-    <path name="compress-offload-playback3 speaker-and-headphones">
-        <path name="compress-offload-playback3" />
-        <path name="compress-offload-playback3 headphones" />
-    </path>
-
-    <path name="compress-offload-playback3 hdmi">
-        <ctl name="HDMI Mixer MultiMedia10" value="1" />
-    </path>
-
-    <path name="compress-offload-playback3 bt-sco">
-        <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia10" value="1" />
-    </path>
-
-    <path name="compress-offload-playback3 bt-sco-wb">
-        <ctl name="AUX PCM SampleRate" value="16000" />
-        <path name="compress-offload-playback3 bt-sco" />
-    </path>
-
-    <path name="compress-offload-playback3 speaker-and-hdmi">
-        <path name="compress-offload-playback3 hdmi" />
-        <path name="compress-offload-playback3" />
-    </path>
-
-    <path name="compress-offload-playback3 afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="1" />
-    </path>
-
-    <path name="compress-offload-playback3 usb-headphones">
-        <path name="compress-offload-playback3 afe-proxy" />
-    </path>
-
-    <path name="compress-offload-playback3 speaker-and-usb-headphones">
-        <path name="compress-offload-playback3 usb-headphones" />
-        <path name="compress-offload-playback3" />
-    </path>
-
-    <path name="compress-offload-playback4">
-        <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia11" value="1" />
-    </path>
-
-    <path name="compress-offload-playback4 headphones">
-        <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia11" value="1" />
-    </path>
-
-    <path name="compress-offload-playback4 speaker-and-headphones">
-        <path name="compress-offload-playback4" />
-        <path name="compress-offload-playback4 headphones" />
-    </path>
-
-    <path name="compress-offload-playback4 hdmi">
-        <ctl name="HDMI Mixer MultiMedia11" value="1" />
-    </path>
-
-    <path name="compress-offload-playback4 bt-sco">
-        <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia11" value="1" />
-    </path>
-
-    <path name="compress-offload-playback4 bt-sco-wb">
-        <ctl name="AUX PCM SampleRate" value="16000" />
-        <path name="compress-offload-playback4 bt-sco" />
-    </path>
-
-    <path name="compress-offload-playback4 speaker-and-hdmi">
-        <path name="compress-offload-playback4 hdmi" />
-        <path name="compress-offload-playback4" />
-    </path>
-
-    <path name="compress-offload-playback4 afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia11" value="1" />
-    </path>
-
-    <path name="compress-offload-playback4 usb-headphones">
-        <path name="compress-offload-playback4 afe-proxy" />
-    </path>
-
-    <path name="compress-offload-playback4 speaker-and-usb-headphones">
-        <path name="compress-offload-playback4 usb-headphones" />
-        <path name="compress-offload-playback4" />
-    </path>
-
-    <path name="compress-offload-playback5">
-        <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia12" value="1" />
-    </path>
-
-    <path name="compress-offload-playback5 headphones">
-        <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia12" value="1" />
-    </path>
-
-    <path name="compress-offload-playback5 speaker-and-headphones">
-        <path name="compress-offload-playback5" />
-        <path name="compress-offload-playback5 headphones" />
-    </path>
-
-    <path name="compress-offload-playback5 hdmi">
-        <ctl name="HDMI Mixer MultiMedia12" value="1" />
-    </path>
-
-    <path name="compress-offload-playback5 bt-sco">
-        <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia12" value="1" />
-    </path>
-
-    <path name="compress-offload-playback5 bt-sco-wb">
-        <ctl name="AUX PCM SampleRate" value="16000" />
-        <path name="compress-offload-playback5 bt-sco" />
-    </path>
-
-    <path name="compress-offload-playback5 speaker-and-hdmi">
-        <path name="compress-offload-playback5 hdmi" />
-        <path name="compress-offload-playback5" />
-    </path>
-
-    <path name="compress-offload-playback5 afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia12" value="1" />
-    </path>
-
-    <path name="compress-offload-playback5 usb-headphones">
-        <path name="compress-offload-playback5 afe-proxy" />
-    </path>
-
-    <path name="compress-offload-playback5 speaker-and-usb-headphones">
-        <path name="compress-offload-playback5 usb-headphones" />
-        <path name="compress-offload-playback5" />
-    </path>
-
-    <path name="compress-offload-playback6">
-        <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia13" value="1" />
-    </path>
-
-    <path name="compress-offload-playback6 headphones">
-        <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia13" value="1" />
-    </path>
-
-    <path name="compress-offload-playback6 speaker-and-headphones">
-        <path name="compress-offload-playback6" />
-        <path name="compress-offload-playback6 headphones" />
-    </path>
-
-    <path name="compress-offload-playback6 hdmi">
-        <ctl name="HDMI Mixer MultiMedia13" value="1" />
-    </path>
-
-    <path name="compress-offload-playback6 bt-sco">
-        <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia13" value="1" />
-    </path>
-
-    <path name="compress-offload-playback6 bt-sco-wb">
-        <ctl name="AUX PCM SampleRate" value="16000" />
-        <path name="compress-offload-playback6 bt-sco" />
-    </path>
-
-    <path name="compress-offload-playback6 speaker-and-hdmi">
-        <path name="compress-offload-playback6 hdmi" />
-        <path name="compress-offload-playback6" />
-    </path>
-
-    <path name="compress-offload-playback6 afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia13" value="1" />
-    </path>
-
-    <path name="compress-offload-playback6 usb-headphones">
-        <path name="compress-offload-playback6 afe-proxy" />
-    </path>
-
-    <path name="compress-offload-playback6 speaker-and-usb-headphones">
-        <path name="compress-offload-playback6 usb-headphones" />
-        <path name="compress-offload-playback6" />
-    </path>
-
-    <path name="compress-offload-playback7">
-        <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia14" value="1" />
-    </path>
-
-    <path name="compress-offload-playback7 headphones">
-        <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia14" value="1" />
-    </path>
-
-    <path name="compress-offload-playback7 speaker-and-headphones">
-        <path name="compress-offload-playback7" />
-        <path name="compress-offload-playback7 headphones" />
-    </path>
-
-    <path name="compress-offload-playback7 hdmi">
-        <ctl name="HDMI Mixer MultiMedia14" value="1" />
-    </path>
-
-    <path name="compress-offload-playback7 bt-sco">
-        <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia14" value="1" />
-    </path>
-
-    <path name="compress-offload-playback7 bt-sco-wb">
-        <ctl name="AUX PCM SampleRate" value="16000" />
-        <path name="compress-offload-playback7 bt-sco" />
-    </path>
-
-    <path name="compress-offload-playback7 speaker-and-hdmi">
-        <path name="compress-offload-playback7 hdmi" />
-        <path name="compress-offload-playback7" />
-    </path>
-
-    <path name="compress-offload-playback7 afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia14" value="1" />
-    </path>
-
-    <path name="compress-offload-playback7 usb-headphones">
-        <path name="compress-offload-playback7 afe-proxy" />
-    </path>
-
-    <path name="compress-offload-playback7 speaker-and-usb-headphones">
-        <path name="compress-offload-playback7 usb-headphones" />
-        <path name="compress-offload-playback7" />
-    </path>
-
-    <path name="compress-offload-playback8">
-        <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia15" value="1" />
-    </path>
-
-    <path name="compress-offload-playback8 headphones">
-        <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia15" value="1" />
-    </path>
-
-    <path name="compress-offload-playback8 speaker-and-headphones">
-        <path name="compress-offload-playback8" />
-        <path name="compress-offload-playback8 headphones" />
-    </path>
-
-    <path name="compress-offload-playback8 hdmi">
-        <ctl name="HDMI Mixer MultiMedia15" value="1" />
-    </path>
-
-    <path name="compress-offload-playback8 bt-sco">
-        <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia15" value="1" />
-    </path>
-
-    <path name="compress-offload-playback8 bt-sco-wb">
-        <ctl name="AUX PCM SampleRate" value="16000" />
-        <path name="compress-offload-playback8 bt-sco" />
-    </path>
-
-    <path name="compress-offload-playback8 speaker-and-hdmi">
-        <path name="compress-offload-playback8 hdmi" />
-        <path name="compress-offload-playback8" />
-    </path>
-
-    <path name="compress-offload-playback8 afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia15" value="1" />
-    </path>
-
-    <path name="compress-offload-playback8 usb-headphones">
-        <path name="compress-offload-playback8 afe-proxy" />
-    </path>
-
-    <path name="compress-offload-playback8 speaker-and-usb-headphones">
-        <path name="compress-offload-playback8 usb-headphones" />
-        <path name="compress-offload-playback8" />
-    </path>
-
-    <path name="compress-offload-playback9">
-        <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia16" value="1" />
-    </path>
-
-    <path name="compress-offload-playback9 headphones">
-        <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia16" value="1" />
-    </path>
-
-    <path name="compress-offload-playback9 speaker-and-headphones">
-        <path name="compress-offload-playback9" />
-        <path name="compress-offload-playback9 headphones" />
-    </path>
-
-    <path name="compress-offload-playback9 hdmi">
-        <ctl name="HDMI Mixer MultiMedia16" value="1" />
-    </path>
-
-    <path name="compress-offload-playback9 bt-sco">
-        <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia16" value="1" />
-    </path>
-
-    <path name="compress-offload-playback9 bt-sco-wb">
-        <ctl name="AUX PCM SampleRate" value="16000" />
-        <path name="compress-offload-playback9 bt-sco" />
-    </path>
-
-    <path name="compress-offload-playback9 speaker-and-hdmi">
-        <path name="compress-offload-playback9 hdmi" />
-        <path name="compress-offload-playback9" />
-    </path>
-
-    <path name="compress-offload-playback9 afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia16" value="1" />
-    </path>
-
-    <path name="compress-offload-playback9 usb-headphones">
-        <path name="compress-offload-playback9 afe-proxy" />
-    </path>
-
-    <path name="compress-offload-playback9 speaker-and-usb-headphones">
-        <path name="compress-offload-playback9 usb-headphones" />
-        <path name="compress-offload-playback9" />
-    </path>
-
-    <path name="audio-record">
-        <ctl name="MultiMedia1 Mixer SLIM_0_TX" value="1" />
-    </path>
-
-    <path name="audio-record usb-headset-mic">
-        <ctl name="MultiMedia1 Mixer AFE_PCM_TX" value="1" />
-    </path>
-
-    <path name="audio-record bt-sco">
-        <ctl name="MultiMedia1 Mixer SEC_AUX_PCM_UL_TX" value="1" />
-    </path>
-
-    <path name="audio-record bt-sco-wb">
-        <ctl name="AUX PCM SampleRate" value="16000" />
-        <path name="audio-record bt-sco" />
-    </path>
-
-    <path name="audio-record capture-fm">
-        <ctl name="MultiMedia1 Mixer PRI_MI2S_TX" value="1" />
-    </path>
-
-    <path name="audio-record-compress">
-        <ctl name="MultiMedia8 Mixer SLIM_0_TX" value="1" />
-    </path>
-
-    <path name="audio-record-compress bt-sco">
-        <ctl name="MultiMedia8 Mixer SEC_AUX_PCM_UL_TX" value="1" />
-    </path>
-
-    <path name="audio-record-compress bt-sco-wb">
-        <ctl name="AUX PCM SampleRate" value="16000" />
-        <path name="audio-record-compress bt-sco" />
-    </path>
-
-    <path name="audio-record-compress usb-headset-mic">
-        <ctl name="MultiMedia8 Mixer AFE_PCM_TX" value="1" />
-    </path>
-
-    <path name="low-latency-record">
-      <ctl name="MultiMedia5 Mixer SLIM_0_TX" value="1" />
-    </path>
-
-    <path name="low-latency-record bt-sco">
-      <ctl name="MultiMedia5 Mixer SEC_AUX_PCM_TX" value="1" />
-    </path>
-
-    <path name="low-latency-record bt-sco-wb">
-        <ctl name="AUX PCM SampleRate" value="16000" />
-        <path name="low-latency-record bt-sco" />
-    </path>
-
-    <path name="low-latency-record capture-fm">
-      <ctl name="MultiMedia5 Mixer PRI_MI2S_TX" value="1" />
-    </path>
-
-    <path name="fm-virtual-record capture-fm">
-        <ctl name="MultiMedia2 Mixer PRI_MI2S_TX" value="1" />
-    </path>
-
-    <path name="afe-proxy-playback afe-proxy">
-    </path>
-
-    <path name="afe-proxy-record afe-proxy">
-    </path>
-
-    <path name="voice-call">
-        <ctl name="SLIM_0_RX_Voice Mixer CSVoice" value="1" />
-        <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="1" />
-    </path>
-
-    <path name="voice-call headphones">
-        <ctl name="SLIM_5_RX_Voice Mixer CSVoice" value="1" />
-        <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="1" />
-    </path>
-
-    <path name="voice-call hdmi">
-        <ctl name="HDMI_RX_Voice Mixer CSVoice" value="1" />
-        <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="1" />
-    </path>
-
-    <path name="voice-call bt-sco">
-        <ctl name="SEC_AUX_PCM_RX_Voice Mixer CSVoice" value="1" />
-        <ctl name="Voice_Tx Mixer SEC_AUX_PCM_TX_Voice" value="1" />
-    </path>
-
-    <path name="voice-call bt-sco-wb">
-        <ctl name="AUX PCM SampleRate" value="16000" />
-        <path name="voice-call bt-sco" />
-    </path>
-
-    <path name="voice-call afe-proxy">
-        <ctl name="AFE_PCM_RX_Voice Mixer CSVoice" value="1" />
-        <ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="1" />
-    </path>
-
-    <path name="voice-call usb-headphones">
-        <ctl name="AFE_PCM_RX_Voice Mixer CSVoice" value="1" />
-        <ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="1" />
-    </path>
-
-    <path name="voice2-call">
-        <ctl name="SLIM_0_RX_Voice Mixer Voice2" value="1" />
-        <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" />
-    </path>
-
-    <path name="voice2-call headphones">
-        <ctl name="SLIM_5_RX_Voice Mixer Voice2" value="1" />
-        <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" />
-    </path>
-
-    <path name="voice2-call hdmi">
-        <ctl name="HDMI_RX_Voice Mixer Voice2" value="1" />
-        <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" />
-    </path>
-
-    <path name="voice2-call bt-sco">
-        <ctl name="SEC_AUX_PCM_RX_Voice Mixer Voice2" value="1" />
-        <ctl name="Voice2_Tx Mixer SEC_AUX_PCM_TX_Voice2" value="1" />
-    </path>
-
-    <path name="voice2-call bt-sco-wb">
-        <ctl name="AUX PCM SampleRate" value="16000" />
-        <path name="voice2-call bt-sco" />
-    </path>
-
-    <path name="voice2-call afe-proxy">
-        <ctl name="AFE_PCM_RX_Voice Mixer Voice2" value="1" />
-        <ctl name="Voice2_Tx Mixer AFE_PCM_TX_Voice2" value="1" />
-    </path>
-
-    <path name="voice2-call usb-headphones">
-        <ctl name="AFE_PCM_RX_Voice Mixer Voice2" value="1" />
-        <ctl name="Voice2_Tx Mixer AFE_PCM_TX_Voice2" value="1" />
-    </path>
-
-    <path name="voice2-call speaker-protected">
-    </path>
-
-    <path name="play-fm">
-        <ctl name="PRI MI2S LOOPBACK Volume" value="1" />
-        <ctl name="SLIMBUS_0_RX Port Mixer PRI_MI2S_TX" value="1" />
-        <ctl name="SLIMBUS_DL_HL Switch" value="1" />
-    </path>
-
-    <path name="incall-rec-uplink">
-        <ctl name="MultiMedia1 Mixer VOC_REC_UL" value="1" />
-    </path>
-
-    <path name="incall-rec-uplink bt-sco">
-        <path name="incall-rec-uplink" />
-    </path>
-
-    <path name="incall-rec-uplink bt-sco-wb">
-        <path name="incall-rec-uplink" />
-    </path>
-
-    <path name="incall-rec-uplink usb-headset-mic">
-        <path name="incall-rec-uplink" />
-    </path>
-
-    <path name="incall-rec-uplink afe-proxy">
-        <path name="incall-rec-uplink" />
-    </path>
-
-    <path name="incall-rec-uplink-compress">
-        <ctl name="MultiMedia8 Mixer VOC_REC_UL" value="1" />
-    </path>
-
-    <path name="incall-rec-uplink-compress bt-sco">
-        <path name="incall-rec-uplink-compress" />
-    </path>
-
-    <path name="incall-rec-uplink-compress bt-sco-wb">
-        <path name="incall-rec-uplink-compress" />
-    </path>
-
-    <path name="incall-rec-uplink-compress usb-headset-mic">
-        <path name="incall-rec-uplink-compress" />
-    </path>
-
-    <path name="incall-rec-uplink-compress afe-proxy">
-        <path name="incall-rec-uplink-compress" />
-    </path>
-
-    <path name="incall-rec-downlink">
-        <ctl name="MultiMedia1 Mixer VOC_REC_DL" value="1" />
-    </path>
-
-    <path name="incall-rec-downlink bt-sco">
-        <path name="incall-rec-downlink" />
-    </path>
-
-    <path name="incall-rec-downlink bt-sco-wb">
-        <path name="incall-rec-downlink" />
-    </path>
-
-    <path name="incall-rec-downlink usb-headset-mic">
-        <path name="incall-rec-downlink" />
-    </path>
-
-    <path name="incall-rec-downlink afe-proxy">
-        <path name="incall-rec-downlink" />
-    </path>
-
-    <path name="incall-rec-downlink-compress">
-        <ctl name="MultiMedia8 Mixer VOC_REC_DL" value="1" />
-    </path>
-
-    <path name="incall-rec-downlink-compress bt-sco">
-        <path name="incall-rec-downlink-compress" />
-    </path>
-
-    <path name="incall-rec-downlink-compress bt-sco-wb">
-        <path name="incall-rec-downlink-compress" />
-    </path>
-
-    <path name="incall-rec-downlink-compress usb-headset-mic">
-        <path name="incall-rec-downlink-compress" />
-    </path>
-
-    <path name="incall-rec-downlink-compress afe-proxy">
-        <path name="incall-rec-downlink-compress" />
-    </path>
-
-    <path name="incall-rec-uplink-and-downlink">
-        <path name="incall-rec-uplink" />
-        <path name="incall-rec-downlink" />
-    </path>
-
-    <path name="incall-rec-uplink-and-downlink bt-sco">
-        <path name="incall-rec-uplink-and-downlink" />
-    </path>
-
-    <path name="incall-rec-uplink-and-downlink bt-sco-wb">
-        <path name="incall-rec-uplink-and-downlink" />
-    </path>
-
-    <path name="incall-rec-uplink-and-downlink usb-headset-mic">
-        <path name="incall-rec-uplink-and-downlink" />
-    </path>
-
-    <path name="incall-rec-uplink-and-downlink afe-proxy">
-        <path name="incall-rec-uplink-and-downlink" />
-    </path>
-
-    <path name="incall-rec-uplink-and-downlink-compress">
-        <path name="incall-rec-uplink-compress" />
-        <path name="incall-rec-downlink-compress" />
-    </path>
-
-    <path name="incall-rec-uplink-and-downlink-compress bt-sco">
-        <path name="incall-rec-uplink-and-downlink-compress" />
-    </path>
-
-    <path name="incall-rec-uplink-and-downlink-compress bt-sco-wb">
-        <path name="incall-rec-uplink-and-downlink-compress" />
-    </path>
-
-    <path name="incall-rec-uplink-and-downlink-compress usb-headset-mic">
-        <path name="incall-rec-uplink-and-downlink-compress" />
-    </path>
-
-    <path name="incall-rec-uplink-and-downlink-compress afe-proxy">
-        <path name="incall-rec-uplink-and-downlink-compress" />
-    </path>
-
-    <path name="incall_music_uplink">
-        <ctl name="Incall_Music Audio Mixer MultiMedia2" value="1" />
-    </path>
-
-    <path name="incall_music_uplink bt-sco">
-        <path name="incall_music_uplink" />
-    </path>
-
-    <path name="incall_music_uplink bt-sco-wb">
-        <path name="incall_music_uplink" />
-    </path>
-
-    <path name="incall_music_uplink afe-proxy">
-        <path name="incall_music_uplink" />
-    </path>
-
-    <path name="incall_music_uplink usb-headphones">
-        <path name="incall_music_uplink" />
-    </path>
-
-    <path name="incall_music_uplink hdmi">
-        <path name="incall_music_uplink" />
-    </path>
-
-    <path name="incall_music_uplink2">
-        <ctl name="Incall_Music_2 Audio Mixer MultiMedia9" value="1" />
-    </path>
-
-    <path name="incall_music_uplink2 bt-sco">
-        <path name="incall_music_uplink2" />
-    </path>
-
-    <path name="incall_music_uplink2 bt-sco-wb">
-        <path name="incall_music_uplink2" />
-    </path>
-
-    <path name="incall_music_uplink2 afe-proxy">
-        <path name="incall_music_uplink2" />
-    </path>
-
-    <path name="incall_music_uplink2 usb-headphones">
-        <path name="incall_music_uplink2" />
-    </path>
-
-    <path name="incall_music_uplink2 hdmi">
-        <path name="incall_music_uplink2" />
-    </path>
-
-    <path name="hfp-sco">
-        <ctl name="HFP_AUX_UL_HL Switch" value="1" />
-        <ctl name="SLIMBUS_0_RX Port Mixer SEC_AUX_PCM_UL_TX" value="1" />
-        <ctl name="SEC_AUX_PCM_RX Audio Mixer MultiMedia6" value="1" />
-        <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="1" />
-        <ctl name="SLIMBUS_DL_HL Switch" value="1" />
-   </path>
-
-   <path name="hfp-sco-wb">
-        <ctl name="AUX PCM SampleRate" value="16000" />
-        <path name="hfp-sco" />
-   </path>
-
-    <path name="volte-call">
-        <ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="1" />
-        <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
-    </path>
-
-    <path name="volte-call headphones">
-        <ctl name="SLIM_5_RX_Voice Mixer VoLTE" value="1" />
-        <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
-    </path>
-
-    <path name="volte-call hdmi">
-        <ctl name="HDMI_RX_Voice Mixer VoLTE" value="1" />
-        <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
-    </path>
-
-    <path name="volte-call bt-sco">
-        <ctl name="SEC_AUX_PCM_RX_Voice Mixer VoLTE" value="1" />
-        <ctl name="VoLTE_Tx Mixer SEC_AUX_PCM_TX_VoLTE" value="1" />
-    </path>
-
-    <path name="volte-call bt-sco-wb">
-        <ctl name="AUX PCM SampleRate" value="16000" />
-        <path name="volte-call bt-sco" />
-    </path>
-
-    <path name="volte-call afe-proxy">
-        <ctl name="AFE_PCM_RX_Voice Mixer VoLTE" value="1" />
-        <ctl name="VoLTE_Tx Mixer AFE_PCM_TX_VoLTE" value="1" />
-    </path>
-
-    <path name="volte-call usb-headphones">
-        <ctl name="AFE_PCM_RX_Voice Mixer VoLTE" value="1" />
-        <ctl name="VoLTE_Tx Mixer AFE_PCM_TX_VoLTE" value="1" />
-    </path>
-
-    <path name="volte-call speaker-protected">
-    </path>
-
-    <path name="compress-voip-call">
-        <ctl name="SLIM_0_RX_Voice Mixer Voip" value="1" />
-        <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
-    </path>
-
-    <path name="compress-voip-call headphones">
-        <ctl name="SLIM_5_RX_Voice Mixer Voip" value="1" />
-        <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
-    </path>
-
-    <path name="compress-voip-call bt-sco">
-        <ctl name="SEC_AUX_PCM_RX_Voice Mixer Voip" value="1" />
-        <ctl name="Voip_Tx Mixer SEC_AUX_PCM_TX_Voip" value="1" />
-    </path>
-
-    <path name="compress-voip-call bt-sco-wb">
-        <ctl name="AUX PCM SampleRate" value="16000" />
-        <path name="compress-voip-call bt-sco" />
-    </path>
-
-    <path name="compress-voip-call afe-proxy">
-        <ctl name="AFE_PCM_RX_Voice Mixer Voip" value="1" />
-        <ctl name="Voip_Tx Mixer AFE_PCM_TX_Voip" value="1" />
-    </path>
-
-    <path name="compress-voip-call usb-headphones">
-        <ctl name="AFE_PCM_RX_Voice Mixer Voip" value="1" />
-        <ctl name="Voip_Tx Mixer AFE_PCM_TX_Voip" value="1" />
-    </path>
-
-    <path name="compress-voip-call speaker-protected">
-    </path>
-
-    <path name="listen-voice-wakeup-1">
-        <ctl name="LSM1 MUX" value="SLIMBUS_5_TX" />
-        <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
-    </path>
-    <path name="listen-voice-wakeup-2">
-        <ctl name="LSM2 MUX" value="SLIMBUS_5_TX" />
-        <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
-    </path>
-    <path name="listen-voice-wakeup-3">
-        <ctl name="LSM3 MUX" value="SLIMBUS_5_TX" />
-        <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
-    </path>
-    <path name="listen-voice-wakeup-4">
-        <ctl name="LSM4 MUX" value="SLIMBUS_5_TX" />
-        <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
-    </path>
-    <path name="listen-voice-wakeup-5">
-        <ctl name="LSM5 MUX" value="SLIMBUS_5_TX" />
-        <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
-    </path>
-    <path name="listen-voice-wakeup-6">
-        <ctl name="LSM6 MUX" value="SLIMBUS_5_TX" />
-        <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
-    </path>
-    <path name="listen-voice-wakeup-7">
-        <ctl name="LSM7 MUX" value="SLIMBUS_5_TX" />
-        <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
-    </path>
-    <path name="listen-voice-wakeup-8">
-        <ctl name="LSM8 MUX" value="SLIMBUS_5_TX" />
-        <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
-    </path>
-
-   <path name="spkr-rx-calib">
-        <ctl name="SLIMBUS_DL_HL Switch"  value="1" />
-    </path>
-
-    <path name="spkr-vi-record">
-    </path>
-
-    <path name="qchat-call">
-        <ctl name="SLIM_0_RX_Voice Mixer QCHAT" value="1" />
-        <ctl name="QCHAT_Tx Mixer SLIM_0_TX_QCHAT" value="1" />
-    </path>
-
-    <path name="qchat-call headphones">
-        <ctl name="SLIM_5_RX_Voice Mixer QCHAT" value="1" />
-        <ctl name="QCHAT_Tx Mixer SLIM_0_TX_QCHAT" value="1" />
-    </path>
-
-    <path name="qchat-call bt-sco">
-        <ctl name="SEC_AUX_PCM_RX_Voice Mixer QCHAT" value="1" />
-        <ctl name="QCHAT_Tx Mixer SEC_AUX_PCM_TX_QCHAT" value="1" />
-    </path>
-
-    <path name="qchat-call bt-sco-wb">
-        <ctl name="AUX PCM SampleRate" value="16000" />
-        <path name="qchat-call bt-sco" />
-    </path>
-
-    <path name="vowlan-call">
-        <ctl name="SLIM_0_RX_Voice Mixer VoWLAN" value="1" />
-        <ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
-    </path>
-
-    <path name="vowlan-call headphones">
-        <ctl name="SLIM_5_RX_Voice Mixer VoWLAN" value="1" />
-        <ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
-    </path>
-
-    <path name="vowlan-call hdmi">
-        <ctl name="HDMI_RX_Voice Mixer VoWLAN" value="1" />
-        <ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
-    </path>
-
-    <path name="vowlan-call bt-sco">
-        <ctl name="SEC_AUX_PCM_RX_Voice Mixer VoWLAN" value="1" />
-        <ctl name="VoWLAN_Tx Mixer SEC_AUX_PCM_TX_VoWLAN" value="1" />
-    </path>
-
-    <path name="vowlan-call bt-sco-wb">
-        <ctl name="AUX PCM SampleRate" value="16000" />
-        <path name="vowlan-call bt-sco" />
-    </path>
-
-    <path name="vowlan-call afe-proxy">
-        <ctl name="AFE_PCM_RX_Voice Mixer VoWLAN" value="1" />
-        <ctl name="VoWLAN_Tx Mixer AFE_PCM_TX_VoWLAN" value="1" />
-    </path>
-
-    <path name="vowlan-call usb-headphones">
-        <ctl name="AFE_PCM_RX_Voice Mixer VoWLAN" value="1" />
-        <ctl name="VoWLAN_Tx Mixer AFE_PCM_TX_VoWLAN" value="1" />
-    </path>
-
-    <!-- These are actual sound device specific mixer settings -->
-    <path name="adc1">
-        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
-        <ctl name="SLIM_0_TX Channels" value="One" />
-        <ctl name="SLIM TX7 MUX" value="DEC6" />
-        <ctl name="DEC6 MUX" value="ADC1" />
-        <ctl name="IIR1 INP1 MUX" value="DEC6" />
-    </path>
-
-    <path name="adc2">
-        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
-        <ctl name="SLIM_0_TX Channels" value="One" />
-        <ctl name="SLIM TX7 MUX" value="DEC5" />
-        <ctl name="DEC5 MUX" value="ADC2" />
-        <ctl name="IIR1 INP1 MUX" value="DEC5" />
-    </path>
-
-    <path name="adc3">
-        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
-        <ctl name="SLIM_0_TX Channels" value="One" />
-        <ctl name="SLIM TX7 MUX" value="DEC4" />
-        <ctl name="DEC4 MUX" value="ADC3" />
-        <ctl name="IIR1 INP1 MUX" value="DEC4" />
-    </path>
-
-    <path name="adc4">
-        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
-        <ctl name="SLIM_0_TX Channels" value="One" />
-        <ctl name="SLIM TX7 MUX" value="DEC3" />
-        <ctl name="DEC3 MUX" value="ADC4" />
-        <ctl name="IIR1 INP1 MUX" value="DEC3" />
-    </path>
-
-    <path name="adc5">
-        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
-        <ctl name="SLIM_0_TX Channels" value="One" />
-        <ctl name="SLIM TX7 MUX" value="DEC2" />
-        <ctl name="DEC2 MUX" value="ADC5" />
-        <ctl name="IIR1 INP1 MUX" value="DEC2" />
-    </path>
-
-    <path name="dmic1">
-        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
-        <ctl name="SLIM_0_TX Channels" value="One" />
-        <ctl name="SLIM TX7 MUX" value="DEC7" />
-        <ctl name="DEC7 MUX" value="DMIC1" />
-        <ctl name="IIR1 INP1 MUX" value="DEC7" />
-    </path>
-
-    <path name="dmic2">
-        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
-        <ctl name="SLIM_0_TX Channels" value="One" />
-        <ctl name="SLIM TX7 MUX" value="DEC8" />
-        <ctl name="DEC8 MUX" value="DMIC2" />
-        <ctl name="IIR1 INP1 MUX" value="DEC8" />
-    </path>
-
-    <path name="dmic3">
-        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
-        <ctl name="SLIM_0_TX Channels" value="One" />
-        <ctl name="SLIM TX7 MUX" value="DEC10" />
-        <ctl name="DEC10 MUX" value="DMIC3" />
-        <ctl name="IIR1 INP1 MUX" value="DEC10" />
-    </path>
-
-    <path name="dmic4">
-        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
-        <ctl name="SLIM_0_TX Channels" value="One" />
-        <ctl name="SLIM TX7 MUX" value="DEC7" />
-        <ctl name="DEC9 MUX" value="DMIC4" />
-        <ctl name="IIR1 INP1 MUX" value="DEC9" />
-    </path>
-
-    <path name="dmic5">
-        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
-        <ctl name="SLIM_0_TX Channels" value="One" />
-        <ctl name="SLIM TX7 MUX" value="DEC5" />
-        <ctl name="DEC5 MUX" value="DMIC5" />
-        <ctl name="IIR1 INP1 MUX" value="DEC5" />
-    </path>
-
-    <path name="dmic6">
-        <ctl name="AIF1_CAP Mixer SLIM TX10" value="1"/>
-        <ctl name="SLIM_0_TX Channels" value="One" />
-        <ctl name="SLIM TX10 MUX" value="DEC6" />
-        <ctl name="DEC6 MUX" value="DMIC6" />
-        <ctl name="IIR1 INP1 MUX" value="DEC6" />
-    </path>
-
-    <path name="spkr-gain-in-headphone-combo">
-        <ctl name="RX7 Digital Volume" value="95" />
-        <ctl name="SPK DRV Volume" value="8" />
-    </path>
-
-    <path name="spkr-gain-in-line-combo">
-        <path name="spkr-gain-in-headphone-combo" />
-    </path>
-
-    <path name="speaker-gain-default">
-        <ctl name="RX7 Digital Volume" value="84" />
-        <ctl name="SPK DRV Volume" value="8" />
-    </path>
-
-    <path name="speaker">
-        <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
-        <ctl name="SLIM_0_RX Channels" value="One" />
-        <ctl name="RX7 MIX1 INP1" value="RX1" />
-        <path name="speaker-gain-default" />
-        <ctl name="COMP0 Switch" value="1" />
-    </path>
-
-    <path name="speaker-liquid">
-        <path name="speaker" />
-    </path>
-
-    <path name="speaker-ext-1-liquid">
-        <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
-        <ctl name="SLIM RX2 MUX" value="AIF1_PB" />
-        <ctl name="SLIM_0_RX Channels" value="Two" />
-        <ctl name="RX3 MIX1 INP1" value="RX1" />
-        <ctl name="RX5 MIX1 INP1" value="RX2" />
-        <ctl name="RX3 Digital Volume" value="68" />
-        <ctl name="RX5 Digital Volume" value="68" />
-        <ctl name="LINEOUT1 Volume" value="84" />
-        <ctl name="LINEOUT2 Volume" value="84" />
-        <ctl name="COMP2 Switch" value="1" />
-    </path>
-
-   <path name="sidetone-iir">
-        <ctl name="IIR1 Enable Band1" value="1" />
-        <ctl name="IIR1 Enable Band2" value="1" />
-        <ctl name="IIR1 Enable Band3" value="1" />
-        <ctl name="IIR1 Enable Band4" value="1" />
-        <ctl name="IIR1 Enable Band5" value="1" />
-    </path>
-
-    <!-- Sidetone for headphone/headset not needed on bullhead, meets spec  -->
-    <path name="sidetone-headphones" />
-    <path name="sidetone-handset" />
-
-     <!-- sidetone needed for hac-headset on bullhead -->
-    <path name="sidetone-hac-handset">
-        <path name="sidetone-iir" />
-        <ctl name="RX1 MIX2 INP1" value="IIR1" />
-        <ctl name="IIR1 INP1 Volume" value="62" />
-    </path>
-
-    <path name="speaker-mic">
-        <path name="dmic3" />
-    </path>
-
-    <path name="speaker-mic-liquid">
-        <path name="dmic3" />
-        <ctl name="DEC9 Volume" value="111" />
-    </path>
-
-    <path name="speaker-mic-sbc">
-        <path name="adc5" />
-        <ctl name="ADC5 Volume" value="20" />
-    </path>
-
-    <path name="speaker-protected">
-        <ctl name="AIF4_VI Mixer SPKR_VI_1" value="1" />
-        <path name="speaker" />
-        <ctl name="VI_FEED_TX Channels" value="One" />
-        <ctl name="SLIM0_RX_VI_FB_LCH_MUX"  value="SLIM4_TX" />
-   </path>
-
-    <path name="vi-feedback">
-    </path>
-
-    <path name="speaker-mono">
-        <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
-        <ctl name="SLIM_0_RX Channels" value="One" />
-        <ctl name="RX7 MIX1 INP1" value="RX1" />
-        <ctl name="COMP0 Switch" value="1" />
-        <ctl name="RX7 Digital Volume" value="84" />
-        <ctl name="SPK DRV Volume" value="8" />
-    </path>
-
-    <path name="voice-speaker-protected">
-        <ctl name="AIF4_VI Mixer SPKR_VI_1" value="1" />
-        <path name="speaker-mono" />
-        <ctl name="VI_FEED_TX Channels" value="One" />
-        <ctl name="SLIM0_RX_VI_FB_LCH_MUX"  value="SLIM4_TX" />
-    </path>
-
-    <path name="handset">
-        <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
-        <ctl name="SLIM_0_RX Channels" value="One" />
-        <ctl name="RX1 MIX1 INP1" value="RX1" />
-        <ctl name="CLASS_H_DSM MUX" value="DSM_HPHL_RX1" />
-        <ctl name="DAC1 Switch" value="1" />
-        <ctl name="RX1 Digital Volume" value="84" />
-    </path>
-
-    <path name="handset-mic">
-        <path name="dmic1" />
-        <ctl name="DEC7 Volume" value="84" />
-    </path>
-
-    <path name="unprocessed-handset-mic">
-        <path name="dmic1" />
-        <ctl name="DEC7 Volume" value="76" />
-    </path>
-
-    <path name="camcorder-handset-mic">
-        <path name="dmic1" />
-        <ctl name="DEC7 Volume" value="78" />
-    </path>
-
-    <path name="handset-mic-cdp">
-        <path name="adc1" />
-        <ctl name="ADC1 Volume" value="20" />
-    </path>
-
-    <path name="handset-mic-sbc">
-        <path name="adc5" />
-        <ctl name="ADC5 Volume" value="20" />
-    </path>
-
-    <path name="anc-handset">
-        <ctl name="ANC Function" value="ON" />
-        <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
-        <ctl name="SLIM_0_RX Channels" value="One" />
-        <ctl name="RX1 MIX1 INP1" value="RX1" />
-        <ctl name="CLASS_H_DSM MUX" value="DSM_HPHL_RX1" />
-        <ctl name="DAC1 Switch" value="1" />
-        <ctl name="RX1 Digital Volume" value="81" />
-        <ctl name="ANC Slot" value="6" />
-        <ctl name="ANC1 MUX" value="DMIC4" />
-        <ctl name="ANC1 FB MUX" value="EAR_HPH_L" />
-    </path>
-
-    <path name="headphones">
-        <ctl name="SLIM RX3 MUX" value="AIF3_PB" />
-        <ctl name="SLIM RX4 MUX" value="AIF3_PB" />
-        <ctl name="SLIM_5_RX Channels" value="Two" />
-        <ctl name="RX1 MIX1 INP2" value="RX3" />
-        <ctl name="RX2 MIX1 INP2" value="RX4" />
-        <ctl name="CLASS_H_DSM MUX" value="DSM_HPHL_RX1" />
-        <ctl name="HPHL DAC Switch" value="1" />
-        <ctl name="HPHL Volume" value="20" />
-        <ctl name="HPHR Volume" value="20" />
-        <ctl name="RX1 Digital Volume" value="75" />
-        <ctl name="RX2 Digital Volume" value="75" />
-        <ctl name="COMP1 Switch" value="1" />
-    </path>
-
-    <path name="line">
-        <path name="headphones" />
-    </path>
-
-    <path name="headset-mic">
-        <path name="adc2" />
-        <ctl name="ADC2 Volume" value="12" />
-        <ctl name="DEC5 Volume" value="84" />
-    </path>
-
-    <path name="headset-mic-liquid">
-        <path name="adc2" />
-        <ctl name="ADC2 Volume" value="20" />
-    </path>
-
-    <path name="voice-hac-handset">
-        <path name="handset" />
-        <ctl name="RX1 Digital Volume" value="84" />
-        <ctl name="EAR PA Gain" value="POS_6_DB" />
-    </path>
-
-    <path name="voice-handset">
-        <path name="handset" />
-        <ctl name="RX1 Digital Volume" value="84" />
-        <ctl name="EAR PA Gain" value="POS_6_DB" />
-    </path>
-
-    <path name="voice-handset-tmus">
-        <path name="handset" />
-    </path>
-
-    <path name="voice-handset-vzwusc">
-        <path name="handset" />
-        <ctl name="RX1 Digital Volume" value="84" />
-        <ctl name="EAR PA Gain" value="POS_6_DB" />
-    </path>
-
-    <path name="voice-speaker">
-        <path name="speaker" />
-        <ctl name="COMP0 Switch" value="0" />
-        <ctl name="RX7 Digital Volume" value="84" />
-        <ctl name="SPK DRV Volume" value="8" />
-    </path>
-
-    <path name="voice-speaker-mic">
-        <path name="speaker-mic" />
-        <ctl name="ADC4 Volume" value="12" />
-        <ctl name="DEC3 Volume" value="84" />
-    </path>
-
-    <path name="voice-headphones">
-        <path name="headphones" />
-        <ctl name="COMP1 Switch" value="1" />
-        <ctl name="HPHL Volume" value="20" />
-        <ctl name="HPHR Volume" value="20" />
-        <ctl name="RX1 Digital Volume" value="78" />
-        <ctl name="RX2 Digital Volume" value="78" />
-    </path>
-
-    <path name="voice-line">
-        <path name="voice-headphones" />
-    </path>
-
-    <path name="voice-headphones-vzwusc">
-        <path name="headphones" />
-        <ctl name="COMP1 Switch" value="1" />
-        <ctl name="HPHL Volume" value="20" />
-        <ctl name="HPHR Volume" value="20" />
-        <ctl name="RX1 Digital Volume" value="78" />
-        <ctl name="RX2 Digital Volume" value="78" />
-    </path>
-
-    <path name="voice-headset-mic">
-        <path name="headset-mic" />
-        <ctl name="ADC2 Volume" value="10" />
-        <ctl name="DEC5 Volume" value="84" />
-    </path>
-
-    <path name="voice-headset-mic-vzwusc">
-        <path name="headset-mic" />
-        <ctl name="ADC2 Volume" value="10" />
-        <ctl name="DEC5 Volume" value="84" />
-    </path>
-
-    <path name="speaker-and-headphones">
-        <path name="headphones" />
-        <path name="speaker" />
-        <ctl name="HPHL Volume" value="12" />
-        <ctl name="HPHR Volume" value="12" />
-        <ctl name="RX1 Digital Volume" value="66" />
-        <ctl name="RX2 Digital Volume" value="66" />
-        <ctl name="RX7 Digital Volume" value="72" />
-        <ctl name="SPK DRV Volume" value="8" />
-    </path>
-
-    <path name="speaker-and-line">
-        <path name="speaker-and-headphones" />
-    </path>
-
-    <path name="speaker-and-headphones-liquid">
-        <path name="headphones" />
-        <ctl name="RX7 MIX1 INP1" value="RX1" />
-        <ctl name="RX8 MIX1 INP1" value="RX2" />
-        <ctl name="RX7 Digital Volume" value="84" />
-        <ctl name="RX8 Digital Volume" value="84" />
-        <ctl name="COMP0 Switch" value="1" />
-    </path>
-
-    <path name="speaker-and-headphones-ext-1-liquid">
-        <path name="headphones" />
-        <ctl name="RX3 MIX1 INP1" value="RX1" />
-        <ctl name="RX5 MIX1 INP1" value="RX2" />
-        <ctl name="RX3 Digital Volume" value="68" />
-        <ctl name="RX5 Digital Volume" value="68" />
-        <ctl name="LINEOUT1 Volume" value="84" />
-        <ctl name="LINEOUT2 Volume" value="84" />
-        <ctl name="COMP2 Switch" value="1" />
-    </path>
-
-    <path name="usb-headphones">
-    </path>
-
-    <path name="afe-proxy">
-    </path>
-
-    <path name="anc-headphones">
-        <ctl name="ANC Function" value="ON" />
-        <ctl name="ANC Slot" value="0" />
-        <ctl name="ANC1 FB MUX" value="EAR_HPH_L" />
-        <ctl name="ANC1 MUX" value="ADC3" />
-        <ctl name="ANC2 MUX" value="ADC4" />
-        <ctl name="ADC3 Volume" value="8" />
-        <ctl name="ADC4 Volume" value="8" />
-        <ctl name="HPHL Volume" value="20" />
-        <ctl name="HPHR Volume" value="20" />
-        <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
-        <ctl name="SLIM RX2 MUX" value="AIF1_PB" />
-        <ctl name="SLIM_0_RX Channels" value="Two" />
-        <ctl name="RX1 MIX1 INP1" value="RX1" />
-        <ctl name="RX2 MIX1 INP1" value="RX2" />
-        <ctl name="CLASS_H_DSM MUX" value="DSM_HPHL_RX1" />
-        <ctl name="HPHL DAC Switch" value="1" />
-        <ctl name="RX1 Digital Volume" value="84" />
-        <ctl name="RX2 Digital Volume" value="84" />
-    </path>
-
-    <path name="speaker-and-anc-headphones">
-        <path name="anc-headphones" />
-        <ctl name="RX7 MIX1 INP1" value="RX1" />
-        <ctl name="COMP0 Switch" value="1" />
-    </path>
-
-    <path name="anc-fb-headphones">
-        <path name="anc-headphones" />
-        <ctl name="ANC Slot" value="1" />
-    </path>
-
-    <path name="speaker-and-anc-fb-headphones">
-        <path name="anc-fb-headphones" />
-        <ctl name="RX7 MIX1 INP1" value="RX1" />
-        <ctl name="COMP0 Switch" value="1" />
-    </path>
-
-    <path name="voice-anc-headphones">
-        <ctl name="ANC Function" value="ON" />
-        <ctl name="ANC Slot" value="0" />
-        <ctl name="ANC1 FB MUX" value="EAR_HPH_L" />
-        <ctl name="ANC1 MUX" value="ADC3" />
-        <ctl name="ANC2 MUX" value="ADC4" />
-        <ctl name="ADC3 Volume" value="8" />
-        <ctl name="ADC4 Volume" value="8" />
-        <ctl name="HPHL Volume" value="20" />
-        <ctl name="HPHR Volume" value="20" />
-        <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
-        <ctl name="SLIM RX2 MUX" value="AIF1_PB" />
-        <ctl name="SLIM_0_RX Channels" value="Two" />
-        <ctl name="RX1 MIX1 INP1" value="RX1" />
-        <ctl name="RX2 MIX1 INP1" value="RX2" />
-        <ctl name="IIR1 Enable Band1" value="1" />
-        <ctl name="IIR1 Enable Band2" value="1" />
-        <ctl name="IIR1 Enable Band3" value="1" />
-        <ctl name="IIR1 Enable Band4" value="1" />
-        <ctl name="IIR1 Enable Band5" value="1" />
-        <ctl name="IIR1 INP1 Volume" value="54" />
-        <ctl name="RX1 MIX2 INP1" value="IIR1" />
-        <ctl name="RX2 MIX2 INP1" value="IIR1" />
-        <ctl name="CLASS_H_DSM MUX" value="DSM_HPHL_RX1" />
-        <ctl name="HPHL DAC Switch" value="1" />
-        <ctl name="RX1 Digital Volume" value="84" />
-        <ctl name="RX2 Digital Volume" value="84" />
-    </path>
-
-    <path name="voice-anc-fb-headphones">
-        <ctl name="ANC Function" value="ON" />
-        <ctl name="ANC Slot" value="1" />
-        <ctl name="ANC1 FB MUX" value="EAR_HPH_L" />
-        <ctl name="ANC1 MUX" value="ADC3" />
-        <ctl name="ANC2 MUX" value="ADC4" />
-        <ctl name="ADC3 Volume" value="8" />
-        <ctl name="ADC4 Volume" value="8" />
-        <ctl name="HPHL Volume" value="14" />
-        <ctl name="HPHR Volume" value="14" />
-        <ctl name="HPHL Volume" value="20" />
-        <ctl name="HPHR Volume" value="20" />
-        <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
-        <ctl name="SLIM RX2 MUX" value="AIF1_PB" />
-        <ctl name="SLIM_0_RX Channels" value="Two" />
-        <ctl name="RX1 MIX1 INP1" value="RX1" />
-        <ctl name="RX2 MIX1 INP1" value="RX2" />
-        <ctl name="IIR1 Enable Band1" value="1" />
-        <ctl name="IIR1 Enable Band2" value="1" />
-        <ctl name="IIR1 Enable Band3" value="1" />
-        <ctl name="IIR1 Enable Band4" value="1" />
-        <ctl name="IIR1 Enable Band5" value="1" />
-        <ctl name="IIR1 INP1 Volume" value="54" />
-        <ctl name="RX1 MIX2 INP1" value="IIR1" />
-        <ctl name="RX2 MIX2 INP1" value="IIR1" />
-        <ctl name="CLASS_H_DSM MUX" value="DSM_HPHL_RX1" />
-        <ctl name="HPHL DAC Switch" value="1" />
-        <ctl name="RX1 Digital Volume" value="81" />
-        <ctl name="RX2 Digital Volume" value="81" />
-    </path>
-
-    <path name="speaker-and-anc-headphones-liquid">
-        <path name="anc-headphones" />
-        <ctl name="RX3 MIX1 INP1" value="RX1" />
-        <ctl name="RX5 MIX1 INP1" value="RX2" />
-        <ctl name="RDAC5 MUX" value="DEM3_INV" />
-        <ctl name="RDAC7 MUX" value="DEM5_INV" />
-        <ctl name="RX3 Digital Volume" value="68" />
-        <ctl name="RX5 Digital Volume" value="68" />
-        <ctl name="LINEOUT1 Volume" value="20" />
-        <ctl name="LINEOUT2 Volume" value="20" />
-        <ctl name="LINEOUT3 Volume" value="20" />
-        <ctl name="LINEOUT4 Volume" value="20" />
-        <ctl name="COMP2 Switch" value="1" />
-    </path>
-
-    <path name="hdmi">
-    </path>
-
-    <path name="speaker-and-usb-headphones">
-        <path name="speaker" />
-        <path name="usb-headphones" />
-    </path>
-
-    <path name="speaker-and-hdmi">
-        <path name="speaker" />
-        <path name="hdmi" />
-    </path>
-
-    <path name="voice-rec-mic">
-        <path name="handset-mic" />
-        <ctl name="DEC7 Volume" value="82" />
-    </path>
-
-    <path name="unprocessed-mic">
-        <path name="unprocessed-handset-mic" />
-    </path>
-
-    <path name="camcorder-mic">
-        <path name="camcorder-handset-mic" />
-    </path>
-
-    <path name="hdmi-tx">
-        <path name="handset-mic" />
-    </path>
-
-    <path name="bt-sco-headset">
-    </path>
-
-    <path name="bt-sco-mic">
-    </path>
-
-    <path name="bt-sco-headset-wb">
-    </path>
-
-    <path name="bt-sco-mic-wb">
-    </path>
-
-    <path name="usb-headset-mic">
-    </path>
-
-    <path name="capture-fm">
-    </path>
-
-    <path name="aanc-handset-mic">
-        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
-        <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
-        <ctl name="AIF1_CAP Mixer SLIM TX9" value="1" />
-        <ctl name="SLIM_0_TX Channels" value="Three" />
-        <ctl name="AANC_SLIM_0_RX MUX" value="SLIMBUS_0_TX" />
-        <ctl name="SLIM TX7 MUX" value="DEC7" />
-        <ctl name="DEC7 MUX" value="DMIC1" />
-        <ctl name="SLIM TX8 MUX" value="DEC9" />
-        <ctl name="DEC9 MUX" value="DMIC4" />
-        <ctl name="SLIM TX9 MUX" value="DEC10" />
-        <ctl name="DEC10 MUX" value="DMIC3" />
-        <ctl name="IIR1 INP1 MUX" value="DEC7" />
-    </path>
-
-    <!-- Dual MIC devices -->
-    <path name="handset-dmic-endfire">
-        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
-        <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
-        <ctl name="SLIM TX7 MUX" value="DEC7" />
-        <ctl name="DEC7 MUX" value="DMIC1" />
-        <ctl name="SLIM TX8 MUX" value="DEC10" />
-        <ctl name="DEC10 MUX" value="DMIC3" />
-        <ctl name="SLIM_0_TX Channels" value="Two" />
-    </path>
-
-    <path name="speaker-dmic-endfire">
-        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
-        <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
-        <ctl name="SLIM TX7 MUX" value="DEC10" />
-        <ctl name="DEC10 MUX" value="DMIC3" />
-        <ctl name="SLIM TX8 MUX" value="DEC7" />
-        <ctl name="DEC7 MUX" value="DMIC1" />
-        <ctl name="SLIM_0_TX Channels" value="Two" />
-    </path>
-
-    <path name="dmic-endfire">
-        <path name="handset-dmic-endfire" />
-        <ctl name="IIR1 INP1 MUX" value="DEC7" />
-    </path>
-
-    <path name="dmic-endfire-liquid">
-        <path name="handset-dmic-endfire" />
-        <ctl name="IIR1 INP1 MUX" value="DEC7" />
-    </path>
-
-    <path name="handset-stereo-dmic-ef">
-        <path name="handset-dmic-endfire" />
-    </path>
-
-    <path name="speaker-stereo-dmic-ef">
-        <path name="speaker-dmic-endfire" />
-    </path>
-
-    <path name="voice-dmic-ef-tmus">
-        <path name="dmic-endfire" />
-    </path>
-
-    <path name="voice-dmic-ef">
-        <path name="dmic-endfire" />
-        <ctl name="DEC7 Volume" value="84" />
-        <ctl name="DEC10 Volume" value="84" />
-    </path>
-
-    <path name="voice-dmic-ef-vzwusc">
-        <path name="dmic-endfire" />
-        <ctl name="DEC7 Volume" value="84" />
-        <ctl name="DEC10 Volume" value="84" />
-    </path>
-
-    <path name="voice-speaker-dmic-ef">
-        <path name="speaker-dmic-endfire" />
-        <ctl name="DEC10 Volume" value="84" />
-        <ctl name="DEC5 Volume" value="84" />
-    </path>
-
-    <path name="voice-rec-dmic-ef">
-        <path name="dmic-endfire" />
-    </path>
-
-    <path name="voice-rec-dmic-ef-fluence">
-        <path name="dmic-endfire" />
-    </path>
-
-    <path name="handset-stereo-dmic-ef-liquid">
-        <path name="handset-dmic-endfire" />
-    </path>
-
-    <path name="speaker-stereo-dmic-ef-liquid">
-        <path name="handset-dmic-endfire" />
-    </path>
-
-    <path name="voice-dmic-ef-liquid-liquid">
-        <path name="dmic-endfire-liquid" />
-    </path>
-
-    <path name="voice-speaker-dmic-ef-liquid">
-        <path name="dmic-endfire-liquid" />
-    </path>
-
-    <path name="voice-rec-dmic-ef-liquid">
-        <path name="dmic-endfire-liquid" />
-    </path>
-
-    <path name="voice-rec-dmic-ef-fluence-liquid">
-        <path name="dmic-endfire-liquid" />
-    </path>
-
-    <path name="speaker-dmic-broadside">
-        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
-        <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
-        <ctl name="SLIM TX7 MUX" value="DEC7" />
-        <ctl name="DEC7 MUX" value="DMIC1" />
-        <ctl name="SLIM TX8 MUX" value="DEC10" />
-        <ctl name="DEC10 MUX" value="DMIC3" />
-        <ctl name="SLIM_0_TX Channels" value="Two" />
-    </path>
-
-    <path name="dmic-broadside">
-        <path name="speaker-dmic-broadside" />
-        <ctl name="IIR1 INP1 MUX" value="DEC6" />
-    </path>
-
-    <path name="voice-speaker-dmic-broadside">
-        <path name="dmic-broadside" />
-    </path>
-
-    <!-- Three MIC devices -->
-    <path name="speaker-tmic">
-        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
-        <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
-        <ctl name="AIF1_CAP Mixer SLIM TX9" value="1" />
-        <ctl name="SLIM_0_TX Channels" value="Three" />
-        <ctl name="SLIM TX7 MUX" value="DEC10" />
-        <ctl name="DEC10 MUX" value="DMIC3" />
-        <ctl name="SLIM TX8 MUX" value="DEC5" />
-        <ctl name="DEC5 MUX" value="DMIC5" />
-        <ctl name="SLIM TX9 MUX" value="DEC7" />
-        <ctl name="DEC7 MUX" value="DMIC1" />
-    </path>
-
-    <!-- Quad MIC devices -->
-    <path name="speaker-qmic">
-        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
-        <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
-        <ctl name="AIF1_CAP Mixer SLIM TX9" value="1" />
-        <ctl name="AIF1_CAP Mixer SLIM TX10" value="1" />
-        <ctl name="SLIM_0_TX Channels" value="Four" />
-        <ctl name="SLIM TX7 MUX" value="DEC7" />
-        <ctl name="DEC7 MUX" value="DMIC1" />
-        <ctl name="SLIM TX8 MUX" value="DEC10" />
-        <ctl name="DEC10 MUX" value="DMIC3" />
-        <ctl name="SLIM TX9 MUX" value="DEC8" />
-        <ctl name="DEC8 MUX" value="DMIC2" />
-        <ctl name="SLIM TX10 MUX" value="DEC9" />
-        <ctl name="DEC9 MUX" value="DMIC4" />
-    </path>
-
-    <path name="speaker-qmic-cdp">
-        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
-        <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
-        <ctl name="AIF1_CAP Mixer SLIM TX9" value="1" />
-        <ctl name="AIF1_CAP Mixer SLIM TX10" value="1" />
-        <ctl name="SLIM_0_TX Channels" value="Four" />
-        <ctl name="SLIM TX7 MUX" value="DEC9" />
-        <ctl name="DEC9 MUX" value="DMIC4" />
-        <ctl name="SLIM TX8 MUX" value="DEC10" />
-        <ctl name="DEC10 MUX" value="DMIC3" />
-        <ctl name="SLIM TX9 MUX" value="DEC7" />
-        <ctl name="DEC7 MUX" value="DMIC1" />
-        <ctl name="SLIM TX10 MUX" value="DEC6" />
-        <ctl name="DEC6 MUX" value="DMIC6" />
-    </path>
-
-    <path name="speaker-qmic-liquid">
-        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
-        <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
-        <ctl name="AIF1_CAP Mixer SLIM TX9" value="1" />
-        <ctl name="AIF1_CAP Mixer SLIM TX10" value="1" />
-        <ctl name="SLIM_0_TX Channels" value="Four" />
-        <ctl name="SLIM TX7 MUX" value="DEC9" />
-        <ctl name="DEC9 MUX" value="DMIC4" />
-        <ctl name="SLIM TX8 MUX" value="DEC10" />
-        <ctl name="DEC10 MUX" value="DMIC3" />
-        <ctl name="SLIM TX9 MUX" value="DEC8" />
-        <ctl name="DEC8 MUX" value="DMIC2" />
-        <ctl name="SLIM TX10 MUX" value="DEC6" />
-        <ctl name="DEC6 MUX" value="DMIC6" />
-    </path>
-
-    <path name="voice-speaker-qmic">
-        <path name="speaker-qmic" />
-    </path>
-
-    <path name="three-mic">
-        <path name="speaker-tmic" />
-        <ctl name="DEC10 Volume" value="89" />
-        <ctl name="DEC5 Volume" value="94" />
-        <ctl name="DEC7 Volume" value="94" />
-    </path>
-
-    <path name="quad-mic">
-        <path name="speaker-qmic" />
-    </path>
-
-    <path name="voice-speaker-qmic-cdp">
-        <path name="speaker-qmic-cdp" />
-    </path>
-
-    <path name="quad-mic-cdp">
-        <path name="speaker-qmic-cdp" />
-    </path>
-    <path name="voice-speaker-qmic-liquid">
-        <path name="speaker-qmic-liquid" />
-    </path>
-
-    <path name="quad-mic-liquid">
-        <path name="speaker-qmic-liquid" />
-    </path>
-
-    <!-- TTY devices -->
-    <path name="tty-headphones">
-        <ctl name="SLIM RX3 MUX" value="AIF3_PB" />
-        <ctl name="SLIM_5_RX Channels" value="One" />
-        <ctl name="RX1 MIX1 INP2" value="RX3" />
-        <ctl name="RX2 MIX1 INP2" value="RX3" />
-        <ctl name="CLASS_H_DSM MUX" value="DSM_HPHL_RX1" />
-        <ctl name="HPHL DAC Switch" value="1" />
-        <ctl name="HPHR DAC Switch" value="1" />
-        <ctl name="COMP1 Switch" value="1" />
-        <ctl name="HPHL Volume" value="20" />
-        <ctl name="HPHR Volume" value="20" />
-        <ctl name="RX1 Digital Volume" value="70" />
-        <ctl name="RX2 Digital Volume" value="70" />
-    </path>
-
-    <path name="voice-tty-full-headphones">
-        <ctl name="TTY Mode" value="FULL" />
-        <path name="tty-headphones" />
-    </path>
-
-    <path name="voice-tty-vco-headphones">
-        <ctl name="TTY Mode" value="VCO" />
-        <path name="tty-headphones" />
-    </path>
-
-    <path name="voice-tty-hco-handset">
-        <ctl name="TTY Mode" value="HCO" />
-        <path name="handset" />
-    </path>
-
-    <path name="voice-tty-full-headset-mic">
-        <path name="adc2" />
-        <ctl name="ADC2 Volume" value="8" />
-        <ctl name="DEC5 Volume" value="84" />
-        <ctl name="IIR1 INP1 MUX" value="ZERO" />
-    </path>
-
-    <path name="voice-tty-hco-headset-mic">
-        <path name="voice-tty-full-headset-mic" />
-    </path>
-
-    <path name="voice-tty-vco-handset-mic">
-        <path name="handset-mic" />
-    </path>
-
-    <path name="listen-handset-mic">
-        <ctl name="MADONOFF Switch" value="1" />
-        <ctl name="MAD Input" value="DMIC1" />
-    </path>
-
-    <!-- Added for ADSP testfwk -->
-    <path name="ADSP testfwk">
-        <ctl name="SLIMBUS_DL_HL Switch" value="1" />
-    </path>
-
-    <path name="voice-rx">
-    </path>
-
-    <path name="voice-tx">
-    </path>
-
-
-    <path name="deep-buffer-playback bt-sco-and-speaker">
-        <path name="deep-buffer-playback bt-sco" />
-        <path name="deep-buffer-playback" />
-    </path>
-
-    <path name="low-latency-playback bt-sco-and-speaker">
-        <path name="low-latency-playback bt-sco" />
-        <path name="low-latency-playback" />
-    </path>
-
-    <path name="deep-buffer-playback bt-sco-and-headphones">
-        <path name="deep-buffer-playback bt-sco" />
-        <path name="deep-buffer-playback" />
-    </path>
-
-    <path name="low-latency-playback bt-sco-and-headphones">
-        <path name="low-latency-playback bt-sco" />
-        <path name="low-latency-playback" />
-    </path>
-
-    <path name="deep-buffer-playback bt-sco-and-headphones-and-speaker">
-        <path name="deep-buffer-playback bt-sco" />
-        <path name="deep-buffer-playback" />
-    </path>
-
-    <path name="low-latency-playback bt-sco-and-headphones-and-speaker">
-        <path name="low-latency-playback bt-sco" />
-        <path name="low-latency-playback" />
-    </path>
-
-    <path name="voice-call bt-sco-and-speaker">
-        <path name="voice-call bt-sco" />
-    </path>
-
-    <path name="deep-buffer-playback bt-sco-wb-and-speaker">
-        <path name="deep-buffer-playback bt-sco-wb" />
-        <path name="deep-buffer-playback" />
-    </path>
-
-    <path name="low-latency-playback bt-sco-wb-and-speaker">
-        <path name="low-latency-playback bt-sco-wb" />
-        <path name="low-latency-playback" />
-    </path>
-
-    <path name="deep-buffer-playback bt-sco-wb-and-headphones">
-        <path name="deep-buffer-playback bt-sco-wb" />
-        <path name="deep-buffer-playback" />
-    </path>
-
-    <path name="low-latency-playback bt-sco-wb-and-headphones">
-        <path name="low-latency-playback bt-sco-wb" />
-        <path name="low-latency-playback" />
-    </path>
-
-    <path name="deep-buffer-playback bt-sco-wb-and-headphones-and-speaker">
-        <path name="deep-buffer-playback bt-sco-wb" />
-        <path name="deep-buffer-playback" />
-    </path>
-
-    <path name="low-latency-playback bt-sco-wb-and-headphones-and-speaker">
-        <path name="low-latency-playback bt-sco-wb" />
-        <path name="low-latency-playback" />
-    </path>
-
-    <path name="voice-call bt-sco-wb-and-speaker">
-        <path name="voice-call bt-sco-wb" />
-    </path>
-
-    <!-- voip loopback -->
-    <path name="voip-loopback">
-        <ctl name="SLIM_0_RX_Voice Mixer Voip" value="1" />
-        <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
-    </path>
-
-    <path name="voip-loopback bt-sco">
-        <ctl name="SEC_AUX_PCM_RX_Voice Mixer Voip" value="1" />
-        <ctl name="Voip_Tx Mixer SEC_AUX_PCM_TX_Voip" value="1" />
-    </path>
-
-    <path name="voip-loopback bt-sco-wb">
-        <ctl name="AUX PCM SampleRate" value="16000" />
-        <path name="voip-loopback bt-sco" />
-    </path>
-    <!--  voip loopback -->
-
-    <path name="unprocessed-stereo-mic">
-        <path name="voice-rec-dmic-ef" />
-        <ctl name="DEC7 Volume" value="76" />
-        <ctl name="DEC10 Volume" value="77" />
-    </path>
-
-    <path name="unprocessed-three-mic">
-        <path name="three-mic" />
-        <ctl name="DEC7 Volume" value="76" />
-        <ctl name="DEC10 Volume" value="77" />
-        <ctl name="DEC5 Volume" value="75" />
-    </path>
-
-    <path name="unprocessed-quad-mic">
-        <path name="quad-mic" />
-    </path>
-
-    <path name="unprocessed-headset-mic">
-        <path name="headset-mic" />
-    </path>
-
-</mixer>

From eb97aea4d9bf692c6af3922c5cb9cdee93330c7d Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Sun, 23 Apr 2017 14:02:28 -0700
Subject: [PATCH 061/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/BoardConfig.mk | 5 +++++
 androidia_64/device.mk      | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 56f522926..caa31d973 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -203,6 +203,11 @@ BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 else
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := squashfs
 endif
+##############################################################
+# Source: device/intel/mixins/groups/debug-phonedoctor/true/BoardConfig.mk
+##############################################################
+BOARD_SEPOLICY_M4DEFS += module_debug_phonedoctor=true
+BOARD_SEPOLICY_DIRS += device/intel/sepolicy/debug-phonedoctor
 # ------------------ END MIX-IN DEFINITIONS ------------------
 
 # Install Native Bridge
diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 53fc3cceb..301808d0e 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -429,6 +429,12 @@ CRASHLOGD_MODULE_MODEM ?= true
 CRASHLOGD_USE_SD := false
 endif
 ##############################################################
+# Source: device/intel/mixins/groups/debug-phonedoctor/true/product.mk
+##############################################################
+ifeq ($(MIXIN_DEBUG_LOGS),true)
+PRODUCT_PACKAGES += crash_package
+endif
+##############################################################
 # Source: device/intel/mixins/groups/debug-tools/true/product.mk
 ##############################################################
 PRODUCT_PACKAGES_DEBUG += \

From 646315466dc50aba93a6c093ff8aa1f1a4d57a1a Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Mon, 8 May 2017 05:14:59 +0530
Subject: [PATCH 062/427] Add flash.json to FLASHFILES

Jira : AIA-394
Test : Flashing through PFT works fine.
       Device boots to home screen.

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/AndroidBoard.mk |   6 +-
 androidia_64/BoardConfig.mk  |   1 +
 androidia_64/device.mk       |   2 +-
 androidia_64/flash.json      | 516 +++++++++++++++++++++++++++++++++++
 4 files changed, 523 insertions(+), 2 deletions(-)
 create mode 100644 androidia_64/flash.json

diff --git a/androidia_64/AndroidBoard.mk b/androidia_64/AndroidBoard.mk
index 2d3a2492a..042e3df7e 100644
--- a/androidia_64/AndroidBoard.mk
+++ b/androidia_64/AndroidBoard.mk
@@ -79,8 +79,12 @@ kernel: $(PRODUCT_OUT)/kernel
 ##############################################################
 # Source: device/intel/mixins/groups/boot-arch/android_ia/AndroidBoard.mk
 ##############################################################
+src_loader_file := $(PRODUCT_OUT)/efi/kernelflinger.efi
+tgt_loader_file := $(PRODUCT_OUT)/loader.efi
+
 define generate_flashfiles
-zip -qj $(1) $(2)
+$(shell cp $(src_loader_file) $(tgt_loader_file))
+zip -qj $(1) $(2) $(tgt_loader_file)
 endef
 
 ifneq ($(BUILD_NUMBER),)
diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index caa31d973..c70a12b91 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -142,6 +142,7 @@ BOARD_FLASHFILES += $(PRODUCT_OUT)/recovery.img
 BOARD_FLASHFILES += $(PRODUCT_OUT)/cache.img
 BOARD_FLASHFILES += $(PRODUCT_OUT)/config.img
 BOARD_FLASHFILES += $(PRODUCT_OUT)/vendor.img
+BOARD_FLASHFILES += $(TARGET_DEVICE_DIR)/flash.json
 ##############################################################
 # Source: device/intel/mixins/groups/audio/android_ia/BoardConfig.mk
 ##############################################################
diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 301808d0e..b796d9f74 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -291,7 +291,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 # Source: device/intel/mixins/groups/adb_net/true/product.mk
 ##############################################################
 # Enable Secure Debugging
-ifneq ($(TARGET_BUILD_VARIANT),eng)
+ifeq ($(TARGET_BUILD_VARIANT),user)
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.adb.secure=1
 endif
 ##############################################################
diff --git a/androidia_64/flash.json b/androidia_64/flash.json
new file mode 100644
index 000000000..4372fe34c
--- /dev/null
+++ b/androidia_64/flash.json
@@ -0,0 +1,516 @@
+{
+    "flash": {
+        "commands": [
+            {
+                "args": "flashing unlock", 
+                "description": "Set device state to unlocked", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "update"
+                ], 
+                "retry": 1, 
+                "timeout": 60000, 
+                "tool": "fastboot"
+            }, 
+            {
+                "args": "flash boot ${boot}", 
+                "description": "Flash boot partition", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "update"
+                ], 
+                "retry": 1, 
+                "timeout": 60000, 
+                "tool": "fastboot"
+            }, 
+            {
+                "args": "flash recovery ${recovery}", 
+                "description": "Flash recovery partition", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "update"
+                ], 
+                "retry": 1, 
+                "timeout": 60000, 
+                "tool": "fastboot"
+            }, 
+            {
+                "args": "flash factory ${factory}", 
+                "description": "Flash factory partition", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "update"
+                ], 
+                "retry": 1, 
+                "timeout": 60000, 
+                "tool": "fastboot"
+            }, 
+            {
+                "args": "flash system ${system}", 
+                "description": "Flash system partition", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "update"
+                ], 
+                "retry": 1, 
+                "timeout": 600000, 
+                "tool": "fastboot"
+            }, 
+            {
+                "args": "flash bootloader ${bootloader}", 
+                "description": "Flash bootloader partition", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "update"
+                ], 
+                "retry": 1, 
+                "timeout": 60000, 
+                "tool": "fastboot"
+            }, 
+            {
+                "args": "flash vendor ${vendor}", 
+                "description": "Flash bootloader partition", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "update"
+                ], 
+                "retry": 1, 
+                "timeout": 60000, 
+                "tool": "fastboot"
+            }, 
+            {
+                "args": "flashing lock", 
+                "description": "Set device state to locked", 
+                "group": "lock-device", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "update"
+                ], 
+                "retry": 1, 
+                "timeout": 60000, 
+                "tool": "fastboot"
+            }, 
+            {
+                "args": "continue", 
+                "description": "Boot to main OS", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "update"
+                ], 
+                "retry": 1, 
+                "timeout": 60000, 
+                "tool": "fastboot"
+            }, 
+            {
+                "description": "Leave time to the BIOS to clear the USB stack", 
+                "duration": 500, 
+                "restrict": [
+                    "blank"
+                ], 
+                "tool": "sleep"
+            }, 
+            {
+                "args": "flashing unlock", 
+                "description": "Set device state to unlocked", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "blank"
+                ], 
+                "retry": 1, 
+                "timeout": 60000, 
+                "tool": "fastboot"
+            }, 
+            {
+                "args": "flash gpt ${gpt}", 
+                "description": "Initialize the partition table", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "blank"
+                ], 
+                "retry": 1, 
+                "timeout": 60000, 
+                "tool": "fastboot"
+            }, 
+            {
+                "args": "erase misc", 
+                "description": "Erase misc partition", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "blank"
+                ], 
+                "retry": 1, 
+                "timeout": 60000, 
+                "tool": "fastboot"
+            }, 
+            {
+                "args": "erase persistent", 
+                "description": "Erase persistent partition", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "blank"
+                ], 
+                "retry": 1, 
+                "timeout": 60000, 
+                "tool": "fastboot"
+            }, 
+            {
+                "args": "erase metadata", 
+                "description": "Erase metadata partition", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "blank"
+                ], 
+                "retry": 1, 
+                "timeout": 60000, 
+                "tool": "fastboot"
+            }, 
+            {
+                "args": "format config", 
+                "description": "Format config partition", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "blank"
+                ], 
+                "retry": 1, 
+                "timeout": 60000, 
+                "tool": "fastboot"
+            }, 
+            {
+                "args": "format cache", 
+                "description": "Format cache partition", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "blank"
+                ], 
+                "retry": 1, 
+                "timeout": 60000, 
+                "tool": "fastboot"
+            }, 
+            {
+                "args": "format data", 
+                "description": "Format data partition", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "blank"
+                ], 
+                "retry": 1, 
+                "timeout": 60000, 
+                "tool": "fastboot"
+            }, 
+            {
+                "args": "flash vendor ${vendor}", 
+                "description": "Flash bootloader partition", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "blank"
+                ], 
+                "retry": 1, 
+                "timeout": 60000, 
+                "tool": "fastboot"
+            }, 
+            {
+                "args": "flash boot ${boot}", 
+                "description": "Flash boot partition", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "blank"
+                ], 
+                "retry": 1, 
+                "timeout": 60000, 
+                "tool": "fastboot"
+            }, 
+            {
+                "args": "flash recovery ${recovery}", 
+                "description": "Flash recovery partition", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "blank"
+                ], 
+                "retry": 1, 
+                "timeout": 60000, 
+                "tool": "fastboot"
+            }, 
+            {
+                "args": "flash factory ${factory}", 
+                "description": "Flash factory partition", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "blank"
+                ], 
+                "retry": 1, 
+                "timeout": 60000, 
+                "tool": "fastboot"
+            }, 
+            {
+                "args": "flash system ${system}", 
+                "description": "Flash system partition", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "blank"
+                ], 
+                "retry": 1, 
+                "timeout": 600000, 
+                "tool": "fastboot"
+            }, 
+            {
+                "args": "flash bootloader ${bootloader}", 
+                "description": "Flash bootloader partition", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "blank"
+                ], 
+                "retry": 1, 
+                "timeout": 60000, 
+                "tool": "fastboot"
+            }, 
+            {
+                "args": "flashing lock", 
+                "description": "Set device state to locked", 
+                "group": "lock-device", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "blank"
+                ], 
+                "retry": 1, 
+                "timeout": 60000, 
+                "tool": "fastboot"
+            }, 
+            {
+                "args": "continue", 
+                "description": "Boot to main OS", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "blank"
+                ], 
+                "retry": 1, 
+                "timeout": 60000, 
+                "tool": "fastboot"
+            } 
+        ], 
+        "configurations": {
+            "blank": {
+                "brief": "blank", 
+                "description": "erase and flash all partitions, all data will be lost.", 
+                "groupsState": {
+                    "check-battery": true, 
+                    "erase-efivars": true, 
+                    "lock-device": true
+                }, 
+                "name": "blank", 
+                "startState": "pos"
+            }, 
+            "update": {
+                "brief": "update", 
+                "default": true, 
+                "description": "update phone to new release", 
+                "groupsState": {
+                    "check-battery": true, 
+                    "lock-device": true
+                }, 
+                "name": "update", 
+                "startState": "pos"
+            }
+        }, 
+        "groups": {
+            "check-battery": {
+                "description": "Check battery level before sending fastboot command", 
+                "name": "Check battery level"
+            }, 
+            "erase-efivars": {
+                "description": "Erase all optional efi vars", 
+                "name": "Erase efi vars"
+            }, 
+            "lock-device": {
+                "description": "Put the device in locked state at the end of the flash procedure.", 
+                "name": "Lock the device (it implies the userdata partition wipe)"
+            }
+        }, 
+        "osplatform": "android", 
+        "parameters": {
+            "battery": {
+                "computedValue": "$1", 
+                "description": "Fetch battery", 
+                "filter": "battery-voltage:[\\s]*([0-9]+)mV", 
+                "name": "battery", 
+                "subCommand": {
+                    "args": "getvar battery-voltage", 
+                    "description": "Fetch battery", 
+                    "mandatory": true, 
+                    "retry": 1, 
+                    "timeout": 60000, 
+                    "tool": "fastboot"
+                }, 
+                "type": "variable", 
+                "value": 3500
+            }, 
+            "boot": {
+                "description": "boot.img", 
+                "name": "boot", 
+                "type": "file", 
+                "value": "boot.img"
+            }, 
+            "bootloader": {
+                "description": "bootloader", 
+                "name": "bootloader", 
+                "type": "file", 
+                "value": "bootloader"
+            }, 
+            "gpt": {
+                "description": "gpt.bin", 
+                "name": "gpt", 
+                "type": "file", 
+                "value": "gpt.bin"
+            }, 
+            "recovery": {
+                "description": "recovery.img", 
+                "name": "recovery", 
+                "type": "file", 
+                "value": "recovery.img"
+            }, 
+            "factory": {
+                "description": "factory.img", 
+                "name": "factory", 
+                "type": "file", 
+                "value": "factory.img"
+            }, 
+            "system": {
+                "description": "system.img", 
+                "name": "system", 
+                "type": "file", 
+                "value": "system.img"
+            },
+            "vendor": {
+                "description": "vendor.img", 
+                "name": "vendor", 
+                "type": "file", 
+                "value": "vendor.img"
+            }
+        }, 
+        "version": "3.0"
+    }
+}

From 61c7f2dd2a629deda34a260a3a159f1a54aded11 Mon Sep 17 00:00:00 2001
From: "Ai, Ting A" <ting.a.ai@intel.com>
Date: Thu, 27 Apr 2017 15:27:59 +0800
Subject: [PATCH 063/427] Enable default full disk encryption(FDE)

1.Add FDE config flag, and point default disk encryption via metadata partition
2.Update init to support FDE flow
3.Open some kernel config used by FDE feauture

Jira: None.
Test: 1.Data partition can be encryption and system can boot to home screen.

Signed-off-by: Ai, Ting A <ting.a.ai@intel.com>
---
 androidia_64/fstab                |  2 +-
 androidia_64/init.rc              | 13 ++++++++++++-
 kernel_config/kernel_64_defconfig | 12 ++++++------
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/androidia_64/fstab b/androidia_64/fstab
index 4014af5bf..e3ecb27e4 100644
--- a/androidia_64/fstab
+++ b/androidia_64/fstab
@@ -19,7 +19,7 @@
 
 /dev/block/mmcblk1p7	/system         ext4    ro															wait
 /dev/block/mmcblk1p8	/cache          ext4    noatime,nosuid,nodev,errors=panic                           wait,check
-/dev/block/mmcblk1p12	/data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable
+/dev/block/mmcblk1p12	/data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,forceencrypt=/dev/block/mmcblk1p6
 /dev/block/mmcblk1p3	/boot           emmc    defaults                                                    defaults
 /dev/block/mmcblk1p4	/recovery       emmc    defaults                                                    defaults
 /dev/block/mmcblk1p5	/misc           emmc    defaults                                                    defaults
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 70e8aea80..3a68788f7 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -3,7 +3,7 @@
 ##############################################################
 # Source: device/intel/mixins/groups/android_ia/default/init.rc
 ##############################################################
-on early-init
+on fs
     mount_all /fstab.${ro.hardware}
 
 on init
@@ -151,6 +151,17 @@ on early-boot
     chmod 0222 /sys/kernel/debug/tracing/trace_marker
     # tracefs is mounted after 1st access to it
     chmod 0755 /sys/kernel/debug/tracing
+
+# Source: device/intel/mixins/groups/disk-encryption/default/init.rc
+##############################################################
+# This _should_ be the very last thing that happens in
+# the device's 'on post-fs-data' sections.  Since we compose
+# init scripts from various snippets with mixins, we need to
+# ensure this is included last in the mixin-update by listing
+# disk-encryption as LAST in the mixin spec file.
+on post-fs-data
+    setprop vold.post_fs_data_done 1
+
 ##############################################################
 # Source: device/intel/mixins/groups/storage/sdcard-mmc0-usb-sd/init.rc
 ##############################################################
diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index eb12f5e46..757a9aa56 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -6679,9 +6679,9 @@ CONFIG_X86_DEBUG_FPU=y
 #
 # Security options
 #
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
-# CONFIG_SECURITYFS is not set
+CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
 CONFIG_LSM_MMAP_MIN_ADDR=65536
@@ -6766,8 +6766,8 @@ CONFIG_CRYPTO_XCBC=m
 # Digest
 #
 CONFIG_CRYPTO_CRC32C=y
-# CONFIG_CRYPTO_CRC32C_INTEL is not set
-# CONFIG_CRYPTO_CRC32 is not set
+CONFIG_CRYPTO_CRC32C_INTEL=y
+CONFIG_CRYPTO_CRC32=y
 # CONFIG_CRYPTO_CRC32_PCLMUL is not set
 # CONFIG_CRYPTO_CRCT10DIF is not set
 CONFIG_CRYPTO_GHASH=m
@@ -6798,8 +6798,8 @@ CONFIG_CRYPTO_WP512=m
 # Ciphers
 #
 CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_AES_X86_64=m
-CONFIG_CRYPTO_AES_NI_INTEL=m
+CONFIG_CRYPTO_AES_X86_64=y
+CONFIG_CRYPTO_AES_NI_INTEL=y
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=y
 CONFIG_CRYPTO_BLOWFISH=m

From 03e71e309c3226866aee1e11519e9cb238069f05 Mon Sep 17 00:00:00 2001
From: Kishore Kadiyala <kishore.kadiyala@intel.com>
Date: Wed, 10 May 2017 10:21:01 +0530
Subject: [PATCH 064/427] MIXIN: Enable the factory partition

Enable the factory partition in Android_IA build

The Contents to be part of factory.img is not yet updated
    and the img generated is an empty image

Jira :  AIA-397
Test :  The build should generate a factory.img
	The CI test bench flashing should work

Change-Id: I64d66e4ffe61657f900e928c8f1ce555ea8e47f8
Signed-off-by: Kishore Kadiyala <kishore.kadiyala@intel.com>
---
 androidia_64/mixins.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index a08f86e59..c754b0827 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -30,6 +30,7 @@ usb: host+acc
 lights: true
 config-partition: enabled
 vendor-partition: true(partition_size=1500,partition_name=android_vendor)
+factory-partition: true
 debug-crashlogd: true
 debug-logs: true
 debug-phonedoctor: true

From 8e8fdda3b9cc4b56ede15825d543ac05e44381fb Mon Sep 17 00:00:00 2001
From: Kishore Kadiyala <kishore.kadiyala@intel.com>
Date: Thu, 11 May 2017 09:12:04 +0530
Subject: [PATCH 065/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Change-Id: Ibf39d70a49e5140802134f2cc6c72747380f3572
Signed-off-by: Kishore Kadiyala <kishore.kadiyala@intel.com>
---
 androidia_64/AndroidBoard.mk | 25 ++++++++++++
 androidia_64/BoardConfig.mk  | 11 ++++++
 androidia_64/fstab           |  4 ++
 androidia_64/gpt.ini         | 11 ++++++
 androidia_64/init.rc         | 77 +++++++++++++++++++++++++++---------
 androidia_64/installer.cmd   |  1 +
 6 files changed, 111 insertions(+), 18 deletions(-)

diff --git a/androidia_64/AndroidBoard.mk b/androidia_64/AndroidBoard.mk
index 042e3df7e..bd8fa4360 100644
--- a/androidia_64/AndroidBoard.mk
+++ b/androidia_64/AndroidBoard.mk
@@ -266,4 +266,29 @@ INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_CONFIGIMAGE_TARGET)
 # This is to ensure that kernel modules are installed before
 # vendor.img is generated.
 $(PRODUCT_OUT)/vendor.img : $(KERNEL_MODULES_INSTALL)
+##############################################################
+# Source: device/intel/mixins/groups/factory-partition/true/AndroidBoard.mk
+##############################################################
+INSTALLED_FACTORYIMAGE_TARGET := $(PRODUCT_OUT)/factory.img
+#selinux_fc := $(TARGET_ROOT_OUT)/file_contexts
+
+#$(INSTALLED_FACTORYIMAGE_TARGET) : PRIVATE_SELINUX_FC := $(selinux_fc)
+#$(INSTALLED_FACTORYIMAGE_TARGET) : $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK) $(selinux_fc)
+$(INSTALLED_FACTORYIMAGE_TARGET) : $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK)
+	$(call pretty,"Target factory fs image: $(INSTALLED_FACTORYIMAGE_TARGET)")
+	@mkdir -p $(PRODUCT_OUT)/factory
+	$(hide)	$(MKEXTUSERIMG) -s \
+		$(PRODUCT_OUT)/factory \
+		$(PRODUCT_OUT)/factory.img \
+		ext4 \
+		factory \
+		$(BOARD_FACTORYIMAGE_PARTITION_SIZE)
+#		$(PRIVATE_SELINUX_FC)
+
+#INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_FACTORYIMAGE_TARGET)
+
+#selinux_fc :=
+
+.PHONY: factoryimage
+factoryimage: $(INSTALLED_FACTORYIMAGE_TARGET)
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index c70a12b91..68ab472fc 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -142,6 +142,7 @@ BOARD_FLASHFILES += $(PRODUCT_OUT)/recovery.img
 BOARD_FLASHFILES += $(PRODUCT_OUT)/cache.img
 BOARD_FLASHFILES += $(PRODUCT_OUT)/config.img
 BOARD_FLASHFILES += $(PRODUCT_OUT)/vendor.img
+BOARD_FLASHFILES += $(PRODUCT_OUT)/factory.img
 BOARD_FLASHFILES += $(TARGET_DEVICE_DIR)/flash.json
 ##############################################################
 # Source: device/intel/mixins/groups/audio/android_ia/BoardConfig.mk
@@ -149,6 +150,10 @@ BOARD_FLASHFILES += $(TARGET_DEVICE_DIR)/flash.json
 BOARD_USES_ALSA_AUDIO := true
 BOARD_USES_TINY_ALSA_AUDIO := true
 BOARD_USES_GENERIC_AUDIO ?= false
+# Audio HAL selection Flag default setting.
+#  INTEL_AUDIO_HAL:= audio     -> baseline HAL
+#  INTEL_AUDIO_HAL:= audio_pfw -> PFW-based HAL
+INTEL_AUDIO_HAL := audio
 ##############################################################
 # Source: device/intel/mixins/groups/wlan/iwlwifi/BoardConfig.mk
 ##############################################################
@@ -205,6 +210,12 @@ else
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := squashfs
 endif
 ##############################################################
+# Source: device/intel/mixins/groups/factory-partition/true/BoardConfig.mk
+##############################################################
+BOARD_FACTORYIMAGE_PARTITION_SIZE := 10485760
+BOARD_SEPOLICY_DIRS += device/intel/sepolicy/factory-partition
+BOARD_SEPOLICY_M4DEFS += module_factory_partition=true
+##############################################################
 # Source: device/intel/mixins/groups/debug-phonedoctor/true/BoardConfig.mk
 ##############################################################
 BOARD_SEPOLICY_M4DEFS += module_debug_phonedoctor=true
diff --git a/androidia_64/fstab b/androidia_64/fstab
index e3ecb27e4..4dded502d 100644
--- a/androidia_64/fstab
+++ b/androidia_64/fstab
@@ -38,4 +38,8 @@
 # If the vendor image is not used,
 # following line should be commented with the related ones in BoardConfig.mk
 /dev/block/mmcblk1p10	/vendor         ext4    ro                                         wait,verify=/dev/block/mmcblk1p6
+##############################################################
+# Source: device/intel/mixins/groups/factory-partition/true/fstab
+##############################################################
+/dev/block/mmcblk1p13      /factory        ext4    rw                                         wait
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/gpt.ini b/androidia_64/gpt.ini
index 1133c42e4..389b93736 100644
--- a/androidia_64/gpt.ini
+++ b/androidia_64/gpt.ini
@@ -80,4 +80,15 @@ label = android_config
 len = 8
 type = linux
 guid = bd59408b-4514-490d-bf12-9878d963f378
+##############################################################
+# Source: device/intel/mixins/groups/factory-partition/true/gpt.ini
+##############################################################
+[base]
+partitions += factory
+
+[partition.factory]
+label = android_factory
+len = 10
+type = linux
+guid = 8f68cc74-c5e5-48da-be91-a0c8c15e9c80
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 3a68788f7..2d15feb42 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -151,17 +151,6 @@ on early-boot
     chmod 0222 /sys/kernel/debug/tracing/trace_marker
     # tracefs is mounted after 1st access to it
     chmod 0755 /sys/kernel/debug/tracing
-
-# Source: device/intel/mixins/groups/disk-encryption/default/init.rc
-##############################################################
-# This _should_ be the very last thing that happens in
-# the device's 'on post-fs-data' sections.  Since we compose
-# init scripts from various snippets with mixins, we need to
-# ensure this is included last in the mixin-update by listing
-# disk-encryption as LAST in the mixin spec file.
-on post-fs-data
-    setprop vold.post_fs_data_done 1
-
 ##############################################################
 # Source: device/intel/mixins/groups/storage/sdcard-mmc0-usb-sd/init.rc
 ##############################################################
@@ -182,16 +171,22 @@ on boot
     # Add standard gadget entries
     mount configfs none /config
     mkdir /config/usb_gadget/g1 0770 shell shell
-    write /config/usb_gadget/g1/idVendor 0x18d1
-    mkdir /config/usb_gadget/g1/strings/0x409 0770 shell shell
+    write /config/usb_gadget/g1/bcdDevice 0x0
+    write /config/usb_gadget/g1/bcdUSB 0x210
+    mkdir /config/usb_gadget/g1/strings/0x409 0770
     write /config/usb_gadget/g1/strings/0x409/serialnumber ${ro.serialno}
     write /config/usb_gadget/g1/strings/0x409/manufacturer ${ro.product.manufacturer}
     write /config/usb_gadget/g1/strings/0x409/product ${ro.product.model}
-    mkdir /config/usb_gadget/g1/functions/ffs.adb 0770 shell shell
-    mkdir /config/usb_gadget/g1/configs/b.1 0770 shell shell
-    mkdir /config/usb_gadget/g1/configs/b.1/strings/0x409 0770 shell shell
-    write /config/usb_gadget/g1/configs/b.1/MaxPower 500
+    mkdir /config/usb_gadget/g1/functions/ffs.adb
+    mkdir /config/usb_gadget/g1/functions/mtp.gs0
+    mkdir /config/usb_gadget/g1/functions/ptp.gs1
+    mkdir /config/usb_gadget/g1/configs/b.1
+    mkdir /config/usb_gadget/g1/configs/b.1/strings/0x409
     symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f1
+    write /config/usb_gadget/g1/os_desc/qw_sign "MSFT100"
+    write /config/usb_gadget/g1/os_desc/b_vendor_code 0x1
+    write /config/usb_gadget/g1/configs/b.1/MaxPower 500
+    symlink /config/usb_gadget/g1/configs/b.1 /config/usb_gadget/g1/os_desc/b.1
 
     # Create adb+ffs gadget function
     mkdir /dev/usb-ffs 0770 shell shell
@@ -201,7 +196,6 @@ on boot
     # Enable USB Gadget Configfs interface and make DWC3 the controller
     setprop sys.usb.configfs 1
     setprop sys.usb.controller dwc3.0.auto
-    write /config/usb_gadget/g1/UDC dwc3.0.auto
 
     # Allow auto-suspend of USB gadget devices
     write /sys/devices/pci0000\:00/0000\:00\:15.1/power/control auto
@@ -215,6 +209,30 @@ on property:sys.usb.config=none && property:sys.usb.configfs=1
 
 on property:init.svc.adbd=stopped
     setprop sys.usb.ffs.ready 0
+
+on property:sys.usb.config=mtp && property:sys.usb.configfs=1
+    write /config/usb_gadget/g1/functions/mtp.gs0/os_desc/interface.MTP/compatible_id "MTP"
+    # write /config/usb_gadget/g1/os_desc/use 1
+    write /config/usb_gadget/g1/idVendor 0x8087
+    write /config/usb_gadget/g1/idProduct 0x0a5e
+
+on property:sys.usb.config=mtp,adb && property:sys.usb.configfs=1
+    write /config/usb_gadget/g1/functions/mtp.gs0/os_desc/interface.MTP/compatible_id "MTP"
+    # write /config/usb_gadget/g1/os_desc/use 1
+    write /config/usb_gadget/g1/idVendor 0x8087
+    write /config/usb_gadget/g1/idProduct 0x0a5f
+
+on property:sys.usb.config=ptp && property:sys.usb.configfs=1
+    write /config/usb_gadget/g1/functions/ptp.gs1/os_desc/interface.MTP/compatible_id "PTP"
+    # write /config/usb_gadget/g1/os_desc/use 1
+    write /config/usb_gadget/g1/idVendor 0x8087
+    write /config/usb_gadget/g1/idProduct 0x0a60
+
+on property:sys.usb.config=ptp,adb && property:sys.usb.configfs=1
+    write /config/usb_gadget/g1/functions/mtp.gs0/os_desc/interface.MTP/compatible_id "PTP"
+    # write /config/usb_gadget/g1/os_desc/use 1
+    write /config/usb_gadget/g1/idVendor 0x8087
+    write /config/usb_gadget/g1/idProduct 0x0a61
 ##############################################################
 # Source: device/intel/mixins/groups/adb_net/true/init.rc
 ##############################################################
@@ -382,6 +400,19 @@ on charger
 on post-fs
     restorecon_recursive /config
 ##############################################################
+# Source: device/intel/mixins/groups/factory-partition/true/init.rc
+##############################################################
+# init.rc for telephony services specific to flashless platforms using /factory partition
+
+on init
+# Used as mounting point for factory partition.
+# Calibration files configuring IMEI and RF calibration will also be stored on this partition.
+    mkdir /factory 0770 system system
+
+on post-fs
+    restorecon_recursive /factory
+    trigger post-fs-factory
+##############################################################
 # Source: device/intel/mixins/groups/debug-logs/true/init.rc
 ##############################################################
 import /init.logs.rc
@@ -393,6 +424,16 @@ import /init.crashlogd.rc
 # Source: device/intel/mixins/groups/debug-kernel/default/init.rc
 ##############################################################
 import /init.kernel.rc
+##############################################################
+# Source: device/intel/mixins/groups/disk-encryption/default/init.rc
+##############################################################
+# This _should_ be the very last thing that happens in
+# the device's 'on post-fs-data' sections.  Since we compose
+# init scripts from various snippets with mixins, we need to
+# ensure this is included last in the mixin-update by listing
+# disk-encryption as LAST in the mixin spec file.
+on post-fs-data
+    setprop vold.post_fs_data_done 1
 # ------------------ END MIX-IN DEFINITIONS ------------------
 # Enable native bridge for target executables
 on early-init
diff --git a/androidia_64/installer.cmd b/androidia_64/installer.cmd
index c1f87d80e..48a3937e8 100644
--- a/androidia_64/installer.cmd
+++ b/androidia_64/installer.cmd
@@ -15,6 +15,7 @@ flash vendor vendor.img
 flash boot boot.img
 flash recovery recovery.img
 flash system system.img
+flash factory factory.img
 flash bootloader bootloader
 flashing lock
 continue

From 794a9d198c31f014bde6e8cf7d936e7b047f10f6 Mon Sep 17 00:00:00 2001
From: Sebastien Guiriec <sebastien.guiriec@intel.com>
Date: Thu, 4 May 2017 12:40:25 +0200
Subject: [PATCH 066/427] Switch to XML Audio policy format.

Inside N release we can use XML or legacy .conf format for Audio
policy. This patch is switching to XML format as O release supports
only XML format.

Jira: None

Test: Tested on Intel NUC. Otherwise it is just translation from
.conf to XML format.

Signed-off-by: Sebastien Guiriec <sebastien.guiriec@intel.com>
---
 androidia_64/BoardConfig.mk                   |   2 +
 common/audio/AndroidBoard.mk                  |  81 +++++++-
 common/audio/PCH-CX20724/audio_policy.conf    |  76 --------
 .../policy/audio_policy_configuration.xml     | 120 ++++++++++++
 common/audio/default/audio_policy.conf        |  76 --------
 .../a2dp_audio_policy_configuration.xml       |  44 +++++
 .../policy/audio_policy_configuration.xml     | 120 ++++++++++++
 .../default/policy/audio_policy_volumes.xml   | 179 ++++++++++++++++++
 .../default/policy/default_volume_tables.xml  |  70 +++++++
 .../r_submix_audio_policy_configuration.xml   |  47 +++++
 .../policy/usb_audio_policy_configuration.xml |  43 +++++
 11 files changed, 699 insertions(+), 159 deletions(-)
 delete mode 100644 common/audio/PCH-CX20724/audio_policy.conf
 create mode 100644 common/audio/PCH-CX20724/policy/audio_policy_configuration.xml
 delete mode 100644 common/audio/default/audio_policy.conf
 create mode 100644 common/audio/default/policy/a2dp_audio_policy_configuration.xml
 create mode 100644 common/audio/default/policy/audio_policy_configuration.xml
 create mode 100644 common/audio/default/policy/audio_policy_volumes.xml
 create mode 100644 common/audio/default/policy/default_volume_tables.xml
 create mode 100644 common/audio/default/policy/r_submix_audio_policy_configuration.xml
 create mode 100644 common/audio/default/policy/usb_audio_policy_configuration.xml

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 68ab472fc..dc2ffc9e5 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -154,6 +154,8 @@ BOARD_USES_GENERIC_AUDIO ?= false
 #  INTEL_AUDIO_HAL:= audio     -> baseline HAL
 #  INTEL_AUDIO_HAL:= audio_pfw -> PFW-based HAL
 INTEL_AUDIO_HAL := audio
+# Use XML audio policy configuration file
+USE_XML_AUDIO_POLICY_CONF ?= 1
 ##############################################################
 # Source: device/intel/mixins/groups/wlan/iwlwifi/BoardConfig.mk
 ##############################################################
diff --git a/common/audio/AndroidBoard.mk b/common/audio/AndroidBoard.mk
index dfa2df805..222afa2fb 100644
--- a/common/audio/AndroidBoard.mk
+++ b/common/audio/AndroidBoard.mk
@@ -7,33 +7,100 @@ AUDIO_HARDWARE := default
 #AUDIO_HARDWARE := nuc-skull-canyon
 
 ###########################################
-# Audio stack Package
+# Audio stack Packages
 ###########################################
 include $(CLEAR_VARS)
 LOCAL_MODULE := audio_configuration_files
 LOCAL_MODULE_TAGS := optional
 LOCAL_REQUIRED_MODULES := \
-    audio_policy.conf \
-    mixer_paths_0.xml
+    audio_policy_configuration_files \
+    audio_settings_configuration_files
 
 include $(BUILD_PHONY_PACKAGE)
 
 ###########################################
-# Audio Policy Configuration file
+# Audio Policy Configuration files
 ###########################################
 include $(CLEAR_VARS)
-LOCAL_MODULE := audio_policy.conf
+LOCAL_MODULE := audio_policy_configuration_files
+LOCAL_MODULE_TAGS := optional
+LOCAL_REQUIRED_MODULES := \
+    a2dp_audio_policy_configuration.xml \
+    r_submix_audio_policy_configuration.xml \
+    usb_audio_policy_configuration.xml \
+    audio_policy_volumes.xml \
+    default_volume_tables.xml \
+    audio_policy_configuration.xml
+
+include $(BUILD_PHONY_PACKAGE)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := a2dp_audio_policy_configuration.xml
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
+LOCAL_SRC_FILES := default/policy/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := audio_policy_volumes.xml
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
+LOCAL_SRC_FILES := default/policy/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := default_volume_tables.xml
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
+LOCAL_SRC_FILES := default/policy/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := r_submix_audio_policy_configuration.xml
 LOCAL_MODULE_OWNER := intel
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
-LOCAL_SRC_FILES := $(AUDIO_HARDWARE)/audio_policy.conf
+LOCAL_SRC_FILES := default/policy/$(LOCAL_MODULE)
 include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := usb_audio_policy_configuration.xml
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
+LOCAL_SRC_FILES := default/policy/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := audio_policy_configuration.xml
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
+LOCAL_SRC_FILES := $(AUDIO_HARDWARE)/policy/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
 ###########################################
 
 ###########################################
-# Audio HAL Custom configuration file
+# Audio HAL Custom configuration files
 ###########################################
+include $(CLEAR_VARS)
+LOCAL_MODULE := audio_settings_configuration_files
+LOCAL_MODULE_TAGS := optional
+LOCAL_REQUIRED_MODULES := \
+    mixer_paths_0.xml
+
+include $(BUILD_PHONY_PACKAGE)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := mixer_paths_0.xml
 LOCAL_MODULE_OWNER := intel
diff --git a/common/audio/PCH-CX20724/audio_policy.conf b/common/audio/PCH-CX20724/audio_policy.conf
deleted file mode 100644
index 23d901e9a..000000000
--- a/common/audio/PCH-CX20724/audio_policy.conf
+++ /dev/null
@@ -1,76 +0,0 @@
-# Global configuration section: lists input and output devices always present on the device
-# as well as the output device selected by default.
-# Devices are designated by a string that corresponds to the enum in audio.h
-
-global_configuration {
-  attached_output_devices AUDIO_DEVICE_OUT_SPEAKER
-  default_output_device AUDIO_DEVICE_OUT_SPEAKER
-  attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC
-}
-
-# audio hardware module section: contains descriptors for all audio hw modules present on the
-# device. Each hw module node is named after the corresponding hw module library base name.
-# For instance, "primary" corresponds to audio.primary.<device>.so.
-# The "primary" module is mandatory and must include at least one output with
-# AUDIO_OUTPUT_FLAG_PRIMARY flag.
-# Each module descriptor contains one or more output profile descriptors and zero or more
-# input profile descriptors. Each profile lists all the parameters supported by a given output
-# or input stream category.
-# The "channel_masks", "formats", "devices" and "flags" are specified using strings corresponding
-# to enums in audio.h and audio_policy.h. They are concatenated by use of "|" without space or "\n".
-
-audio_hw_modules {
-  primary {
-    outputs {
-      primary {
-        sampling_rates 48000
-        channel_masks AUDIO_CHANNEL_OUT_STEREO
-        formats AUDIO_FORMAT_PCM_16_BIT
-        devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE
-        flags AUDIO_OUTPUT_FLAG_PRIMARY
-      }
-    }
-    inputs {
-      primary {
-        sampling_rates 8000|11025|16000|22050|24000|32000|44100|48000
-        channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO
-        formats AUDIO_FORMAT_PCM_16_BIT
-        devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_WIRED_HEADSET
-      }
-    }
-  }
-  a2dp {
-    outputs {
-      a2dp {
-        sampling_rates 44100
-        channel_masks AUDIO_CHANNEL_OUT_STEREO
-        formats AUDIO_FORMAT_PCM_16_BIT
-        devices AUDIO_DEVICE_OUT_ALL_A2DP
-      }
-    }
-  }
-  usb {
-    outputs {
-      usb_accessory {
-        sampling_rates 44100
-        channel_masks AUDIO_CHANNEL_OUT_STEREO
-        formats AUDIO_FORMAT_PCM_16_BIT
-        devices AUDIO_DEVICE_OUT_USB_ACCESSORY
-      }
-      usb_device {
-        sampling_rates dynamic
-        channel_masks dynamic
-        formats dynamic
-        devices AUDIO_DEVICE_OUT_USB_DEVICE
-      }
-    }
-    inputs {
-      usb_device {
-        sampling_rates dynamic
-        channel_masks dynamic
-        formats dynamic
-        devices AUDIO_DEVICE_IN_USB_DEVICE
-      }
-    }
-  }
-}
diff --git a/common/audio/PCH-CX20724/policy/audio_policy_configuration.xml b/common/audio/PCH-CX20724/policy/audio_policy_configuration.xml
new file mode 100644
index 000000000..cceaa04f8
--- /dev/null
+++ b/common/audio/PCH-CX20724/policy/audio_policy_configuration.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Copyright (C) 2017 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.
+-->
+
+<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+    <!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
+
+    <!-- Modules section:
+        There is one section per audio HW module present on the platform.
+        Each module section will contains two mandatory tags for audio HAL “halVersion” and “name”.
+        The module names are the same as in current .conf file:
+                “primary”, “A2DP”, “remote_submix”, “USB”
+        Each module will contain the following sections:
+        “devicePorts”: a list of device descriptors for all input and output devices accessible via this
+        module.
+        This contains both permanently attached devices and removable devices.
+        “mixPorts”: listing all output and input streams exposed by the audio HAL
+        “routes”: list of possible connections between input and output devices or between stream and
+        devices.
+            "route": is defined by an attribute:
+                -"type": <mux|mix> means all sources are mutual exclusive (mux) or can be mixed (mix)
+                -"sink": the sink involved in this route
+                -"sources": all the sources than can be connected to the sink via vis route
+        “attachedDevices”: permanently attached devices.
+        The attachedDevices section is a list of devices names. The names correspond to device names
+        defined in <devicePorts> section.
+        “defaultOutputDevice”: device to be used by default when no policy rule applies
+    -->
+    <modules>
+        <!-- Primary Audio HAL -->
+        <module name="primary" halVersion="3.0">
+            <attachedDevices>
+                <item>Speaker</item>
+                <item>Built-In Mic</item>
+            </attachedDevices>
+            <defaultOutputDevice>Speaker</defaultOutputDevice>
+            <mixPorts>
+                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
+                <mixPort name="primary input" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+                </mixPort>
+            </mixPorts>
+            <devicePorts>
+                <!-- Output devices declaration, i.e. Sink DEVICE PORT -->
+                <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </devicePort>
+                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </devicePort>
+                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </devicePort>
+
+                <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+                </devicePort>
+                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+                </devicePort>
+
+            </devicePorts>
+            <!-- route declaration, i.e. list all available sources for a given sink -->
+            <routes>
+                <route type="mix" sink="Speaker"
+                       sources="primary output"/>
+                <route type="mix" sink="Wired Headset"
+                       sources="primary output"/>
+                <route type="mix" sink="Wired Headphones"
+                       sources="primary output"/>
+                <route type="mix" sink="primary input"
+                       sources="Built-In Mic,Wired Headset Mic"/>
+            </routes>
+
+        </module>
+
+        <!-- A2dp Audio HAL -->
+        <xi:include href="a2dp_audio_policy_configuration.xml"/>
+
+        <!-- Usb Audio HAL -->
+        <xi:include href="usb_audio_policy_configuration.xml"/>
+
+        <!-- Remote Submix Audio HAL -->
+        <xi:include href="r_submix_audio_policy_configuration.xml"/>
+
+    </modules>
+    <!-- End of Modules section -->
+
+    <!-- Volume section -->
+
+    <xi:include href="audio_policy_volumes.xml"/>
+    <xi:include href="default_volume_tables.xml"/>
+
+    <!-- End of Volume section -->
+
+</audioPolicyConfiguration>
diff --git a/common/audio/default/audio_policy.conf b/common/audio/default/audio_policy.conf
deleted file mode 100644
index 23d901e9a..000000000
--- a/common/audio/default/audio_policy.conf
+++ /dev/null
@@ -1,76 +0,0 @@
-# Global configuration section: lists input and output devices always present on the device
-# as well as the output device selected by default.
-# Devices are designated by a string that corresponds to the enum in audio.h
-
-global_configuration {
-  attached_output_devices AUDIO_DEVICE_OUT_SPEAKER
-  default_output_device AUDIO_DEVICE_OUT_SPEAKER
-  attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC
-}
-
-# audio hardware module section: contains descriptors for all audio hw modules present on the
-# device. Each hw module node is named after the corresponding hw module library base name.
-# For instance, "primary" corresponds to audio.primary.<device>.so.
-# The "primary" module is mandatory and must include at least one output with
-# AUDIO_OUTPUT_FLAG_PRIMARY flag.
-# Each module descriptor contains one or more output profile descriptors and zero or more
-# input profile descriptors. Each profile lists all the parameters supported by a given output
-# or input stream category.
-# The "channel_masks", "formats", "devices" and "flags" are specified using strings corresponding
-# to enums in audio.h and audio_policy.h. They are concatenated by use of "|" without space or "\n".
-
-audio_hw_modules {
-  primary {
-    outputs {
-      primary {
-        sampling_rates 48000
-        channel_masks AUDIO_CHANNEL_OUT_STEREO
-        formats AUDIO_FORMAT_PCM_16_BIT
-        devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE
-        flags AUDIO_OUTPUT_FLAG_PRIMARY
-      }
-    }
-    inputs {
-      primary {
-        sampling_rates 8000|11025|16000|22050|24000|32000|44100|48000
-        channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO
-        formats AUDIO_FORMAT_PCM_16_BIT
-        devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_WIRED_HEADSET
-      }
-    }
-  }
-  a2dp {
-    outputs {
-      a2dp {
-        sampling_rates 44100
-        channel_masks AUDIO_CHANNEL_OUT_STEREO
-        formats AUDIO_FORMAT_PCM_16_BIT
-        devices AUDIO_DEVICE_OUT_ALL_A2DP
-      }
-    }
-  }
-  usb {
-    outputs {
-      usb_accessory {
-        sampling_rates 44100
-        channel_masks AUDIO_CHANNEL_OUT_STEREO
-        formats AUDIO_FORMAT_PCM_16_BIT
-        devices AUDIO_DEVICE_OUT_USB_ACCESSORY
-      }
-      usb_device {
-        sampling_rates dynamic
-        channel_masks dynamic
-        formats dynamic
-        devices AUDIO_DEVICE_OUT_USB_DEVICE
-      }
-    }
-    inputs {
-      usb_device {
-        sampling_rates dynamic
-        channel_masks dynamic
-        formats dynamic
-        devices AUDIO_DEVICE_IN_USB_DEVICE
-      }
-    }
-  }
-}
diff --git a/common/audio/default/policy/a2dp_audio_policy_configuration.xml b/common/audio/default/policy/a2dp_audio_policy_configuration.xml
new file mode 100644
index 000000000..7bcab5cdd
--- /dev/null
+++ b/common/audio/default/policy/a2dp_audio_policy_configuration.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- A2dp Audio HAL Audio Policy Configuration file -->
+<module name="a2dp" halVersion="2.0">
+    <mixPorts>
+        <mixPort name="a2dp output" role="source"/>
+        <mixPort name="a2dp input" role="sink">
+            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                     samplingRates="44100,48000"
+                     channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+        </mixPort>
+    </mixPorts>
+    <devicePorts>
+        <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink">
+            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                     samplingRates="44100"
+                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+        </devicePort>
+        <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink">
+            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                     samplingRates="44100"
+                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+        </devicePort>
+        <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink">
+            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                     samplingRates="44100"
+                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+        </devicePort>
+        <devicePort tagName="BT A2DP In" type="AUDIO_DEVICE_IN_BLUETOOTH_A2DP" role="source">
+            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                     samplingRates="44100,48000"
+                     channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+        </devicePort>
+    </devicePorts>
+    <routes>
+        <route type="mix" sink="BT A2DP Out"
+               sources="a2dp output"/>
+        <route type="mix" sink="BT A2DP Headphones"
+               sources="a2dp output"/>
+        <route type="mix" sink="BT A2DP Speaker"
+               sources="a2dp output"/>
+        <route type="mix" sink="a2dp input"
+               sources="BT A2DP In"/>
+    </routes>
+</module>
diff --git a/common/audio/default/policy/audio_policy_configuration.xml b/common/audio/default/policy/audio_policy_configuration.xml
new file mode 100644
index 000000000..cceaa04f8
--- /dev/null
+++ b/common/audio/default/policy/audio_policy_configuration.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Copyright (C) 2017 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.
+-->
+
+<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+    <!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
+
+    <!-- Modules section:
+        There is one section per audio HW module present on the platform.
+        Each module section will contains two mandatory tags for audio HAL “halVersion” and “name”.
+        The module names are the same as in current .conf file:
+                “primary”, “A2DP”, “remote_submix”, “USB”
+        Each module will contain the following sections:
+        “devicePorts”: a list of device descriptors for all input and output devices accessible via this
+        module.
+        This contains both permanently attached devices and removable devices.
+        “mixPorts”: listing all output and input streams exposed by the audio HAL
+        “routes”: list of possible connections between input and output devices or between stream and
+        devices.
+            "route": is defined by an attribute:
+                -"type": <mux|mix> means all sources are mutual exclusive (mux) or can be mixed (mix)
+                -"sink": the sink involved in this route
+                -"sources": all the sources than can be connected to the sink via vis route
+        “attachedDevices”: permanently attached devices.
+        The attachedDevices section is a list of devices names. The names correspond to device names
+        defined in <devicePorts> section.
+        “defaultOutputDevice”: device to be used by default when no policy rule applies
+    -->
+    <modules>
+        <!-- Primary Audio HAL -->
+        <module name="primary" halVersion="3.0">
+            <attachedDevices>
+                <item>Speaker</item>
+                <item>Built-In Mic</item>
+            </attachedDevices>
+            <defaultOutputDevice>Speaker</defaultOutputDevice>
+            <mixPorts>
+                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
+                <mixPort name="primary input" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+                </mixPort>
+            </mixPorts>
+            <devicePorts>
+                <!-- Output devices declaration, i.e. Sink DEVICE PORT -->
+                <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </devicePort>
+                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </devicePort>
+                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </devicePort>
+
+                <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+                </devicePort>
+                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+                </devicePort>
+
+            </devicePorts>
+            <!-- route declaration, i.e. list all available sources for a given sink -->
+            <routes>
+                <route type="mix" sink="Speaker"
+                       sources="primary output"/>
+                <route type="mix" sink="Wired Headset"
+                       sources="primary output"/>
+                <route type="mix" sink="Wired Headphones"
+                       sources="primary output"/>
+                <route type="mix" sink="primary input"
+                       sources="Built-In Mic,Wired Headset Mic"/>
+            </routes>
+
+        </module>
+
+        <!-- A2dp Audio HAL -->
+        <xi:include href="a2dp_audio_policy_configuration.xml"/>
+
+        <!-- Usb Audio HAL -->
+        <xi:include href="usb_audio_policy_configuration.xml"/>
+
+        <!-- Remote Submix Audio HAL -->
+        <xi:include href="r_submix_audio_policy_configuration.xml"/>
+
+    </modules>
+    <!-- End of Modules section -->
+
+    <!-- Volume section -->
+
+    <xi:include href="audio_policy_volumes.xml"/>
+    <xi:include href="default_volume_tables.xml"/>
+
+    <!-- End of Volume section -->
+
+</audioPolicyConfiguration>
diff --git a/common/audio/default/policy/audio_policy_volumes.xml b/common/audio/default/policy/audio_policy_volumes.xml
new file mode 100644
index 000000000..43a47b045
--- /dev/null
+++ b/common/audio/default/policy/audio_policy_volumes.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+<!-- Volume section defines a volume curve for a given use case and device category.
+It contains a list of points of this curve expressing the attenuation in Millibels for a given
+volume index from 0 to 100.
+<volume stream=”AUDIO_STREAM_MUSIC” deviceCategory=””>
+<point>0,-9600</point>
+<point>100,0</point>
+</volume>
+-->
+
+<volumes>
+    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_HEADSET">
+        <point>0,-4200</point>
+        <point>33,-2800</point>
+        <point>66,-1400</point>
+        <point>100,0</point>
+    </volume>
+    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>0,-2400</point>
+        <point>33,-1600</point>
+        <point>66,-800</point>
+        <point>100,0</point>
+    </volume>
+    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EARPIECE">
+        <point>0,-2400</point>
+        <point>33,-1600</point>
+        <point>66,-800</point>
+        <point>100,0</point>
+    </volume>
+    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+                                             ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_HEADSET">
+        <point>1,-3000</point>
+        <point>33,-2600</point>
+        <point>66,-2200</point>
+        <point>100,-1800</point>
+    </volume>
+    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER"
+                                         ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
+                                         ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+                                         ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEADSET"
+                                       ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-2970</point>
+        <point>33,-2010</point>
+        <point>66,-1020</point>
+        <point>100,0</point>
+    </volume>
+    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
+                                       ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+                                       ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"
+                                        ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER"
+                                        ref="DEFAULT_DEVICE_CATEGORY_SPEAKER_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
+                                        ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+                                        ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
+                                        ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-2970</point>
+        <point>33,-2010</point>
+        <point>66,-1020</point>
+        <point>100,0</point>
+    </volume>
+    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
+                                        ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+                                        ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET"
+                                               ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-2970</point>
+        <point>33,-2010</point>
+        <point>66,-1020</point>
+        <point>100,0</point>
+    </volume>
+    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE"
+                                               ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+                                               ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_HEADSET">
+        <point>0,-4200</point>
+        <point>33,-2800</point>
+        <point>66,-1400</point>
+        <point>100,0</point>
+    </volume>
+    <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>0,-2400</point>
+        <point>33,-1600</point>
+        <point>66,-800</point>
+        <point>100,0</point>
+    </volume>
+    <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_EARPIECE">
+        <point>0,-4200</point>
+        <point>33,-2800</point>
+        <point>66,-1400</point>
+        <point>100,0</point>
+    </volume>
+    <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+                                                ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_HEADSET">
+        <point>1,-3000</point>
+        <point>33,-2600</point>
+        <point>66,-2200</point>
+        <point>100,-1800</point>
+    </volume>
+    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER"
+                                                   ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"
+                                                   ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+                                                   ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_HEADSET">
+        <point>1,-3000</point>
+        <point>33,-2600</point>
+        <point>66,-2200</point>
+        <point>100,-1800</point>
+    </volume>
+    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER"
+                                       ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
+                                       ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+                                       ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_HEADSET"
+                                      ref="SILENT_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_SPEAKER"
+                                      ref="FULL_SCALE_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_EARPIECE"
+                                      ref="SILENT_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+                                      ref="SILENT_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_HEADSET"
+                                                ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_SPEAKER"
+                                                ref="DEFAULT_DEVICE_CATEGORY_SPEAKER_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_EARPIECE"
+                                                ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+                                                ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_HEADSET"
+                                            ref="FULL_SCALE_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_SPEAKER"
+                                            ref="FULL_SCALE_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
+                                            ref="FULL_SCALE_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+                                            ref="FULL_SCALE_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_HEADSET"
+                                        ref="FULL_SCALE_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_SPEAKER"
+                                        ref="FULL_SCALE_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_EARPIECE"
+                                        ref="FULL_SCALE_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
+                                        ref="FULL_SCALE_VOLUME_CURVE"/>
+</volumes>
+
diff --git a/common/audio/default/policy/default_volume_tables.xml b/common/audio/default/policy/default_volume_tables.xml
new file mode 100644
index 000000000..9a22b1da3
--- /dev/null
+++ b/common/audio/default/policy/default_volume_tables.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+<!-- Default Volume Tables included by Audio Policy Configuration file -->
+<!-- Full Default Volume table for all device category -->
+<volumes>
+    <reference name="FULL_SCALE_VOLUME_CURVE">
+    <!-- Full Scale reference Volume Curve -->
+        <point>0,0</point>
+        <point>100,0</point>
+    </reference>
+    <reference name="SILENT_VOLUME_CURVE">
+        <point>0,-9600</point>
+        <point>100,-9600</point>
+    </reference>
+    <reference name="DEFAULT_SYSTEM_VOLUME_CURVE">
+    <!-- Default System reference Volume Curve -->
+        <point>1,-2400</point>
+        <point>33,-1800</point>
+        <point>66,-1200</point>
+        <point>100,-600</point>
+    </reference>
+    <reference name="DEFAULT_MEDIA_VOLUME_CURVE">
+    <!-- Default Media reference Volume Curve -->
+        <point>1,-5800</point>
+        <point>20,-4000</point>
+        <point>60,-1700</point>
+        <point>100,0</point>
+    </reference>
+    <reference name="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE">
+    <!--Default Volume Curve -->
+        <point>1,-4950</point>
+        <point>33,-3350</point>
+        <point>66,-1700</point>
+        <point>100,0</point>
+    </reference>
+    <reference name="DEFAULT_DEVICE_CATEGORY_SPEAKER_VOLUME_CURVE">
+    <!-- Default is Speaker Media Volume Curve -->
+        <point>1,-5800</point>
+        <point>20,-4000</point>
+        <point>60,-1700</point>
+        <point>100,0</point>
+    </reference>
+    <reference name="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE">
+    <!--Default Volume Curve -->
+        <point>1,-4950</point>
+        <point>33,-3350</point>
+        <point>66,-1700</point>
+        <point>100,0</point>
+    </reference>
+    <reference name="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE">
+    <!-- Default is Ext Media System Volume Curve -->
+        <point>1,-5800</point>
+        <point>20,-4000</point>
+        <point>60,-2100</point>
+        <point>100,-1000</point>
+    </reference>
+</volumes>
diff --git a/common/audio/default/policy/r_submix_audio_policy_configuration.xml b/common/audio/default/policy/r_submix_audio_policy_configuration.xml
new file mode 100644
index 000000000..dc2a5ecc8
--- /dev/null
+++ b/common/audio/default/policy/r_submix_audio_policy_configuration.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+<!-- Remote Submix Audio Policy Configuration file -->
+<module name="r_submix" halVersion="2.0">
+    <attachedDevices>
+        <item>Remote Submix In</item>
+    </attachedDevices>
+    <mixPorts>
+        <mixPort name="r_submix output" role="source">
+            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                     samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+        </mixPort>
+        <mixPort name="r_submix input" role="sink">
+           <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                    samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
+        </mixPort>
+   </mixPorts>
+   <devicePorts>
+       <devicePort tagName="Remote Submix Out" type="AUDIO_DEVICE_OUT_REMOTE_SUBMIX"  role="sink">
+           <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                    samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+       </devicePort>
+       <devicePort tagName="Remote Submix In" type="AUDIO_DEVICE_IN_REMOTE_SUBMIX"  role="source">
+           <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                    samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
+        </devicePort>
+    </devicePorts>
+    <routes>
+        <route type="mix" sink="Remote Submix Out"
+               sources="r_submix output"/>
+        <route type="mix" sink="r_submix input"
+               sources="Remote Submix In"/>
+    </routes>
+</module>
diff --git a/common/audio/default/policy/usb_audio_policy_configuration.xml b/common/audio/default/policy/usb_audio_policy_configuration.xml
new file mode 100644
index 000000000..1630a9423
--- /dev/null
+++ b/common/audio/default/policy/usb_audio_policy_configuration.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+<!-- USB Audio HAL Audio Policy Configuration file -->
+
+<module name="usb" halVersion="2.0">
+    <mixPorts>
+        <mixPort name="usb_accessory output" role="source">
+            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                     samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+        </mixPort>
+        <mixPort name="usb_device output" role="source"/>
+        <mixPort name="usb_device input" role="sink"/>
+    </mixPorts>
+    <devicePorts>
+        <devicePort tagName="USB Host Out" type="AUDIO_DEVICE_OUT_USB_ACCESSORY" role="sink">
+            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                     samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+        </devicePort>
+        <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink"/>
+        <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source"/>
+    </devicePorts>
+    <routes>
+        <route type="mix" sink="USB Host Out"
+               sources="usb_accessory output"/>
+        <route type="mix" sink="USB Device Out"
+               sources="usb_device output"/>
+        <route type="mix" sink="usb_device input"
+               sources="USB Device In"/>
+    </routes>
+</module>

From 6fc2327b814858314d0f72d2d6479fb59b49b08a Mon Sep 17 00:00:00 2001
From: Sebastien Guiriec <sebastien.guiriec@intel.com>
Date: Thu, 4 May 2017 14:26:35 +0200
Subject: [PATCH 067/427] Add Intel NUC6i5SYH default audio configuration.

This patch is adding the support of Intel NUC6i5SYH audio.

Jira: None

Test: Tested under NUC 6i5SYH with small patch to kernel and Wired
Accessory detection in order to have good HDMI and Headset detection.

Signed-off-by: Sebastien Guiriec <sebastien.guiriec@intel.com>
---
 common/audio/AndroidBoard.mk                  |  13 +-
 common/audio/PCH-ALC283/mixer_paths_0.xml     |  18 +++
 .../policy/audio_policy_configuration.xml     | 125 ++++++++++++++++++
 .../stub_audio_policy_configuration.xml       |  47 +++++++
 4 files changed, 202 insertions(+), 1 deletion(-)
 create mode 100644 common/audio/PCH-ALC283/mixer_paths_0.xml
 create mode 100644 common/audio/PCH-ALC283/policy/audio_policy_configuration.xml
 create mode 100644 common/audio/default/policy/stub_audio_policy_configuration.xml

diff --git a/common/audio/AndroidBoard.mk b/common/audio/AndroidBoard.mk
index 222afa2fb..3f600259f 100644
--- a/common/audio/AndroidBoard.mk
+++ b/common/audio/AndroidBoard.mk
@@ -3,7 +3,8 @@ LOCAL_PATH := $(call my-dir)
 # audio hardware is not discoverable, select hardware or use basic default
 AUDIO_HARDWARE := default
 #AUDIO_HARDWARE := PCH-CX20724
-#AUDIO_HARDWARE := nuc
+# Next configuration is used for Intel NUC6i5SYH
+#AUDIO_HARDWARE := PCH-ALC283
 #AUDIO_HARDWARE := nuc-skull-canyon
 
 ###########################################
@@ -27,6 +28,7 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_REQUIRED_MODULES := \
     a2dp_audio_policy_configuration.xml \
     r_submix_audio_policy_configuration.xml \
+    stub_audio_policy_configuration.xml \
     usb_audio_policy_configuration.xml \
     audio_policy_volumes.xml \
     default_volume_tables.xml \
@@ -70,6 +72,15 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
 LOCAL_SRC_FILES := default/policy/$(LOCAL_MODULE)
 include $(BUILD_PREBUILT)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := stub_audio_policy_configuration.xml
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
+LOCAL_SRC_FILES := default/policy/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := usb_audio_policy_configuration.xml
 LOCAL_MODULE_OWNER := intel
diff --git a/common/audio/PCH-ALC283/mixer_paths_0.xml b/common/audio/PCH-ALC283/mixer_paths_0.xml
new file mode 100644
index 000000000..ee89c3a93
--- /dev/null
+++ b/common/audio/PCH-ALC283/mixer_paths_0.xml
@@ -0,0 +1,18 @@
+<mixer>
+  <!-- These are the initial mixer settings -->
+  <ctl name="Master Playback Volume" value="50 50" />
+  <ctl name="Capture Volume" value="50 50" />
+
+  <ctl name="IEC958 Playback Switch" value="1" />
+
+  <ctl name="Master Playback Switch" value="0" />
+  <ctl name="Capture Switch" value="0 0" />
+
+  <path name="headphone">
+    <ctl name="Master Playback Switch" value="1" />
+  </path>
+
+  <path name="headset-mic">
+    <ctl name="Capture Switch" value="1 1" />
+  </path>
+</mixer>
diff --git a/common/audio/PCH-ALC283/policy/audio_policy_configuration.xml b/common/audio/PCH-ALC283/policy/audio_policy_configuration.xml
new file mode 100644
index 000000000..414bcb76b
--- /dev/null
+++ b/common/audio/PCH-ALC283/policy/audio_policy_configuration.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Copyright (C) 2017 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.
+-->
+
+<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+    <!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
+
+    <!-- Modules section:
+        There is one section per audio HW module present on the platform.
+        Each module section will contains two mandatory tags for audio HAL “halVersion” and “name”.
+        The module names are the same as in current .conf file:
+                “primary”, “A2DP”, “remote_submix”, “USB”
+        Each module will contain the following sections:
+        “devicePorts”: a list of device descriptors for all input and output devices accessible via this
+        module.
+        This contains both permanently attached devices and removable devices.
+        “mixPorts”: listing all output and input streams exposed by the audio HAL
+        “routes”: list of possible connections between input and output devices or between stream and
+        devices.
+            "route": is defined by an attribute:
+                -"type": <mux|mix> means all sources are mutual exclusive (mux) or can be mixed (mix)
+                -"sink": the sink involved in this route
+                -"sources": all the sources than can be connected to the sink via vis route
+        “attachedDevices”: permanently attached devices.
+        The attachedDevices section is a list of devices names. The names correspond to device names
+        defined in <devicePorts> section.
+        “defaultOutputDevice”: device to be used by default when no policy rule applies
+    -->
+    <modules>
+        <!-- Primary Audio HAL -->
+        <module name="primary" halVersion="3.0">
+            <mixPorts>
+                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
+                <mixPort name="hdmi_stereo" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
+                <mixPort name="hdmi_multi" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000"/>
+                </mixPort>
+                <mixPort name="primary input" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+                </mixPort>
+            </mixPorts>
+            <devicePorts>
+                <!-- Output devices declaration, i.e. Sink DEVICE PORT -->
+                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </devicePort>
+                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </devicePort>
+
+                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+                </devicePort>
+
+                <devicePort tagName="HDMI" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="32000,44100,48000"/>
+                </devicePort>
+
+            </devicePorts>
+            <!-- route declaration, i.e. list all available sources for a given sink -->
+            <routes>
+                <route type="mix" sink="Wired Headset"
+                       sources="primary output"/>
+                <route type="mix" sink="Wired Headphones"
+                       sources="primary output"/>
+                <route type="mix" sink="primary input"
+                       sources="Wired Headset Mic"/>
+
+                <route type="mix" sink="HDMI"
+                       sources="hdmi_stereo,hdmi_multi"/>
+            </routes>
+
+        </module>
+
+        <!-- Stub Audio HAL -->
+        <xi:include href="stub_audio_policy_configuration.xml"/>
+
+        <!-- A2dp Audio HAL -->
+        <xi:include href="a2dp_audio_policy_configuration.xml"/>
+
+        <!-- Usb Audio HAL -->
+        <xi:include href="usb_audio_policy_configuration.xml"/>
+
+        <!-- Remote Submix Audio HAL -->
+        <xi:include href="r_submix_audio_policy_configuration.xml"/>
+
+    </modules>
+    <!-- End of Modules section -->
+
+    <!-- Volume section -->
+
+    <xi:include href="audio_policy_volumes.xml"/>
+    <xi:include href="default_volume_tables.xml"/>
+
+    <!-- End of Volume section -->
+
+</audioPolicyConfiguration>
diff --git a/common/audio/default/policy/stub_audio_policy_configuration.xml b/common/audio/default/policy/stub_audio_policy_configuration.xml
new file mode 100644
index 000000000..2b49fa33f
--- /dev/null
+++ b/common/audio/default/policy/stub_audio_policy_configuration.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2017 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.
+-->
+<!-- Stub Audio HAL Audio Policy Configuration file -->
+
+<module name="stub" halVersion="2.0">
+    <attachedDevices>
+        <item>Default Out</item>
+        <item>Default In</item>
+        </attachedDevices>
+    <defaultOutputDevice>Default Out</defaultOutputDevice>
+    <mixPorts>
+        <mixPort name="stub output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY">
+            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                     samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+        </mixPort>
+
+        <mixPort name="stub input" role="sink">
+            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                     samplingRates="44100" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
+        </mixPort>
+    </mixPorts>
+    <devicePorts>
+        <devicePort tagName="Default Out" type="AUDIO_DEVICE_OUT_STUB" role="sink">
+                </devicePort>
+
+        <devicePort tagName="Default In" type="AUDIO_DEVICE_IN_STUB" role="source">
+        </devicePort>
+    </devicePorts>
+    <routes>
+        <route type="mix" sink="Default Out" sources="stub output"/>
+
+        <route type="mix" sink="stub input" sources="Default In"/>
+    </routes>
+</module>

From 9aefbbd6eaf0396836314e339bbd288ef06c1dca Mon Sep 17 00:00:00 2001
From: Kishore Kadiyala <kishore.kadiyala@intel.com>
Date: Fri, 12 May 2017 20:12:27 +0530
Subject: [PATCH 068/427] Fix: factory partition entry added in android_ia

Factory partition entry is added in gpt.ini instead
maintain it in mixins/groups/android_ia as done for other
partitions.

Jira : AIA-397
Test : The build should generate a factory.img
	The CI test bench flashing should work

Change-Id: I754f2e3e6f426190daae87b4978fe18c0fe74d1d
Signed-off-by: Kishore Kadiyala <kishore.kadiyala@intel.com>
---
 androidia_64/BoardConfig.mk | 2 +-
 androidia_64/gpt.ini        | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 68ab472fc..404694284 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -213,7 +213,7 @@ endif
 # Source: device/intel/mixins/groups/factory-partition/true/BoardConfig.mk
 ##############################################################
 BOARD_FACTORYIMAGE_PARTITION_SIZE := 10485760
-BOARD_SEPOLICY_DIRS += device/intel/sepolicy/factory-partition
+BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/factory-partition
 BOARD_SEPOLICY_M4DEFS += module_factory_partition=true
 ##############################################################
 # Source: device/intel/mixins/groups/debug-phonedoctor/true/BoardConfig.mk
diff --git a/androidia_64/gpt.ini b/androidia_64/gpt.ini
index 389b93736..ed9dae31b 100644
--- a/androidia_64/gpt.ini
+++ b/androidia_64/gpt.ini
@@ -4,7 +4,7 @@
 # Source: device/intel/mixins/groups/boot-arch/android_ia/gpt.ini
 ##############################################################
 [base]
-partitions = bootloader bootloader2 boot recovery misc metadata system cache persistent vendor config data
+partitions = bootloader bootloader2 boot recovery misc metadata system cache persistent vendor config data factory
 
 [partition.bootloader]
 label = android_bootloader
@@ -80,11 +80,6 @@ label = android_config
 len = 8
 type = linux
 guid = bd59408b-4514-490d-bf12-9878d963f378
-##############################################################
-# Source: device/intel/mixins/groups/factory-partition/true/gpt.ini
-##############################################################
-[base]
-partitions += factory
 
 [partition.factory]
 label = android_factory

From ce20c5799f5997bb834b3e48b689332721862f96 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Wed, 17 May 2017 09:06:22 +0530
Subject: [PATCH 069/427] [Android-IA] Increase system image partition size

Mixin update

Jira : AIA-401
Test : Device boots to homescreen.
---
 androidia_64/BoardConfig.mk | 2 +-
 androidia_64/gpt.ini        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index d4e4b284b..fae8cfb52 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -104,7 +104,7 @@ TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
 BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := squashfs
 endif
 
-BOARD_SYSTEMIMAGE_PARTITION_SIZE = 3489660928
+BOARD_SYSTEMIMAGE_PARTITION_SIZE = 3758096384
 
 BOARD_BOOTLOADER_PARTITION_SIZE ?= 42914560
 BOARD_BOOTLOADER_BLOCK_SIZE := 512
diff --git a/androidia_64/gpt.ini b/androidia_64/gpt.ini
index ed9dae31b..166d6751b 100644
--- a/androidia_64/gpt.ini
+++ b/androidia_64/gpt.ini
@@ -47,7 +47,7 @@ guid = 20ac26be-20b7-11e3-84c5-6cfdb94711e9
 
 [partition.system]
 label = android_system
-len = 3328
+len = 3584
 type = linux
 guid = 38f428e6-d326-425d-9140-6e0ea133647c
 

From 13af3cce33b76d27e066752270a86dba588b3aa8 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Tue, 16 May 2017 18:39:59 -0500
Subject: [PATCH 070/427] Add support for configurable audio policy

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 androidia_64/BoardConfig.mk                   |     2 +
 common/audio/AndroidBoard.mk                  |     4 +
 .../AndroidBoard.mk                           |   170 +
 ...rameterFrameworkConfigurationPolicy.xml.in |    14 +
 .../README.md                                 |    11 +
 .../Settings/PolicyConfigurableDomains.xml    | 10228 ++++++++++++++++
 .../Settings/device_for_input_source.pfw      |   579 +
 .../device_for_strategy_accessibility.pfw     |   593 +
 .../Settings/device_for_strategy_dtmf.pfw     |   623 +
 .../device_for_strategy_enforced_audible.pfw  |   358 +
 .../Settings/device_for_strategy_media.pfw    |   338 +
 .../Settings/device_for_strategy_phone.pfw    |   483 +
 .../device_for_strategy_rerouting.pfw         |   300 +
 .../device_for_strategy_sonification.pfw      |   490 +
 ...e_for_strategy_sonification_respectful.pfw |   536 +
 ...r_strategy_transmitted_through_speaker.pfw |    43 +
 .../Settings/strategy_for_stream.pfw          |    20 +
 .../Settings/strategy_for_usage.pfw           |    39 +
 .../Settings/volumes.pfw                      |    28 +
 .../device_for_input_source.pfw               |   285 +
 .../device_for_strategies.pfw                 |   255 +
 .../Structure/PolicyClass.xml                 |     5 +
 .../Structure/PolicySubsystem-CommonTypes.xml |   198 +
 .../Structure/PolicySubsystem.xml             |   139 +
 .../policy_criteria.txt                       |    10 +
 25 files changed, 15751 insertions(+)
 create mode 100644 common/audio/reference_configurable_audio_policy/AndroidBoard.mk
 create mode 100644 common/audio/reference_configurable_audio_policy/ParameterFrameworkConfigurationPolicy.xml.in
 create mode 100644 common/audio/reference_configurable_audio_policy/README.md
 create mode 100644 common/audio/reference_configurable_audio_policy/Settings/PolicyConfigurableDomains.xml
 create mode 100644 common/audio/reference_configurable_audio_policy/Settings/device_for_input_source.pfw
 create mode 100644 common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_accessibility.pfw
 create mode 100644 common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_dtmf.pfw
 create mode 100644 common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_enforced_audible.pfw
 create mode 100644 common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_media.pfw
 create mode 100644 common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_phone.pfw
 create mode 100644 common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_rerouting.pfw
 create mode 100644 common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification.pfw
 create mode 100644 common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification_respectful.pfw
 create mode 100644 common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_transmitted_through_speaker.pfw
 create mode 100644 common/audio/reference_configurable_audio_policy/Settings/strategy_for_stream.pfw
 create mode 100644 common/audio/reference_configurable_audio_policy/Settings/strategy_for_usage.pfw
 create mode 100644 common/audio/reference_configurable_audio_policy/Settings/volumes.pfw
 create mode 100644 common/audio/reference_configurable_audio_policy/SettingsNoInput/device_for_input_source.pfw
 create mode 100644 common/audio/reference_configurable_audio_policy/SettingsNoOutput/device_for_strategies.pfw
 create mode 100644 common/audio/reference_configurable_audio_policy/Structure/PolicyClass.xml
 create mode 100644 common/audio/reference_configurable_audio_policy/Structure/PolicySubsystem-CommonTypes.xml
 create mode 100644 common/audio/reference_configurable_audio_policy/Structure/PolicySubsystem.xml
 create mode 100644 common/audio/reference_configurable_audio_policy/policy_criteria.txt

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index d4e4b284b..fa80f8e41 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -156,6 +156,8 @@ BOARD_USES_GENERIC_AUDIO ?= false
 INTEL_AUDIO_HAL := audio
 # Use XML audio policy configuration file
 USE_XML_AUDIO_POLICY_CONF ?= 1
+# Use configurable audio policy
+USE_CONFIGURABLE_AUDIO_POLICY ?= 1
 ##############################################################
 # Source: device/intel/mixins/groups/wlan/iwlwifi/BoardConfig.mk
 ##############################################################
diff --git a/common/audio/AndroidBoard.mk b/common/audio/AndroidBoard.mk
index 3f600259f..2f8aadcb1 100644
--- a/common/audio/AndroidBoard.mk
+++ b/common/audio/AndroidBoard.mk
@@ -121,3 +121,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
 LOCAL_SRC_FILES := $(AUDIO_HARDWARE)/mixer_paths_0.xml
 include $(BUILD_PREBUILT)
 ###########################################
+
+ifeq ($(USE_CONFIGURABLE_AUDIO_POLICY), 1)
+include device/intel/android_ia/common/audio/reference_configurable_audio_policy/AndroidBoard.mk
+endif
diff --git a/common/audio/reference_configurable_audio_policy/AndroidBoard.mk b/common/audio/reference_configurable_audio_policy/AndroidBoard.mk
new file mode 100644
index 000000000..4d598b9f9
--- /dev/null
+++ b/common/audio/reference_configurable_audio_policy/AndroidBoard.mk
@@ -0,0 +1,170 @@
+LOCAL_PATH := $(call my-dir)
+
+ifeq ($(USE_CONFIGURABLE_AUDIO_POLICY), 1)
+
+POLICY_NO_INPUT  := 0
+POLICY_NO_OUTPUT := 0
+
+PFW_CORE := external/parameter-framework
+BUILD_PFW_SETTINGS := $(PFW_CORE)/support/android/build_pfw_settings.mk
+PFW_DEFAULT_SCHEMAS_DIR := $(PFW_CORE)/upstream/schemas
+PFW_SCHEMAS_DIR := $(PFW_DEFAULT_SCHEMAS_DIR)
+
+##################################################################
+# CONFIGURATION FILES
+##################################################################
+######### Policy PFW top level file #########
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := ParameterFrameworkConfigurationPolicy.xml
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/parameter-framework
+LOCAL_SRC_FILES := $(LOCAL_MODULE).in
+
+AUDIO_PATTERN = @TUNING_ALLOWED@
+ifeq ($(TARGET_BUILD_VARIANT),user)
+AUDIO_VALUE = false
+else
+AUDIO_VALUE = true
+
+LOCAL_REQUIRED_MODULES := \
+     libremote-processor \
+     remote-process \
+
+endif
+
+LOCAL_POST_INSTALL_CMD := $(hide) sed -i -e 's|$(AUDIO_PATTERN)|$(AUDIO_VALUE)|g' $(LOCAL_MODULE_PATH)/$(LOCAL_MODULE)
+
+include $(BUILD_PREBUILT)
+
+
+########## Policy PFW Structures #########
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := PolicyClass.xml
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/parameter-framework/Structure/Policy
+LOCAL_SRC_FILES := Structure/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := PolicySubsystem.xml
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_REQUIRED_MODULES := \
+    PolicySubsystem-CommonTypes.xml \
+    PolicySubsystem-Volume.xml \
+    libpolicy-subsystem \
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/parameter-framework/Structure/Policy
+LOCAL_SRC_FILES := Structure/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := PolicySubsystem-CommonTypes.xml
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/parameter-framework/Structure/Policy
+LOCAL_SRC_FILES := Structure/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
+ifneq ($(POLICY_NO_INPUT),1)
+ifneq ($(POLICY_NO_OUTPUT),1)
+######### Policy PFW Settings #########
+include $(CLEAR_VARS)
+LOCAL_MODULE := parameter-framework.policy
+LOCAL_MODULE_STEM := PolicyConfigurableDomains.xml
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+        PolicyClass.xml \
+        PolicySubsystem.xml \
+        ParameterFrameworkConfigurationPolicy.xml
+
+ifeq ($(pfw_rebuild_settings),true)
+PFW_TOPLEVEL_FILE := $(TARGET_OUT_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml
+PFW_CRITERIA_FILE := $(LOCAL_PATH)/policy_criteria.txt
+PFW_EDD_FILES := \
+        $(LOCAL_PATH)/Settings/device_for_strategy_media.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_phone.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_sonification.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_sonification_respectful.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_dtmf.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_enforced_audible.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_transmitted_through_speaker.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_accessibility.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_rerouting.pfw \
+        $(LOCAL_PATH)/Settings/strategy_for_stream.pfw \
+        $(LOCAL_PATH)/Settings/strategy_for_usage.pfw \
+        $(LOCAL_PATH)/Settings/device_for_input_source.pfw \
+        $(LOCAL_PATH)/Settings/volumes.pfw
+
+include $(BUILD_PFW_SETTINGS)
+else
+# Use the existing file
+LOCAL_SRC_FILES := Settings/$(LOCAL_MODULE_STEM)
+include $(BUILD_PREBUILT)
+endif # pfw_rebuild_settings
+
+endif # NO_INPUT
+endif # NO_OUPUT
+
+######### Policy PFW Settings - No Output #########
+ifeq ($(POLICY_NO_OUTPUT),1)
+include $(CLEAR_VARS)
+LOCAL_MODULE := parameter-framework.policy.no-output
+LOCAL_MODULE_STEM := PolicyConfigurableDomains-NoOutputDevice.xml
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+        PolicyClass.xml \
+        PolicySubsystem.xml \
+        ParameterFrameworkConfigurationPolicy.xml
+
+PFW_TOPLEVEL_FILE := $(TARGET_OUT_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml
+PFW_CRITERIA_FILE := $(LOCAL_PATH)/policy_criteria.txt
+PFW_EDD_FILES := \
+        $(LOCAL_PATH)/SettingsNoOutput/device_for_strategies.pfw \
+        $(LOCAL_PATH)/Settings/strategy_for_stream.pfw \
+        $(LOCAL_PATH)/Settings/strategy_for_usage.pfw \
+        $(LOCAL_PATH)/Settings/device_for_input_source.pfw \
+        $(LOCAL_PATH)/Settings/volumes.pfw
+
+include $(BUILD_PFW_SETTINGS)
+endif # NO_OUTPUT
+
+######### Policy PFW Settings - No Input #########
+ifeq ($(POLICY_NO_INPUT),1)
+include $(CLEAR_VARS)
+LOCAL_MODULE := parameter-framework.policy.no-input
+LOCAL_MODULE_STEM := PolicyConfigurableDomains-NoInputDevice.xml
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+        PolicyClass.xml \
+        PolicySubsystem.xml \
+        ParameterFrameworkConfigurationPolicy.xml
+
+PFW_TOPLEVEL_FILE := $(TARGET_OUT_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml
+PFW_CRITERIA_FILE := $(LOCAL_PATH)/policy_criteria.txt
+PFW_EDD_FILES := \
+        $(LOCAL_PATH)/Settings/device_for_strategy_media.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_phone.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_sonification.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_sonification_respectful.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_dtmf.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_enforced_audible.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_transmitted_through_speaker.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_accessibility.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_rerouting.pfw \
+        $(LOCAL_PATH)/Settings/strategy_for_stream.pfw \
+        $(LOCAL_PATH)/Settings/strategy_for_usage.pfw \
+        $(LOCAL_PATH)/SettingsNoInput/device_for_input_source.pfw \
+        $(LOCAL_PATH)/Settings/volumes.pfw
+
+include $(BUILD_PFW_SETTINGS)
+endif # NO_INPUT
+
+endif # USE_CONFIGURABLE_AUDIO_POLICY
diff --git a/common/audio/reference_configurable_audio_policy/ParameterFrameworkConfigurationPolicy.xml.in b/common/audio/reference_configurable_audio_policy/ParameterFrameworkConfigurationPolicy.xml.in
new file mode 100644
index 000000000..f5615cd52
--- /dev/null
+++ b/common/audio/reference_configurable_audio_policy/ParameterFrameworkConfigurationPolicy.xml.in
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ParameterFrameworkConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    SystemClassName="Policy" ServerPort="5019" TuningAllowed="@TUNING_ALLOWED@">
+
+    <SubsystemPlugins>
+        <Location Folder="">
+            <Plugin Name="libpolicy-subsystem.so"/>
+        </Location>
+    </SubsystemPlugins>
+    <StructureDescriptionFileLocation Path="Structure/Policy/PolicyClass.xml"/>
+    <SettingsConfiguration>
+        <ConfigurableDomainsFileLocation Path="Settings/Policy/PolicyConfigurableDomains.xml"/>
+    </SettingsConfiguration>
+</ParameterFrameworkConfiguration>
diff --git a/common/audio/reference_configurable_audio_policy/README.md b/common/audio/reference_configurable_audio_policy/README.md
new file mode 100644
index 000000000..92668e1ec
--- /dev/null
+++ b/common/audio/reference_configurable_audio_policy/README.md
@@ -0,0 +1,11 @@
+Configurable Policy Engine Example
+================================
+
+This folder exposes a generic functional configurable policy engine configuration files
+to provide to have a product following the nexus experience.
+
+A vendor wishing to customize the behavior shall provides its own set of configuration files
+within the device folder for the product to customize.
+
+For any question about the parameter framework and configuration files,
+See [the wiki on github](https://github.com/01org/parameter-framework/wiki).
diff --git a/common/audio/reference_configurable_audio_policy/Settings/PolicyConfigurableDomains.xml b/common/audio/reference_configurable_audio_policy/Settings/PolicyConfigurableDomains.xml
new file mode 100644
index 000000000..aa2af0ff2
--- /dev/null
+++ b/common/audio/reference_configurable_audio_policy/Settings/PolicyConfigurableDomains.xml
@@ -0,0 +1,10228 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- #### DO NOT EDIT THIS FILE #### -->
+<ConfigurableDomains SystemClassName="Policy">
+  <ConfigurableDomain Name="DeviceForStrategy.Media.UnreachableDevices" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/fm"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker_safe"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/earpiece"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_sco"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_sco_carkit"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/telephony_tx"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/stub"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/fm">
+          <BitParameter Name="fm">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker_safe">
+          <BitParameter Name="speaker_safe">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Media.Device2" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="RemoteSubmix">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="RemoteSubmix"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dp">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceBtSco"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphone">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceBtSco"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceBtSco"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="ForceSpeaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForHdmiSystemAudio" MatchesWhen="IsNot" Value="ForceHdmiSystemEnforced"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Line">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbAccessory"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="DgtlDockHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="AuxDigital">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Hdmi"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AnlgDockHeadset"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForDock" MatchesWhen="Is" Value="ForceAnalogDock"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Speaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForHdmiSystemAudio" MatchesWhen="IsNot" Value="ForceHdmiSystemEnforced"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceBtSco"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Default">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="RemoteSubmix">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dp">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphone">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="ForceSpeaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Line">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="AuxDigital">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Speaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Default">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Media.Arc" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Selected">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="HdmiArc"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi_arc"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Selected">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi_arc">
+          <BitParameter Name="hdmi_arc">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi_arc">
+          <BitParameter Name="hdmi_arc">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Media.Spdif" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Selected">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Spdif"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/spdif"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Selected">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/spdif">
+          <BitParameter Name="spdif">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Media.AuxLine" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Selected">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AuxLine"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/aux_line"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Selected">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/aux_line">
+          <BitParameter Name="aux_line">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/aux_line">
+          <BitParameter Name="aux_line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Phone.UnreachableDevices" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi_arc"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/aux_line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/fm"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker_safe"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/stub"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi_arc">
+          <BitParameter Name="hdmi_arc">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/aux_line">
+          <BitParameter Name="aux_line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/fm">
+          <BitParameter Name="fm">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker_safe">
+          <BitParameter Name="speaker_safe">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Phone.Device" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="ScoCarkit">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoCarkit"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothScoHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoHeadset"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothSco">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothSco"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dp">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceNone"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphones">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceNone"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Line">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+            <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceNone"/>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="UsbAccessory"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+            </CompoundRule>
+          </CompoundRule>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbAccessory"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="DgtlDockHeadset"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Hdmi">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Hdmi"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AnlgDockHeadset"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Earpiece">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Earpiece"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Speaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Default">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="ScoCarkit">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothScoHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothSco">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dp">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphones">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Line">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Hdmi">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Earpiece">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Speaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Default">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Sonification.UnreachableDevices" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/hdmi_arc"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/fm"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/speaker_safe"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/aux_line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/stub"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/hdmi_arc">
+          <BitParameter Name="hdmi_arc">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/fm">
+          <BitParameter Name="fm">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/speaker_safe">
+          <BitParameter Name="speaker_safe">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/aux_line">
+          <BitParameter Name="aux_line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Sonification.Speaker" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Selected">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="Line"/>
+            </CompoundRule>
+          </CompoundRule>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/speaker"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Selected">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Sonification.Device2" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="BluetoothA2dp">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphones">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="ScoCarkit">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoCarkit"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="ScoHeadset">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Sco">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothSco"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+          </CompoundRule>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Line">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="WiredHeadset"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+          </CompoundRule>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+          </CompoundRule>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="UsbAccessory"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+          </CompoundRule>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbAccessory"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="DgtlDockHeadset"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AnlgDockHeadset"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForDock" MatchesWhen="Is" Value="ForceAnalogDock"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Earpiece">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Earpiece"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="None">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="BluetoothA2dp">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphones">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="ScoCarkit">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="ScoHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Sco">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Line">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Earpiece">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="None">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.SonificationRespectful.UnreachableDevices" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi_arc"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/aux_line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/fm"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/telephony_tx"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/stub"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi_arc">
+          <BitParameter Name="hdmi_arc">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/aux_line">
+          <BitParameter Name="aux_line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/fm">
+          <BitParameter Name="fm">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.SonificationRespectful.Speakers" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="SpeakerSafe">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="SpeakerSafe"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Speaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="Line"/>
+            </CompoundRule>
+          </CompoundRule>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="None">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/speaker_safe"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/speaker"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="SpeakerSafe">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/speaker_safe">
+          <BitParameter Name="speaker_safe">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Speaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/speaker_safe">
+          <BitParameter Name="speaker_safe">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="None">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/speaker_safe">
+          <BitParameter Name="speaker_safe">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.SonificationRespectful.Device2" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="BluetoothA2dp">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphones">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothScoCarkit">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoCarkit"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothScoHeadset">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothSco">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothSco"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Line">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="WiredHeadset"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="UsbAccessory"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbAccessory"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="DgtlDockHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="AuxDigital">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Hdmi"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForDock" MatchesWhen="Is" Value="ForceAnalogDock"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AnlgDockHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Earpiece">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Earpiece"/>
+        </CompoundRule>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="BluetoothA2dp">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphones">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothScoCarkit">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothScoHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothSco">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Line">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="AuxDigital">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Earpiece">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Dtmf.UnreachableDevices" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/fm"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker_safe"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_carkit"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/stub"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/fm">
+          <BitParameter Name="fm">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker_safe">
+          <BitParameter Name="speaker_safe">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Dtmf.Device2" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="RemoteSubmix">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="RemoteSubmix"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dp">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphones">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="ForceSpeakerWhenNotInCall">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForHdmiSystemAudio" MatchesWhen="IsNot" Value="ForceHdmiSystemEnforced"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothScoHeadset">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoHeadset"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothSco">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothSco"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Line">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="WiredHeadset"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="UsbAccessory"/>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbAccessory"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="DgtlDockHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Hdmi">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Hdmi"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForDock" MatchesWhen="Is" Value="ForceAnalogDock"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AnlgDockHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Earpiece">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Earpiece"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Speaker">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForHdmiSystemAudio" MatchesWhen="IsNot" Value="ForceHdmiSystemEnforced"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Default">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="RemoteSubmix">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dp">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphones">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="ForceSpeakerWhenNotInCall">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothScoHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothSco">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Line">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Hdmi">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Earpiece">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Speaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Default">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Dtmf.Arc" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Selected">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="HdmiArc"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi_arc"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Selected">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi_arc">
+          <BitParameter Name="hdmi_arc">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi_arc">
+          <BitParameter Name="hdmi_arc">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Dtmf.Spdif" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Selected">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Spdif"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/spdif"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Selected">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/spdif">
+          <BitParameter Name="spdif">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Dtmf.AuxLine" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Selected">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AuxLine"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/aux_line"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Selected">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/aux_line">
+          <BitParameter Name="aux_line">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/aux_line">
+          <BitParameter Name="aux_line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.EnforcedAudible.UnreachableDevices" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi_arc"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/aux_line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker_safe"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/fm"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/stub"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi_arc">
+          <BitParameter Name="hdmi_arc">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/aux_line">
+          <BitParameter Name="aux_line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker_safe">
+          <BitParameter Name="speaker_safe">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/fm">
+          <BitParameter Name="fm">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.EnforcedAudible.Speaker" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Selected">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="ForceUseForSystem" MatchesWhen="Is" Value="ForceSystemEnforced"/>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceSpeaker"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="RemoteSubmix"/>
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+                <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="BluetoothA2dp"/>
+                <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="BluetoothA2dpHeadphones"/>
+                <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="BluetoothA2dpSpeaker"/>
+              </CompoundRule>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="RemoteSubmix"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="WiredHeadphone"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="Line"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="WiredHeadset"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="UsbAccessory"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="UsbDevice"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="DgtlDockHeadset"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="Hdmi"/>
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="AnlgDockHeadset"/>
+                <SelectionCriterionRule SelectionCriterion="ForceUseForDock" MatchesWhen="IsNot" Value="ForceAnalogDock"/>
+              </CompoundRule>
+            </CompoundRule>
+          </CompoundRule>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Selected">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.EnforcedAudible.Device2" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="RemoteSubmix">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="RemoteSubmix"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dp">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphones">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Line">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbAccessory"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="DgtlDockHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Hdmi">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Hdmi"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForDock" MatchesWhen="Is" Value="ForceAnalogDock"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AnlgDockHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="NoDevice">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="RemoteSubmix">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dp">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphones">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Line">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Hdmi">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="NoDevice">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.TransmittedThroughSpeaker.UnreacheableDevices" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/hdmi_arc"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/aux_line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/fm"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/speaker_safe"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/earpiece"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/wired_headphone"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_sco"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_sco_carkit"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/angl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/telephony_tx"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/stub"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/hdmi_arc">
+          <BitParameter Name="hdmi_arc">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/aux_line">
+          <BitParameter Name="aux_line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/fm">
+          <BitParameter Name="fm">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/speaker_safe">
+          <BitParameter Name="speaker_safe">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.TransmittedThroughSpeaker.Speaker" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Selected">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/speaker"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Selected">
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Accessibility.UnreachableDevices" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi_arc"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/aux_line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/fm"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker_safe"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/telephony_tx"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/stub"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi_arc">
+          <BitParameter Name="hdmi_arc">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/aux_line">
+          <BitParameter Name="aux_line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/fm">
+          <BitParameter Name="fm">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker_safe">
+          <BitParameter Name="speaker_safe">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Accessibility.Device" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="RemoteSubmix">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="RemoteSubmix"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dp">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphone">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="ForceSpeakerWhenNotInCall">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothScoCarkit">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoCarkit"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothScoHeadset">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoHeadset"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothSco">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothSco"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Line">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="WiredHeadset"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="UsbAccessory"/>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbAccessory"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="DgtlDockHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="AuxDigital">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Hdmi"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AnlgDockHeadset"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForDock" MatchesWhen="Is" Value="ForceAnalogDock"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Earpiece">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Earpiece"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Speaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Default">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="RemoteSubmix">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dp">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphone">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="ForceSpeakerWhenNotInCall">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothScoCarkit">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothScoHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothSco">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Line">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="AuxDigital">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Earpiece">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Speaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Default">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Rerouting.UnreachableDevices" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi_arc"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/aux_line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/fm"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker_safe"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/earpiece"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_sco"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_sco_carkit"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/telephony_tx"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/stub"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi_arc">
+          <BitParameter Name="hdmi_arc">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/aux_line">
+          <BitParameter Name="aux_line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/fm">
+          <BitParameter Name="fm">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker_safe">
+          <BitParameter Name="speaker_safe">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Rerouting.Device2" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="RemoteSubmix">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="RemoteSubmix"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dp">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphone">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="ForceSpeaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Line">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbAccessory"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="DgtlDockHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="AuxDigital">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Hdmi"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AnlgDockHeadset"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForDock" MatchesWhen="Is" Value="ForceAnalogDock"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Speaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Default">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="RemoteSubmix">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dp">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphone">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="ForceSpeaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Line">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="AuxDigital">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Speaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Default">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="StrategyForStream" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/streams/voice_call/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/streams/system/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/streams/ring/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/streams/music/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/streams/alarm/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/streams/notification/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/streams/bluetooth_sco/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/streams/enforced_audible/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/streams/dtmf/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/streams/tts/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/streams/accessibility/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/streams/rerouting/applicable_strategy/strategy"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/streams/voice_call/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">phone</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/system/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">media</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/ring/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">sonification</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/music/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">media</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/alarm/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">sonification</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/notification/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">sonification_respectful</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/bluetooth_sco/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">phone</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/enforced_audible/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">enforced_audible</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/dtmf/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">dtmf</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/tts/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">transmitted_through_speaker</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/accessibility/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">accessibility</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/rerouting/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">rerouting</EnumParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="SelectedStrategyForUsages.Calibration" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/usages/unknown/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/media/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/voice_communication/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/voice_communication_signalling/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/alarm/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/notification/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/notification_telephony_ringtone/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/notification_communication_request/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/notification_communication_instant/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/notification_communication_delayed/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/notification_event/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/assistance_navigation_guidance/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/assistance_sonification/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/game/applicable_strategy/strategy"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/usages/unknown/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">media</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/media/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">media</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/voice_communication/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">phone</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/voice_communication_signalling/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">dtmf</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/alarm/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">sonification</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/notification/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">sonification_respectful</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/notification_telephony_ringtone/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">sonification</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/notification_communication_request/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">sonification_respectful</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/notification_communication_instant/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">sonification_respectful</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/notification_communication_delayed/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">sonification_respectful</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/notification_event/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">sonification_respectful</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/assistance_navigation_guidance/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">media</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/assistance_sonification/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">media</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/game/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">media</EnumParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="SelectedStrategyForUsages.AssistanceAccessibility" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Sonification">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="RingTone"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Phone">
+        <CompoundRule Type="Any">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Accessibility">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/usages/assistance_accessibility/applicable_strategy/strategy"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Sonification">
+        <ConfigurableElement Path="/Policy/policy/usages/assistance_accessibility/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">sonification</EnumParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Phone">
+        <ConfigurableElement Path="/Policy/policy/usages/assistance_accessibility/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">phone</EnumParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Accessibility">
+        <ConfigurableElement Path="/Policy/policy/usages/assistance_accessibility/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">accessibility</EnumParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForInputSource.Calibration" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/communication"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/ambient"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/telephony_rx"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/back_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/anlg_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/fm_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/tv_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/loopback"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/stub"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/communication"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/ambient"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/telephony_rx"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/back_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/anlg_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/fm_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/tv_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/loopback"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/stub"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/communication"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/ambient"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/builtin_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/back_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/anlg_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/fm_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/tv_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/loopback"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/stub"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/communication"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/ambient"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/builtin_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/back_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/anlg_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/fm_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/tv_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/loopback"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/stub"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/communication"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/ambient"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/builtin_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/back_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/anlg_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/fm_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/tv_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/loopback"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/stub"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/communication"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/ambient"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/telephony_rx"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/anlg_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/fm_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/tv_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/loopback"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/stub"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/communication"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/ambient"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/telephony_rx"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/back_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/anlg_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/fm_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/tv_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/loopback"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/stub"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/communication"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/ambient"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/telephony_rx"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/anlg_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/fm_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/tv_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/loopback"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/stub"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/communication"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/ambient"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/builtin_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/telephony_rx"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/back_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/anlg_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/fm_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/tv_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/loopback"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/stub"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/communication"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/ambient"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/telephony_rx"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/back_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/anlg_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/fm_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/tv_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/loopback"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/stub"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/communication"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/ambient"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/telephony_rx"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/back_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/anlg_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/fm_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/tv_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/loopback"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/stub"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/communication"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/ambient"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/telephony_rx"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/builtin_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/back_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/anlg_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/tv_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/loopback"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/bus"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/communication">
+          <BitParameter Name="communication">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/ambient">
+          <BitParameter Name="ambient">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/anlg_dock_headset">
+          <BitParameter Name="anlg_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/tv_tuner">
+          <BitParameter Name="tv_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/loopback">
+          <BitParameter Name="loopback">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/communication">
+          <BitParameter Name="communication">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/ambient">
+          <BitParameter Name="ambient">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/anlg_dock_headset">
+          <BitParameter Name="anlg_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/tv_tuner">
+          <BitParameter Name="tv_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/loopback">
+          <BitParameter Name="loopback">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/communication">
+          <BitParameter Name="communication">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/ambient">
+          <BitParameter Name="ambient">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/anlg_dock_headset">
+          <BitParameter Name="anlg_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/tv_tuner">
+          <BitParameter Name="tv_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/loopback">
+          <BitParameter Name="loopback">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/communication">
+          <BitParameter Name="communication">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/ambient">
+          <BitParameter Name="ambient">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/anlg_dock_headset">
+          <BitParameter Name="anlg_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/tv_tuner">
+          <BitParameter Name="tv_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/loopback">
+          <BitParameter Name="loopback">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/communication">
+          <BitParameter Name="communication">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/ambient">
+          <BitParameter Name="ambient">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/anlg_dock_headset">
+          <BitParameter Name="anlg_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/tv_tuner">
+          <BitParameter Name="tv_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/loopback">
+          <BitParameter Name="loopback">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/communication">
+          <BitParameter Name="communication">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/ambient">
+          <BitParameter Name="ambient">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/anlg_dock_headset">
+          <BitParameter Name="anlg_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/tv_tuner">
+          <BitParameter Name="tv_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/loopback">
+          <BitParameter Name="loopback">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/communication">
+          <BitParameter Name="communication">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/ambient">
+          <BitParameter Name="ambient">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/anlg_dock_headset">
+          <BitParameter Name="anlg_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/tv_tuner">
+          <BitParameter Name="tv_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/loopback">
+          <BitParameter Name="loopback">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/communication">
+          <BitParameter Name="communication">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/ambient">
+          <BitParameter Name="ambient">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/anlg_dock_headset">
+          <BitParameter Name="anlg_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/tv_tuner">
+          <BitParameter Name="tv_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/loopback">
+          <BitParameter Name="loopback">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/communication">
+          <BitParameter Name="communication">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/ambient">
+          <BitParameter Name="ambient">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/anlg_dock_headset">
+          <BitParameter Name="anlg_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/tv_tuner">
+          <BitParameter Name="tv_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/loopback">
+          <BitParameter Name="loopback">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/communication">
+          <BitParameter Name="communication">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/ambient">
+          <BitParameter Name="ambient">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/anlg_dock_headset">
+          <BitParameter Name="anlg_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/tv_tuner">
+          <BitParameter Name="tv_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/loopback">
+          <BitParameter Name="loopback">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/communication">
+          <BitParameter Name="communication">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/ambient">
+          <BitParameter Name="ambient">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/anlg_dock_headset">
+          <BitParameter Name="anlg_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/tv_tuner">
+          <BitParameter Name="tv_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/loopback">
+          <BitParameter Name="loopback">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/communication">
+          <BitParameter Name="communication">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/ambient">
+          <BitParameter Name="ambient">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/anlg_dock_headset">
+          <BitParameter Name="anlg_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/tv_tuner">
+          <BitParameter Name="tv_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/loopback">
+          <BitParameter Name="loopback">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForInputSource.DefaultAndMic" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="A2dp">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Sco">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BluetoothScoHeadset"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForRecord" MatchesWhen="Is" Value="ForceBtSco"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BuiltinMic">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BuiltinMic"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Default">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/builtin_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/builtin_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_sco_headset"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="A2dp">
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Sco">
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BuiltinMic">
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Default">
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForInputSource.VoiceUplinkAndVoiceDownlinkAndVoiceCall" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="VoiceCall">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="TelephonyRx"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Default">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/telephony_rx"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/telephony_rx"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/telephony_rx"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="VoiceCall">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Default">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForInputSource.Camcorder" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="BackMic">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BackMic"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BuiltinMic">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BuiltinMic"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Default">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/back_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/builtin_mic"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="BackMic">
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BuiltinMic">
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Default">
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForInputSource.VoiceRecognitionAndHotword" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="ScoHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForRecord" MatchesWhen="Is" Value="ForceBtSco"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BluetoothScoHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BuiltinMic">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BuiltinMic"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Default">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/builtin_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/builtin_mic"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="ScoHeadset">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BuiltinMic">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Default">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForInputSource.VoiceCommunication" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="ScoHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BluetoothScoHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceNone"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceNone"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BuiltinMic">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BuiltinMic"/>
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceNone"/>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Excludes" Value="BackMic"/>
+            </CompoundRule>
+          </CompoundRule>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BackMic">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BackMic"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Default">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/builtin_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/back_mic"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="ScoHeadset">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BuiltinMic">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BackMic">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Default">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForInputSource.RemoteSubmix" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="RemoteSubmix">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="RemoteSubmix"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Default">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/remote_submix"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="RemoteSubmix">
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Default">
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForInputSource.FmTuner" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="FmTuner">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="FmTuner"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Default">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/fm_tuner"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="FmTuner">
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Default">
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="VolumeProfilesForStream.Calibration" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/streams/voice_call/applicable_volume_profile/volume_profile"/>
+      <ConfigurableElement Path="/Policy/policy/streams/system/applicable_volume_profile/volume_profile"/>
+      <ConfigurableElement Path="/Policy/policy/streams/ring/applicable_volume_profile/volume_profile"/>
+      <ConfigurableElement Path="/Policy/policy/streams/music/applicable_volume_profile/volume_profile"/>
+      <ConfigurableElement Path="/Policy/policy/streams/alarm/applicable_volume_profile/volume_profile"/>
+      <ConfigurableElement Path="/Policy/policy/streams/notification/applicable_volume_profile/volume_profile"/>
+      <ConfigurableElement Path="/Policy/policy/streams/bluetooth_sco/applicable_volume_profile/volume_profile"/>
+      <ConfigurableElement Path="/Policy/policy/streams/enforced_audible/applicable_volume_profile/volume_profile"/>
+      <ConfigurableElement Path="/Policy/policy/streams/tts/applicable_volume_profile/volume_profile"/>
+      <ConfigurableElement Path="/Policy/policy/streams/accessibility/applicable_volume_profile/volume_profile"/>
+      <ConfigurableElement Path="/Policy/policy/streams/rerouting/applicable_volume_profile/volume_profile"/>
+      <ConfigurableElement Path="/Policy/policy/streams/patch/applicable_volume_profile/volume_profile"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/streams/voice_call/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">voice_call</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/system/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">system</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/ring/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">ring</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/music/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">music</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/alarm/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">alarm</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/notification/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">notification</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/bluetooth_sco/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">bluetooth_sco</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/enforced_audible/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">enforced_audible</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/tts/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">tts</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/accessibility/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">accessibility</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/rerouting/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">rerouting</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/patch/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">patch</EnumParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="VolumeProfilesForStream.Dtmf" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="InCall">
+        <CompoundRule Type="Any">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="OutOfCall">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/streams/dtmf/applicable_volume_profile/volume_profile"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="InCall">
+        <ConfigurableElement Path="/Policy/policy/streams/dtmf/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">voice_call</EnumParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="OutOfCall">
+        <ConfigurableElement Path="/Policy/policy/streams/dtmf/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">dtmf</EnumParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+</ConfigurableDomains>
diff --git a/common/audio/reference_configurable_audio_policy/Settings/device_for_input_source.pfw b/common/audio/reference_configurable_audio_policy/Settings/device_for_input_source.pfw
new file mode 100644
index 000000000..a9908798e
--- /dev/null
+++ b/common/audio/reference_configurable_audio_policy/Settings/device_for_input_source.pfw
@@ -0,0 +1,579 @@
+supDomain: DeviceForInputSource
+	domain: Calibration
+		conf: Calibration
+			component: /Policy/policy/input_sources/default/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 0
+			component: /Policy/policy/input_sources/mic/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 0
+			component: /Policy/policy/input_sources/voice_downlink/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 0
+			component: /Policy/policy/input_sources/voice_call/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 0
+			component: /Policy/policy/input_sources/voice_uplink/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 0
+			component: /Policy/policy/input_sources/camcorder/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 0
+			component: /Policy/policy/input_sources/voice_recognition/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 0
+			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				hdmi = 0
+				telephony_rx = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 0
+			component: /Policy/policy/input_sources/remote_submix/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 0
+			component: /Policy/policy/input_sources/hotword/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 0
+			component: /Policy/policy/input_sources/unprocessed/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 0
+			component: /Policy/policy/input_sources/fm_tuner/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				bluetooth_sco_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				builtin_mic = 0
+				wired_headset = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 0
+
+	domain: DefaultAndMic
+		conf: A2dp
+			AvailableInputDevices Includes BluetoothA2dp
+
+			component: /Policy/policy/input_sources
+				component: default/applicable_input_device/mask/
+					bluetooth_a2dp = 1
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 0
+					bluetooth_sco_headset = 0
+				component: mic/applicable_input_device/mask/
+					bluetooth_a2dp = 1
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 0
+					bluetooth_sco_headset = 0
+
+		conf: Sco
+			AvailableInputDevices Includes BluetoothScoHeadset
+			ForceUseForRecord Is ForceBtSco
+
+			component: /Policy/policy/input_sources
+				component: default/applicable_input_device/mask/
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 0
+					bluetooth_sco_headset = 1
+				component: mic/applicable_input_device/mask/
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 0
+					bluetooth_sco_headset = 1
+
+		conf: WiredHeadset
+			AvailableInputDevices Includes WiredHeadset
+
+			component: /Policy/policy/input_sources
+				component: default/applicable_input_device/mask/
+					bluetooth_a2dp = 0
+					wired_headset = 1
+					usb_device = 0
+					builtin_mic = 0
+					bluetooth_sco_headset = 0
+				component: mic/applicable_input_device/mask/
+					bluetooth_a2dp = 0
+					wired_headset = 1
+					usb_device = 0
+					builtin_mic = 0
+					bluetooth_sco_headset = 0
+
+		conf: UsbDevice
+			AvailableInputDevices Includes UsbDevice
+
+			component: /Policy/policy/input_sources
+				component: default/applicable_input_device/mask/
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					usb_device = 1
+					builtin_mic = 0
+					bluetooth_sco_headset = 0
+				component: mic/applicable_input_device/mask/
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					usb_device = 1
+					builtin_mic = 0
+					bluetooth_sco_headset = 0
+
+		conf: BuiltinMic
+			AvailableInputDevices Includes BuiltinMic
+
+			component: /Policy/policy/input_sources
+				component: default/applicable_input_device/mask/
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 1
+					bluetooth_sco_headset = 0
+				component: mic/applicable_input_device/mask/
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 1
+					bluetooth_sco_headset = 0
+
+		conf: Default
+			component: /Policy/policy/input_sources
+				component: default/applicable_input_device/mask/
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 0
+					bluetooth_sco_headset = 0
+				component: mic/applicable_input_device/mask/
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 0
+					bluetooth_sco_headset = 0
+
+	domain: VoiceUplinkAndVoiceDownlinkAndVoiceCall
+		conf: VoiceCall
+			AvailableInputDevices Includes TelephonyRx
+
+			component: /Policy/policy/input_sources
+				voice_downlink/applicable_input_device/mask/telephony_rx = 1
+				voice_call/applicable_input_device/mask/telephony_rx = 1
+				voice_uplink/applicable_input_device/mask/telephony_rx = 1
+
+		conf: Default
+			component: /Policy/policy/input_sources
+				voice_downlink/applicable_input_device/mask/telephony_rx = 0
+				voice_call/applicable_input_device/mask/telephony_rx = 0
+				voice_uplink/applicable_input_device/mask/telephony_rx = 0
+
+	domain: Camcorder
+		conf: BackMic
+			AvailableInputDevices Includes BackMic
+
+			component: /Policy/policy/input_sources/camcorder/applicable_input_device/mask
+				back_mic = 1
+				builtin_mic = 0
+
+		conf: BuiltinMic
+			AvailableInputDevices Includes BuiltinMic
+
+			component: /Policy/policy/input_sources/camcorder/applicable_input_device/mask
+				back_mic = 0
+				builtin_mic = 1
+
+		conf: Default
+			component: /Policy/policy/input_sources/camcorder/applicable_input_device/mask
+				back_mic = 0
+				builtin_mic = 0
+
+	domain: VoiceRecognitionAndUnprocessedAndHotword
+		conf: ScoHeadset
+			ForceUseForRecord Is ForceBtSco
+			AvailableInputDevices Includes BluetoothScoHeadset
+
+			component: /Policy/policy/input_sources
+				component: voice_recognition/applicable_input_device/mask
+					bluetooth_sco_headset = 1
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 0
+				component: unprocessed/applicable_input_device/mask
+					bluetooth_sco_headset = 1
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 0
+				component: hotword/applicable_input_device/mask
+					bluetooth_sco_headset = 1
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 0
+
+		conf: WiredHeadset
+			AvailableInputDevices Includes WiredHeadset
+
+			component: /Policy/policy/input_sources
+				component: voice_recognition/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 1
+					usb_device = 0
+					builtin_mic = 0
+				component: unprocessed/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 1
+					usb_device = 0
+					builtin_mic = 0
+				component: hotword/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 1
+					usb_device = 0
+					builtin_mic = 0
+
+		conf: UsbDevice
+			AvailableInputDevices Includes UsbDevice
+
+			component: /Policy/policy/input_sources
+				component: voice_recognition/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 0
+					usb_device = 1
+					builtin_mic = 0
+				component: unprocessed/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 0
+					usb_device = 1
+					builtin_mic = 0
+				component: hotword/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 0
+					usb_device = 1
+					builtin_mic = 0
+
+		conf: BuiltinMic
+			AvailableInputDevices Includes BuiltinMic
+
+			component: /Policy/policy/input_sources
+				component: voice_recognition/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 1
+				component: unprocessed/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 1
+				component: hotword/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 1
+
+		conf: Default
+			component: /Policy/policy/input_sources
+				component: voice_recognition/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 0
+				component: unprocessed/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 0
+				component: hotword/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 0
+
+	domain: VoiceCommunication
+		conf: ScoHeadset
+			#
+			# SCO device may be requested but no SCO device is available
+			#
+			ForceUseForCommunication Is ForceBtSco
+			AvailableInputDevices Includes BluetoothScoHeadset
+
+			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
+				bluetooth_sco_headset = 1
+				wired_headset = 0
+				usb_device = 0
+				builtin_mic = 0
+				back_mic = 0
+
+		conf: WiredHeadset
+			ForceUseForCommunication Is ForceNone
+			AvailableInputDevices Includes WiredHeadset
+
+			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
+				bluetooth_sco_headset = 0
+				wired_headset = 1
+				usb_device = 0
+				builtin_mic = 0
+				back_mic = 0
+
+		conf: UsbDevice
+			ForceUseForCommunication Is ForceNone
+			AvailableInputDevices Includes UsbDevice
+
+			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				usb_device = 1
+				builtin_mic = 0
+				back_mic = 0
+
+		conf: BuiltinMic
+			AvailableInputDevices Includes BuiltinMic
+			ANY
+				ForceUseForCommunication Is ForceNone
+				ALL
+					ForceUseForCommunication Is ForceSpeaker
+					AvailableInputDevices Excludes BackMic
+
+			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				usb_device = 0
+				builtin_mic = 1
+				back_mic = 0
+
+		conf: BackMic
+			ForceUseForCommunication Is ForceSpeaker
+			AvailableInputDevices Includes BackMic
+
+			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				usb_device = 0
+				builtin_mic = 0
+				back_mic = 1
+
+		conf: Default
+			#
+			# Fallback on the default input device which can be builtin mic for example
+			#
+			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				usb_device = 0
+				builtin_mic = 1
+				back_mic = 0
+
+	domain: RemoteSubmix
+		conf: RemoteSubmix
+			AvailableInputDevices Includes RemoteSubmix
+
+			component: /Policy/policy/input_sources/remote_submix/applicable_input_device/mask
+				remote_submix = 1
+
+		conf: Default
+			component: /Policy/policy/input_sources/remote_submix/applicable_input_device/mask
+				remote_submix = 0
+
+	domain: FmTuner
+		conf: FmTuner
+			AvailableInputDevices Includes FmTuner
+
+			component: /Policy/policy/input_sources/fm_tuner/applicable_input_device/mask
+				fm_tuner = 1
+
+		conf: Default
+			component: /Policy/policy/input_sources/fm_tuner/applicable_input_device/mask
+				fm_tuner = 0
+
diff --git a/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_accessibility.pfw b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_accessibility.pfw
new file mode 100644
index 000000000..ecd56b02f
--- /dev/null
+++ b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_accessibility.pfw
@@ -0,0 +1,593 @@
+supDomain: DeviceForStrategy
+
+	supDomain: Accessibility
+		#
+		# STRATEGY_ACCESSIBILITY follows STRATEGY_PHONE if in call widely speaking
+		# STRATEGY_ACCESSIBILITY follows STRATEGY_MEDIA otherwise
+		#
+		# Other case are handled programmatically has involving activity of streams.
+		#
+		domain: UnreachableDevices
+			conf: Calibration
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					hdmi_arc = 0
+					spdif = 0
+					aux_line = 0
+					fm = 0
+					speaker_safe = 0
+					telephony_tx = 0
+					ip = 0
+					bus = 0
+					stub = 0
+
+		domain: Device
+			conf: RemoteSubmix
+				#
+				# Accessibility follows Media strategy if not in call
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes RemoteSubmix
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 1
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: BluetoothA2dp
+				#
+				# Accessibility falls through media strategy if not in call (widely speaking)
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				AvailableOutputDevices Includes BluetoothA2dp
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 1
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: BluetoothA2dpHeadphone
+				#
+				# Accessibility falls through media strategy if not in call (widely speaking)
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				AvailableOutputDevices Includes BluetoothA2dpHeadphones
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 1
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: BluetoothA2dpSpeaker
+				#
+				# Accessibility falls through media strategy if not in call (widely speaking)
+				#
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes BluetoothA2dpSpeaker
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 1
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: ForceSpeakerWhenNotInCall
+				#
+				# Accessibility follows Media strategy if not in call
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia Is ForceSpeaker
+				AvailableOutputDevices Includes Speaker
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 1
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: BluetoothScoCarkit
+				#
+				# accessibility falls through Phone strategy if in call
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				AvailableOutputDevices Includes BluetoothScoCarkit
+				ForceUseForCommunication Is ForceBtSco
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 1
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: BluetoothScoHeadset
+				#
+				# accessibility falls through Phone strategy if in call
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				AvailableOutputDevices Includes BluetoothScoHeadset
+				ForceUseForCommunication Is ForceBtSco
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 1
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: BluetoothSco
+				#
+				# accessibility falls through Phone strategy if in call
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				AvailableOutputDevices Includes BluetoothSco
+				ForceUseForCommunication Is ForceBtSco
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 1
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: WiredHeadphone
+				ANY
+					#
+					# accessibility falls through Phone strategy if in call
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+					#
+					# accessibility follows Media strategy if not in call
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes WiredHeadphone
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 1
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: Line
+				ANY
+					#
+					# accessibility falls through Phone strategy if in call
+					# but Line has a lower priority than WiredHeadset in this case.
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+						AvailableOutputDevices Excludes WiredHeadset
+					#
+					# accessibility follows Media strategy if not in call
+					#
+				AvailableOutputDevices Includes Line
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 1
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: WiredHeadset
+				ANY
+					#
+					# accessibility falls through Phone strategy if in call
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+					#
+					# accessibility follows Media strategy if not in call
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes WiredHeadset
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 1
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: UsbDevice
+				ANY
+					#
+					# accessibility falls through Phone strategy if in call (widely speaking)
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+					#
+					# accessibility follows Media strategy if not in call
+					# Media strategy inverts the priority of USB device vs accessory
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						AvailableOutputDevices Excludes UsbAccessory
+						ForceUseForCommunication Is ForceSpeaker
+				AvailableOutputDevices Includes UsbDevice
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 1
+					hdmi = 0
+
+			conf: UsbAccessory
+				#
+				# accessibility falls through Phone strategy if in call (widely speaking)
+				# but USB accessory not reachable in call
+				#
+				# accessibility follows Media strategy if not in call
+				# Media strategy inverts the priority of USB device vs accessory
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes UsbAccessory
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 1
+					usb_device = 0
+					hdmi = 0
+
+			conf: DgtlDockHeadset
+				#
+				# accessibility falls through Phone strategy if in call (widely speaking)
+				# but DgtlDockHeadset not reachable in call
+				#
+				# accessibility follows Media strategy if not in call
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes DgtlDockHeadset
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 1
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: AuxDigital
+				#
+				# accessibility falls through Phone strategy if in call (widely speaking)
+				# but Hdmi not reachable in call
+				#
+				# accessibility follows Media strategy if not in call
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes Hdmi
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 1
+
+			conf: AnlgDockHeadset
+				#
+				# accessibility falls through Phone strategy if in call (widely speaking)
+				# but AnlgDockHeadset not reachable in call
+				#
+				# accessibility follows Media strategy if not in call
+				# Media strategy inverts the priority of USB device vs accessory
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes AnlgDockHeadset
+				ForceUseForDock Is ForceAnalogDock
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 1
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: Earpiece
+				#
+				# accessibility falls through Phone strategy if in call
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				AvailableOutputDevices Includes Earpiece
+				ForceUseForCommunication IsNot ForceSpeaker
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 1
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: Speaker
+				AvailableOutputDevices Includes Speaker
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 1
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: Default
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
diff --git a/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_dtmf.pfw b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_dtmf.pfw
new file mode 100644
index 000000000..883c741af
--- /dev/null
+++ b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_dtmf.pfw
@@ -0,0 +1,623 @@
+supDomain: DeviceForStrategy
+
+	supDomain: Dtmf
+
+		domain: UnreachableDevices
+			conf: Calibration
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					fm = 0
+					speaker_safe = 0
+					bluetooth_sco_carkit = 0
+					ip = 0
+					bus = 0
+					stub = 0
+
+		domain: Device2
+			conf: RemoteSubmix
+				#
+				# DTMF follows Media strategy if not in call
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes RemoteSubmix
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 1
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: BluetoothA2dp
+				#
+				# DTMF follows Media strategy if not in call
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				AvailableOutputDevices Includes BluetoothA2dp
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 1
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: BluetoothA2dpHeadphones
+				#
+				# DTMF follows Media strategy if not in call
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				AvailableOutputDevices Includes BluetoothA2dpHeadphones
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 1
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: BluetoothA2dpSpeaker
+				#
+				# DTMF follows Media strategy if not in call
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				AvailableOutputDevices Includes BluetoothA2dpSpeaker
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 1
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: ForceSpeakerWhenNotInCall
+				#
+				# DTMF follows Media strategy if not in call
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia Is ForceSpeaker
+				ForceUseForHdmiSystemAudio IsNot ForceHdmiSystemEnforced
+				AvailableOutputDevices Includes Speaker
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 1
+
+			conf: BluetoothScoHeadset
+				#
+				# DTMF falls through Phone strategy if in call
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				AvailableOutputDevices Includes BluetoothScoHeadset
+				ForceUseForCommunication Is ForceBtSco
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 1
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: BluetoothSco
+				#
+				# DTMF falls through Phone strategy if in call
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				AvailableOutputDevices Includes BluetoothSco
+				ForceUseForCommunication Is ForceBtSco
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 1
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: WiredHeadphone
+				ANY
+					#
+					# DTMF falls through Phone strategy if in call
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+					#
+					# DTMF follows Media strategy if not in call
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes WiredHeadphone
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 1
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: Line
+				ANY
+					#
+					# DTMF falls through Phone strategy if in call
+					# but Line has a lower priority than WiredHeadset in this case.
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+						AvailableOutputDevices Excludes WiredHeadset
+					#
+					# DTMF follows Media strategy if not in call
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes Line
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 1
+					speaker = 0
+
+			conf: WiredHeadset
+				ANY
+					#
+					# DTMF falls through Phone strategy if in call
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+					#
+					# DTMF follows Media strategy if not in call
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes WiredHeadset
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 1
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: UsbDevice
+				ANY
+					#
+					# DTMF falls through Phone strategy if in call (widely speaking)
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+					#
+					# DTMF follows Media strategy if not in call
+					# Media strategy inverts the priority of USB device vs accessory
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						AvailableOutputDevices Excludes UsbAccessory
+						ForceUseForCommunication Is ForceSpeaker
+				AvailableOutputDevices Includes UsbDevice
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 1
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: UsbAccessory
+				#
+				# DTMF falls through Phone strategy if in call (widely speaking)
+				# but USB accessory not reachable in call
+				#
+				# DTMF follows Media strategy if not in call
+				# Media strategy inverts the priority of USB device vs accessory
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes UsbAccessory
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 1
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: DgtlDockHeadset
+				#
+				# DTMF falls through Phone strategy if in call (widely speaking)
+				# but DgtlDockHeadset not reachable in call
+				#
+				# DTMF follows Media strategy if not in call
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes DgtlDockHeadset
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 1
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: Hdmi
+				#
+				# DTMF falls through Phone strategy if in call (widely speaking)
+				# but Hdmi not reachable in call
+				#
+				# DTMF follows Media strategy if not in call
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes Hdmi
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 1
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: AnlgDockHeadset
+				#
+				# DTMF falls through Phone strategy if in call (widely speaking)
+				# but AnlgDockHeadset not reachable in call
+				#
+				# DTMF follows Media strategy if not in call
+				# Media strategy inverts the priority of USB device vs accessory
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForDock Is ForceAnalogDock
+				AvailableOutputDevices Includes AnlgDockHeadset
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 1
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: Earpiece
+				#
+				# DTMF falls through Phone strategy if in call
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				AvailableOutputDevices Includes Earpiece
+				ForceUseForCommunication IsNot ForceSpeaker
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 1
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: Speaker
+				ANY
+					#
+					# DTMF falls through Phone strategy if in call
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication Is ForceSpeaker
+					#
+					# DTMF follows Media strategy if not in call
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						ForceUseForHdmiSystemAudio IsNot ForceHdmiSystemEnforced
+				AvailableOutputDevices Includes Speaker
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 1
+
+			conf: Default
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+		domain: Arc
+			#
+			# DTMF strategy follows media strategy if not in call
+			# these following domains consists in device(s) that can co-exist with others
+			# e.g. ARC, SPDIF, AUX_LINE
+			#
+			conf: Selected
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes HdmiArc
+
+				/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi_arc = 1
+
+			conf: NotSelected
+				/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi_arc = 0
+
+		domain: Spdif
+			#
+			# DTMF strategy follows media strategy if not in call
+			# these following domains consists in device(s) that can co-exist with others
+			# e.g. ARC, SPDIF, AUX_LINE
+			#
+			conf: Selected
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes Spdif
+
+				/Policy/policy/strategies/dtmf/selected_output_devices/mask/spdif = 1
+
+			conf: NotSelected
+				/Policy/policy/strategies/dtmf/selected_output_devices/mask/spdif = 0
+
+		domain: AuxLine
+			#
+			# DTMF strategy follows media strategy if not in call
+			# these following domains consists in device(s) that can co-exist with others
+			# e.g. ARC, SPDIF, AUX_LINE
+			#
+			conf: Selected
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes AuxLine
+
+				/Policy/policy/strategies/dtmf/selected_output_devices/mask/aux_line = 1
+
+			conf: NotSelected
+				/Policy/policy/strategies/dtmf/selected_output_devices/mask/aux_line = 0
diff --git a/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_enforced_audible.pfw b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_enforced_audible.pfw
new file mode 100644
index 000000000..f5046319b
--- /dev/null
+++ b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_enforced_audible.pfw
@@ -0,0 +1,358 @@
+supDomain: DeviceForStrategy
+
+	supDomain: EnforcedAudible
+
+		domain: UnreachableDevices
+			conf: Calibration
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					# no enforced_audible on remote submix (e.g. WFD)
+					hdmi_arc = 0
+					spdif = 0
+					aux_line = 0
+					speaker_safe = 0
+					ip = 0
+					bus = 0
+					fm = 0
+					stub = 0
+
+		domain: Speaker
+			conf: Selected
+				#
+				# strategy STRATEGY_ENFORCED_AUDIBLE uses same routing policy as STRATEGY_SONIFICATION
+				# except:
+				#    - when in call where it doesn't default to STRATEGY_PHONE behavior
+				#    - in countries where not enforced in which case it follows STRATEGY_MEDIA
+				#
+				AvailableOutputDevices Includes Speaker
+				ANY
+					ForceUseForSystem Is ForceSystemEnforced
+					ALL
+						ForceUseForMedia Is ForceSpeaker
+						AvailableOutputDevices Excludes RemoteSubmix
+						ANY
+							ForceUseForMedia IsNot ForceNoBtA2dp
+							AvailableOutputDevices Excludes BluetoothA2dp
+							AvailableOutputDevices Excludes BluetoothA2dpHeadphones
+							AvailableOutputDevices Excludes BluetoothA2dpSpeaker
+					#
+					# Speaker is also the fallback device if any of the device from Device2 domain
+					# is selected.
+					#
+					ALL
+						AvailableOutputDevices Excludes RemoteSubmix
+						AvailableOutputDevices Excludes WiredHeadphone
+						AvailableOutputDevices Excludes Line
+						AvailableOutputDevices Excludes WiredHeadset
+						AvailableOutputDevices Excludes UsbAccessory
+						AvailableOutputDevices Excludes UsbDevice
+						AvailableOutputDevices Excludes DgtlDockHeadset
+						AvailableOutputDevices Excludes Hdmi
+						ANY
+							AvailableOutputDevices Excludes AnlgDockHeadset
+							ForceUseForDock IsNot ForceAnalogDock
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					speaker = 1
+
+			conf: NotSelected
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					speaker = 0
+
+		domain: Device2
+			conf: RemoteSubmix
+				AvailableOutputDevices Includes RemoteSubmix
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 1
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+
+			conf: BluetoothA2dp
+				AvailableOutputDevices Includes BluetoothA2dp
+				ForceUseForMedia IsNot ForceNoBtA2dp
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 1
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+
+			conf: BluetoothA2dpHeadphones
+				AvailableOutputDevices Includes BluetoothA2dpHeadphones
+				ForceUseForMedia IsNot ForceNoBtA2dp
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 1
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+
+			conf: BluetoothA2dpSpeaker
+				AvailableOutputDevices Includes BluetoothA2dpSpeaker
+				ForceUseForMedia IsNot ForceNoBtA2dp
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 1
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+
+			conf: WiredHeadphone
+				ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes WiredHeadphone
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 1
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+
+			conf: Line
+				ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes Line
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 1
+
+			conf: WiredHeadset
+				ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes WiredHeadset
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 1
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+
+			conf: UsbAccessory
+				ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes UsbAccessory
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 1
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+
+			conf: UsbDevice
+				ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes UsbDevice
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 1
+					telephony_tx = 0
+					line = 0
+
+			conf: DgtlDockHeadset
+				ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes DgtlDockHeadset
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 1
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+
+			conf: Hdmi
+				ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes Hdmi
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 1
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+
+			conf: AnlgDockHeadset
+				ForceUseForMedia IsNot ForceSpeaker
+				ForceUseForDock Is ForceAnalogDock
+				AvailableOutputDevices Includes AnlgDockHeadset
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 1
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+
+			conf: NoDevice
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+
+
diff --git a/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_media.pfw b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_media.pfw
new file mode 100644
index 000000000..bdb6ae0f7
--- /dev/null
+++ b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_media.pfw
@@ -0,0 +1,338 @@
+domainGroup: DeviceForStrategy
+
+	domainGroup: Media
+
+		domain: UnreachableDevices
+			conf: Calibration
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					fm = 0
+					speaker_safe = 0
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					telephony_tx = 0
+					ip = 0
+					bus = 0
+					stub = 0
+
+		domain: Device2
+			conf: RemoteSubmix
+				AvailableOutputDevices Includes RemoteSubmix
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 1
+					line = 0
+
+			conf: BluetoothA2dp
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				ForceUseForCommunication IsNot ForceBtSco
+				AvailableOutputDevices Includes BluetoothA2dp
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 1
+					remote_submix = 0
+					line = 0
+
+			conf: BluetoothA2dpHeadphone
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				ForceUseForCommunication IsNot ForceBtSco
+				AvailableOutputDevices Includes BluetoothA2dpHeadphones
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 1
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 0
+
+			conf: BluetoothA2dpSpeaker
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				ForceUseForCommunication IsNot ForceBtSco
+				AvailableOutputDevices Includes BluetoothA2dpSpeaker
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 1
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 0
+
+			conf: ForceSpeaker
+				ForceUseForMedia Is ForceSpeaker
+				AvailableOutputDevices Includes Speaker
+				#
+				# If hdmi system audio mode is on, remove speaker out of output list.
+				#
+				ForceUseForHdmiSystemAudio IsNot ForceHdmiSystemEnforced
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 1
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 0
+
+			conf: WiredHeadphone
+				AvailableOutputDevices Includes WiredHeadphone
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 1
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 0
+
+			conf: Line
+				AvailableOutputDevices Includes Line
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 1
+
+			conf: WiredHeadset
+				AvailableOutputDevices Includes WiredHeadset
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 1
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 0
+
+			conf: UsbAccessory
+				AvailableOutputDevices Includes UsbAccessory
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 1
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 0
+
+			conf: UsbDevice
+				AvailableOutputDevices Includes UsbDevice
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 1
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 0
+
+			conf: DgtlDockHeadset
+				AvailableOutputDevices Includes DgtlDockHeadset
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 0
+					dgtl_dock_headset = 1
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 0
+
+			conf: AuxDigital
+				AvailableOutputDevices Includes Hdmi
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 1
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 0
+
+			conf: AnlgDockHeadset
+				AvailableOutputDevices Includes AnlgDockHeadset
+				ForceUseForDock Is ForceAnalogDock
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 1
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 0
+
+			conf: Speaker
+				AvailableOutputDevices Includes Speaker
+				#
+				# If hdmi system audio mode is on, remove speaker out of output list.
+				#
+				ForceUseForHdmiSystemAudio IsNot ForceHdmiSystemEnforced
+				ForceUseForCommunication IsNot ForceBtSco
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 1
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 0
+
+			conf: Default
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 0
+
+		domain: Arc
+			#
+			# these following domains consists in device(s) that can co-exist with others
+			# e.g. ARC, SPDIF, AUX_LINE
+			#
+			conf: Selected
+				AvailableOutputDevices Includes HdmiArc
+
+				/Policy/policy/strategies/media/selected_output_devices/mask/hdmi_arc = 1
+
+			conf: NotSelected
+				/Policy/policy/strategies/media/selected_output_devices/mask/hdmi_arc = 0
+
+		domain: Spdif
+			#
+			# these following domains consists in device(s) that can co-exist with others
+			# e.g. ARC, SPDIF, AUX_LINE
+			#
+			conf: Selected
+				AvailableOutputDevices Includes Spdif
+
+				/Policy/policy/strategies/media/selected_output_devices/mask/spdif = 1
+
+			conf: NotSelected
+				/Policy/policy/strategies/media/selected_output_devices/mask/spdif = 0
+
+		domain: AuxLine
+			conf: Selected
+				AvailableOutputDevices Includes AuxLine
+
+				/Policy/policy/strategies/media/selected_output_devices/mask/aux_line = 1
+
+			conf: NotSelected
+				/Policy/policy/strategies/media/selected_output_devices/mask/aux_line = 0
diff --git a/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_phone.pfw b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_phone.pfw
new file mode 100644
index 000000000..d371ad9ec
--- /dev/null
+++ b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_phone.pfw
@@ -0,0 +1,483 @@
+supDomain: DeviceForStrategy
+
+	supDomain: Phone
+
+		domain: UnreachableDevices
+			conf: Calibration
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					# no sonification on remote submix (e.g. WFD)
+					remote_submix = 0
+					hdmi_arc = 0
+					aux_line = 0
+					spdif = 0
+					fm = 0
+					speaker_safe = 0
+					ip = 0
+					bus = 0
+					stub = 0
+
+		domain: Device
+			conf: ScoCarkit
+				AvailableOutputDevices Includes BluetoothScoCarkit
+				ForceUseForCommunication Is ForceBtSco
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 1
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: BluetoothScoHeadset
+				AvailableOutputDevices Includes BluetoothScoHeadset
+				ForceUseForCommunication Is ForceBtSco
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 1
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: BluetoothSco
+				AvailableOutputDevices Includes BluetoothSco
+				ForceUseForCommunication Is ForceBtSco
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 1
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: BluetoothA2dp
+				#
+				# Fallback BT Sco devices in case of FORCE_BT_SCO
+				# or FORCE_NONE
+				#
+				AvailableOutputDevices Includes BluetoothA2dp
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				ForceUseForCommunication Is ForceNone
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 1
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: BluetoothA2dpHeadphones
+				#
+				# Fallback BT Sco devices in case of FORCE_BT_SCO
+				# or FORCE_NONE
+				#
+				AvailableOutputDevices Includes BluetoothA2dpHeadphones
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				ForceUseForCommunication Is ForceNone
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 1
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: BluetoothA2dpSpeaker
+				#
+				# Fallback BT Sco devices in case of FORCE_BT_SCO
+				# or FORCE_NONE
+				#
+				AvailableOutputDevices Includes BluetoothA2dpSpeaker
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				ForceUseForCommunication Is ForceSpeaker
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 1
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: WiredHeadphone
+				#
+				# Fallback BT Sco devices in case of FORCE_BT_SCO
+				# or FORCE_NONE
+				#
+				AvailableOutputDevices Includes WiredHeadphone
+				ForceUseForCommunication IsNot ForceSpeaker
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 1
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: WiredHeadset
+				#
+				# Fallback BT Sco devices in case of FORCE_BT_SCO
+				# or FORCE_NONE
+				#
+				AvailableOutputDevices Includes WiredHeadset
+				ForceUseForCommunication IsNot ForceSpeaker
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 1
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: Line
+				AvailableOutputDevices Includes Line
+				ForceUseForCommunication IsNot ForceSpeaker
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 1
+					speaker = 0
+
+			conf: UsbDevice
+				#
+				# Fallback BT Sco devices in case of FORCE_BT_SCO
+				# or FORCE_NONE
+				#
+				AvailableOutputDevices Includes UsbDevice
+				ANY
+					ForceUseForCommunication Is ForceBtSco
+					ForceUseForCommunication Is ForceNone
+					ALL
+						ForceUseForCommunication Is ForceSpeaker
+						#
+						# In case of Force Speaker, priority between device and accessory are
+						# inverted compared to Force None or Bt Sco
+						#
+						AvailableOutputDevices Excludes UsbAccessory
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 1
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: UsbAccessory
+				#
+				# Fallback BT Sco devices in case of FORCE_BT_SCO
+				# or FORCE_NONE
+				#
+				AvailableOutputDevices Includes UsbAccessory
+				TelephonyMode IsNot InCommunication
+				TelephonyMode IsNot InCall
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 1
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: DgtlDockHeadset
+				#
+				# Fallback BT Sco devices in case of FORCE_BT_SCO
+				# or FORCE_NONE
+				#
+				AvailableOutputDevices Includes DgtlDockHeadset
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 1
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: Hdmi
+				#
+				# Fallback BT Sco devices in case of FORCE_BT_SCO
+				# or FORCE_NONE
+				#
+				AvailableOutputDevices Includes Hdmi
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 1
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: AnlgDockHeadset
+				#
+				# Fallback BT Sco devices in case of FORCE_BT_SCO
+				# or FORCE_NONE
+				#
+				AvailableOutputDevices Includes AnlgDockHeadset
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 1
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: Earpiece
+				#
+				# Fallback BT Sco devices in case of FORCE_BT_SCO
+				# or FORCE_NONE
+				#
+				AvailableOutputDevices Includes Earpiece
+				ForceUseForCommunication IsNot ForceSpeaker
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 1
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: Speaker
+				#
+				# Fallback BT Sco devices in case of FORCE_BT_SCO
+				# or FORCE_NONE
+				#
+				AvailableOutputDevices Includes Speaker
+				ForceUseForCommunication Is ForceSpeaker
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 1
+
+			conf: Default
+				#
+				# Fallback on default output device which can be speaker for example
+				#
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 1
+
+
diff --git a/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_rerouting.pfw b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_rerouting.pfw
new file mode 100644
index 000000000..04e62f76d
--- /dev/null
+++ b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_rerouting.pfw
@@ -0,0 +1,300 @@
+domainGroup: DeviceForStrategy
+
+	domainGroup: Rerouting
+		#
+		# Falls through media strategy
+		#
+		domain: UnreachableDevices
+			conf: Calibration
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					hdmi_arc = 0
+					spdif = 0
+					aux_line = 0
+					fm = 0
+					speaker_safe = 0
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					telephony_tx = 0
+					ip = 0
+					bus = 0
+					stub = 0
+
+		domain: Device2
+			conf: RemoteSubmix
+				AvailableOutputDevices Includes RemoteSubmix
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 1
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: BluetoothA2dp
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				AvailableOutputDevices Includes BluetoothA2dp
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 1
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: BluetoothA2dpHeadphone
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				AvailableOutputDevices Includes BluetoothA2dpHeadphones
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 1
+					bluetooth_a2dp_speaker = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: BluetoothA2dpSpeaker
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				AvailableOutputDevices Includes BluetoothA2dpSpeaker
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 1
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: ForceSpeaker
+				ForceUseForMedia Is ForceSpeaker
+				AvailableOutputDevices Includes Speaker
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 1
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: WiredHeadphone
+				AvailableOutputDevices Includes WiredHeadphone
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 1
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: Line
+				AvailableOutputDevices Includes Line
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 1
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: WiredHeadset
+				AvailableOutputDevices Includes WiredHeadset
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 0
+					wired_headset = 1
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: UsbAccessory
+				AvailableOutputDevices Includes UsbAccessory
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 1
+					usb_device = 0
+					hdmi = 0
+
+			conf: UsbDevice
+				AvailableOutputDevices Includes UsbDevice
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 1
+					hdmi = 0
+
+			conf: DgtlDockHeadset
+				AvailableOutputDevices Includes DgtlDockHeadset
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 1
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: AuxDigital
+				#
+				# Rerouting is similar to media and sonification (exept here: sonification is not allowed on HDMI)
+				#
+				AvailableOutputDevices Includes Hdmi
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 1
+
+			conf: AnlgDockHeadset
+				AvailableOutputDevices Includes AnlgDockHeadset
+				ForceUseForDock Is ForceAnalogDock
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 1
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: Speaker
+				AvailableOutputDevices Includes Speaker
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 1
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: Default
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
diff --git a/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification.pfw b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification.pfw
new file mode 100644
index 000000000..70740d149
--- /dev/null
+++ b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification.pfw
@@ -0,0 +1,490 @@
+supDomain: DeviceForStrategy
+
+	supDomain: Sonification
+
+		domain: UnreachableDevices
+			conf: Calibration
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					# no sonification on remote submix (e.g. WFD)
+					remote_submix = 0
+					hdmi_arc = 0
+					spdif = 0
+					fm = 0
+					speaker_safe = 0
+					aux_line = 0
+					#
+					# Sonification follows phone strategy if in call but HDMI is not reachable
+					#
+					hdmi = 0
+					ip = 0
+					bus = 0
+					stub = 0
+
+		domain: Speaker
+
+			conf: Selected
+				AvailableOutputDevices Includes Speaker
+				ANY
+					#
+					# Sonification falls through ENFORCED_AUDIBLE if not in call (widely speaking)
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+					ALL
+						#
+						# Sonification follows phone strategy if in call (widely speaking)
+						#
+						ForceUseForCommunication Is ForceSpeaker
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						AvailableOutputDevices Excludes Line
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					speaker = 1
+
+			conf: NotSelected
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					speaker = 0
+
+		domain: Device2
+
+			conf: BluetoothA2dp
+				#
+				# Sonification falls through media strategy if not in call (widely speaking)
+				#
+				AvailableOutputDevices Includes BluetoothA2dp
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceNoBtA2dp
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 1
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+
+			conf: BluetoothA2dpHeadphones
+				#
+				# Sonification falls through media strategy if not in call (widely speaking)
+				#
+				AvailableOutputDevices Includes BluetoothA2dpHeadphones
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceNoBtA2dp
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 1
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+
+			conf: BluetoothA2dpSpeaker
+				#
+				# Sonification falls through media strategy if not in call (widely speaking)
+				#
+				AvailableOutputDevices Includes BluetoothA2dpSpeaker
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceNoBtA2dp
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 1
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+
+			conf: ScoCarkit
+				#
+				# Sonification follows phone strategy if in call (widely speaking)
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				ForceUseForCommunication Is ForceBtSco
+				AvailableOutputDevices Includes BluetoothScoCarkit
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 1
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+
+			conf: ScoHeadset
+				#
+				# Sonification follows phone strategy if in call (widely speaking)
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				ForceUseForCommunication Is ForceBtSco
+				AvailableOutputDevices Includes BluetoothScoHeadset
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 1
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+
+			conf: Sco
+				#
+				# Sonification follows phone strategy if in call (widely speaking)
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				ForceUseForCommunication Is ForceBtSco
+				AvailableOutputDevices Includes BluetoothSco
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 1
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+
+			conf: WiredHeadphone
+				AvailableOutputDevices Includes WiredHeadphone
+				ANY
+					#
+					# Sonification falls through media strategy if not in call (widely speaking)
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						ForceUseForMedia IsNot ForceSpeaker
+					#
+					# Sonification follows Phone strategy if in call (widely speaking)
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 1
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+
+			conf: Line
+				AvailableOutputDevices Includes Line
+				ANY
+					#
+					# Sonification follows Phone strategy if in call (widely speaking)
+					# but Line has a lower priority than WiredHeadset in this case.
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+						AvailableOutputDevices Excludes WiredHeadset
+					#
+					# Sonification falls through media strategy if not in call (widely speaking)
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						ForceUseForMedia IsNot ForceSpeaker
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 1
+
+			conf: WiredHeadset
+				AvailableOutputDevices Includes WiredHeadset
+				ANY
+					#
+					# Sonification falls through media strategy if not in call (widely speaking)
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						ForceUseForMedia IsNot ForceSpeaker
+					ALL
+						#
+						# Sonification Follows Phone Strategy if in call (widely speaking)
+						#
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 1
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+
+			conf: UsbDevice
+				AvailableOutputDevices Includes UsbDevice
+				ANY
+					#
+					# Sonification falls through media strategy if not in call (widely speaking)
+					#
+					ALL
+						AvailableOutputDevices Excludes UsbAccessory
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						ForceUseForMedia IsNot ForceSpeaker
+					ALL
+						#
+						# Sonification Follows Phone Strategy if in call (widely speaking)
+						#
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 1
+					telephony_tx = 0
+					line = 0
+
+			conf: UsbAccessory
+				AvailableOutputDevices Includes UsbAccessory
+				#
+				# Sonification falls through media strategy if not in call (widely speaking)
+				#
+				# Sonification Follows Phone Strategy if in call (widely speaking)
+				# but USB Accessory not reachable in call.
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceSpeaker
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 1
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+
+			conf: DgtlDockHeadset
+				AvailableOutputDevices Includes DgtlDockHeadset
+				#
+				# Sonification falls through media strategy if not in call
+				#
+				# Sonification Follows Phone Strategy if in call (widely speaking)
+				# but DgtlDockHeadset not reachable in call.
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceSpeaker
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 1
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+
+			conf: AnlgDockHeadset
+				AvailableOutputDevices Includes AnlgDockHeadset
+				#
+				# Sonification falls through media strategy if not in call
+				#
+				# Sonification Follows Phone Strategy if in call (widely speaking)
+				# but AnlgDockHeadset not reachable in call.
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceSpeaker
+				ForceUseForDock Is ForceAnalogDock
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 1
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+
+			conf: Earpiece
+				#
+				# Sonification Follows Phone Strategy if in call
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				ForceUseForCommunication IsNot ForceSpeaker
+				AvailableOutputDevices Includes Earpiece
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 1
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+
+			conf: None
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
diff --git a/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification_respectful.pfw b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification_respectful.pfw
new file mode 100644
index 000000000..b30aa4ca8
--- /dev/null
+++ b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification_respectful.pfw
@@ -0,0 +1,536 @@
+domainGroup: DeviceForStrategy
+
+	domainGroup: SonificationRespectful
+		#
+		# Sonificiation Respectful follows:
+		#	- If in call: Strategy sonification (that follows phone strategy in call also...)
+		#	- If not in call AND a music stream is active remotely: Strategy sonification (that
+		#     follows enforced audible, which follows media)
+		#	- if not in call and no music stream active remotely and music stream active): strategy
+		#     media
+		#   - Otherwise follows sonification by replacing speaker with speaker safe if speaker is
+		#	  selected.
+		#
+		# Case of stream active handled programmatically
+
+		domain: UnreachableDevices
+			conf: Calibration
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					remote_submix = 0
+					hdmi_arc = 0
+					aux_line = 0
+					spdif = 0
+					fm = 0
+					telephony_tx = 0
+					ip = 0
+					bus = 0
+					stub = 0
+
+		domain: Speakers
+
+			conf: SpeakerSafe
+				AvailableOutputDevices Includes Speaker
+				AvailableOutputDevices Includes SpeakerSafe
+				#
+				# Follows sonification strategy if not in call and replace speaker by speaker safe
+				# if and only if speaker only selected
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					speaker_safe = 1
+					speaker = 0
+
+			conf: Speaker
+				AvailableOutputDevices Includes Speaker
+				ANY
+					#
+					# Follows sonification strategy if not in call
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+					ALL
+						#
+						# Follows Phone Strategy if call
+						#
+						ForceUseForCommunication Is ForceSpeaker
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						AvailableOutputDevices Excludes Line
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					speaker_safe = 0
+					speaker = 1
+
+			conf: None
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					speaker_safe = 0
+					speaker = 0
+
+		domain: Device2
+			conf: BluetoothA2dp
+				#
+				# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
+				# SonificationRespectful follows media if music stream is active
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia Is ForceNoBtA2dp
+				AvailableOutputDevices Includes BluetoothA2dp
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 1
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: BluetoothA2dpHeadphones
+				#
+				# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
+				# SonificationRespectful follows media if music stream is active
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia Is ForceNoBtA2dp
+				AvailableOutputDevices Includes BluetoothA2dpHeadphones
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 1
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: BluetoothA2dpSpeaker
+				#
+				# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
+				# SonificationRespectful follows media if music stream is active
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia Is ForceNoBtA2dp
+				AvailableOutputDevices Includes BluetoothA2dpSpeaker
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 1
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: BluetoothScoCarkit
+				#
+				# SonificationRespectful Follows Phone strategy if in call
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				ForceUseForCommunication Is ForceBtSco
+				AvailableOutputDevices Includes BluetoothScoCarkit
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 1
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: BluetoothScoHeadset
+				#
+				# SonificationRespectful Follows Phone strategy if in call
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				ForceUseForCommunication Is ForceBtSco
+				AvailableOutputDevices Includes BluetoothScoHeadset
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 1
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: BluetoothSco
+				#
+				# SonificationRespectful Follows Phone strategy if in call
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				ForceUseForCommunication Is ForceBtSco
+				AvailableOutputDevices Includes BluetoothSco
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 1
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: WiredHeadphone
+				ANY
+					ALL
+						#
+						# SonificationRespectful Follows Phone strategy if in call
+						#
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+					ALL
+						#
+						# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
+						# SonificationRespectful follows media if music stream is active
+						#
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes WiredHeadphone
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 1
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: Line
+				ANY
+					#
+					# SonificationRespectful Follows Phone strategy if in call
+					# but Line has a lower priority than WiredHeadset in this case.
+					#
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+						AvailableOutputDevices Excludes WiredHeadset
+					#
+					# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
+					# SonificationRespectful follows media if music stream is active
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						AvailableOutputDevices Includes WiredHeadphone
+						ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes Line
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 1
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: WiredHeadset
+				ANY
+					ALL
+						#
+						# SonificationRespectful Follows Phone strategy if in call
+						#
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+					ALL
+						#
+						# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
+						# SonificationRespectful follows media if music stream is active
+						#
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes WiredHeadset
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 1
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: UsbDevice
+				ANY
+					ALL
+						#
+						# SonificationRespectful Follows Phone strategy if in call
+						#
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+					ALL
+						#
+						# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
+						# SonificationRespectful follows media if music stream is active
+						#
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						ForceUseForMedia IsNot ForceSpeaker
+						AvailableOutputDevices Excludes UsbAccessory
+				AvailableOutputDevices Includes UsbDevice
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 1
+					hdmi = 0
+
+			conf: UsbAccessory
+				#
+				# SonificationRespectful Follows Phone strategy if in call (widely speaking)
+				# but UsbAccessory not reachable in call.
+				#
+				# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
+				# SonificationRespectful follows media if music stream is active
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes UsbAccessory
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 1
+					usb_device = 0
+					hdmi = 0
+
+			conf: DgtlDockHeadset
+				#
+				# SonificationRespectful Follows Phone strategy if in call (widely speaking)
+				# but DgtlDockHeadset not reachable in call.
+				#
+				# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
+				# SonificationRespectful follows media if music stream is active
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes DgtlDockHeadset
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 1
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: AuxDigital
+				#
+				# SonificationRespectful Follows Phone strategy if in call (widely speaking)
+				# but HDMI not reachable in call.
+				#
+				# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
+				# SonificationRespectful follows media if music stream is active
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes Hdmi
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 1
+
+			conf: AnlgDockHeadset
+				#
+				# SonificationRespectful Follows Phone strategy if in call (widely speaking)
+				# but AnlgDockHeadset not reachable in call.
+				#
+				# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
+				# SonificationRespectful follows media if music stream is active
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceSpeaker
+				ForceUseForDock Is ForceAnalogDock
+				AvailableOutputDevices Includes AnlgDockHeadset
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 1
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
+			conf: Earpiece
+				#
+				# SonificationRespectful Follows Phone strategy if in call
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				ForceUseForCommunication IsNot ForceSpeaker
+				AvailableOutputDevices Includes Earpiece
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 1
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+
diff --git a/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_transmitted_through_speaker.pfw b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_transmitted_through_speaker.pfw
new file mode 100644
index 000000000..9f9c21196
--- /dev/null
+++ b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_transmitted_through_speaker.pfw
@@ -0,0 +1,43 @@
+supDomain: DeviceForStrategy
+
+	supDomain: TransmittedThroughSpeaker
+		domain: UnreacheableDevices
+			conf: Calibration
+				component: /Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask
+					remote_submix = 0
+					hdmi_arc = 0
+					spdif = 0
+					aux_line = 0
+					fm = 0
+					speaker_safe = 0
+					earpiece = 0
+					wired_headset = 1
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					ip = 0
+					bus = 0
+					stub = 0
+
+		domain: Speaker
+			conf: Selected
+				AvailableOutputDevices Includes Speaker
+
+				component: /Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask
+					speaker = 1
+
+			conf: NotSelected
+				component: /Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask
+					speaker = 0
+
diff --git a/common/audio/reference_configurable_audio_policy/Settings/strategy_for_stream.pfw b/common/audio/reference_configurable_audio_policy/Settings/strategy_for_stream.pfw
new file mode 100644
index 000000000..3940b9daf
--- /dev/null
+++ b/common/audio/reference_configurable_audio_policy/Settings/strategy_for_stream.pfw
@@ -0,0 +1,20 @@
+domain: StrategyForStream
+
+	conf: Calibration
+		/Policy/policy/streams/voice_call/applicable_strategy/strategy = phone
+		#
+		# NOTE: SYSTEM stream uses MEDIA strategy because muting music and switching outputs
+		# while key clicks are played produces a poor result
+		#
+		/Policy/policy/streams/system/applicable_strategy/strategy = media
+		/Policy/policy/streams/ring/applicable_strategy/strategy = sonification
+		/Policy/policy/streams/music/applicable_strategy/strategy = media
+		/Policy/policy/streams/alarm/applicable_strategy/strategy = sonification
+		/Policy/policy/streams/notification/applicable_strategy/strategy = sonification_respectful
+		/Policy/policy/streams/bluetooth_sco/applicable_strategy/strategy = phone
+		/Policy/policy/streams/enforced_audible/applicable_strategy/strategy = enforced_audible
+		/Policy/policy/streams/dtmf/applicable_strategy/strategy = dtmf
+		/Policy/policy/streams/tts/applicable_strategy/strategy = transmitted_through_speaker
+		/Policy/policy/streams/accessibility/applicable_strategy/strategy = accessibility
+		/Policy/policy/streams/rerouting/applicable_strategy/strategy = rerouting
+
diff --git a/common/audio/reference_configurable_audio_policy/Settings/strategy_for_usage.pfw b/common/audio/reference_configurable_audio_policy/Settings/strategy_for_usage.pfw
new file mode 100644
index 000000000..3f5da135f
--- /dev/null
+++ b/common/audio/reference_configurable_audio_policy/Settings/strategy_for_usage.pfw
@@ -0,0 +1,39 @@
+supDomain: SelectedStrategyForUsages
+
+	domain: Calibration
+		conf: Calibration
+			/Policy/policy/usages/unknown/applicable_strategy/strategy = media
+			/Policy/policy/usages/media/applicable_strategy/strategy = media
+			/Policy/policy/usages/voice_communication/applicable_strategy/strategy = phone
+			/Policy/policy/usages/voice_communication_signalling/applicable_strategy/strategy = dtmf
+			/Policy/policy/usages/alarm/applicable_strategy/strategy = sonification
+			/Policy/policy/usages/notification/applicable_strategy/strategy = sonification_respectful
+			/Policy/policy/usages/notification_telephony_ringtone/applicable_strategy/strategy = sonification
+			/Policy/policy/usages/notification_communication_request/applicable_strategy/strategy = sonification_respectful
+			/Policy/policy/usages/notification_communication_instant/applicable_strategy/strategy = sonification_respectful
+			/Policy/policy/usages/notification_communication_delayed/applicable_strategy/strategy = sonification_respectful
+			/Policy/policy/usages/notification_event/applicable_strategy/strategy = sonification_respectful
+			/Policy/policy/usages/assistance_navigation_guidance/applicable_strategy/strategy = media
+			/Policy/policy/usages/assistance_sonification/applicable_strategy/strategy = media
+			/Policy/policy/usages/game/applicable_strategy/strategy = media
+
+	domain: AssistanceAccessibility
+		conf: Sonification
+			#
+			# In case of Ring or Alarm stream type active, switching to sonification
+			# @todo: handle this dynamic case. As a WA, using Ringtone mode...
+			#
+			TelephonyMode Is RingTone
+
+			/Policy/policy/usages/assistance_accessibility/applicable_strategy/strategy = sonification
+
+		conf: Phone
+			ANY
+				TelephonyMode Is InCall
+				TelephonyMode Is InCommunication
+
+			/Policy/policy/usages/assistance_accessibility/applicable_strategy/strategy = phone
+
+		conf: Accessibility
+			/Policy/policy/usages/assistance_accessibility/applicable_strategy/strategy = accessibility
+
diff --git a/common/audio/reference_configurable_audio_policy/Settings/volumes.pfw b/common/audio/reference_configurable_audio_policy/Settings/volumes.pfw
new file mode 100644
index 000000000..7db4537b5
--- /dev/null
+++ b/common/audio/reference_configurable_audio_policy/Settings/volumes.pfw
@@ -0,0 +1,28 @@
+supDomain: VolumeProfilesForStream
+	domain: Calibration
+		conf: Calibration
+			/Policy/policy/streams/voice_call/applicable_volume_profile/volume_profile = voice_call
+			/Policy/policy/streams/system/applicable_volume_profile/volume_profile = system
+			/Policy/policy/streams/ring/applicable_volume_profile/volume_profile = ring
+			/Policy/policy/streams/music/applicable_volume_profile/volume_profile = music
+			/Policy/policy/streams/alarm/applicable_volume_profile/volume_profile = alarm
+			/Policy/policy/streams/notification/applicable_volume_profile/volume_profile = notification
+			/Policy/policy/streams/bluetooth_sco/applicable_volume_profile/volume_profile = bluetooth_sco
+			/Policy/policy/streams/enforced_audible/applicable_volume_profile/volume_profile = enforced_audible
+			/Policy/policy/streams/tts/applicable_volume_profile/volume_profile = tts
+			/Policy/policy/streams/accessibility/applicable_volume_profile/volume_profile = accessibility
+			/Policy/policy/streams/rerouting/applicable_volume_profile/volume_profile = rerouting
+			/Policy/policy/streams/patch/applicable_volume_profile/volume_profile = patch
+
+	domain: Dtmf
+		conf: InCall
+			ANY
+				TelephonyMode Is InCall
+				TelephonyMode Is InCommunication
+
+			/Policy/policy/streams/dtmf/applicable_volume_profile/volume_profile = voice_call
+
+		conf: OutOfCall
+			/Policy/policy/streams/dtmf/applicable_volume_profile/volume_profile = dtmf
+
+
diff --git a/common/audio/reference_configurable_audio_policy/SettingsNoInput/device_for_input_source.pfw b/common/audio/reference_configurable_audio_policy/SettingsNoInput/device_for_input_source.pfw
new file mode 100644
index 000000000..611d8f575
--- /dev/null
+++ b/common/audio/reference_configurable_audio_policy/SettingsNoInput/device_for_input_source.pfw
@@ -0,0 +1,285 @@
+supDomain: DeviceForInputSource
+	domain: Calibration
+		conf: Calibration
+			#
+			# Note that ALL input devices must have the sign bit set to 1.
+			# As the devices is a mask, use the "in" bit as a direction indicator.
+			#
+			component: /Policy/policy/input_sources/default/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0>
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 1
+			component: /Policy/policy/input_sources/mic/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0>
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 1
+			component: /Policy/policy/input_sources/voice_downlink/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0>
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 1
+			component: /Policy/policy/input_sources/voice_call/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0>
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 1
+			component: /Policy/policy/input_sources/voice_uplink/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0>
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 1
+			component: /Policy/policy/input_sources/camcorder/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0>
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 1
+			component: /Policy/policy/input_sources/voice_recognition/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0>
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 1
+			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0>
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 1
+			component: /Policy/policy/input_sources/remote_submix/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0>
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 1
+			component: /Policy/policy/input_sources/hotword/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0>
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 1
+			component: /Policy/policy/input_sources/unprocessed/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0>
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 1
+			component: /Policy/policy/input_sources/fm_tuner/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0>
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 1
+
+
diff --git a/common/audio/reference_configurable_audio_policy/SettingsNoOutput/device_for_strategies.pfw b/common/audio/reference_configurable_audio_policy/SettingsNoOutput/device_for_strategies.pfw
new file mode 100644
index 000000000..917d4a761
--- /dev/null
+++ b/common/audio/reference_configurable_audio_policy/SettingsNoOutput/device_for_strategies.pfw
@@ -0,0 +1,255 @@
+domain: DeviceForStrategy
+	conf: Calibration
+		component: /Policy/policy/strategies
+			component: media/selected_output_devices/mask
+				earpiece = 0
+				speaker = 0
+				wired_headset = 0
+				wired_headphone = 0
+				bluetooth_sco = 0
+				bluetooth_sco_headset = 0
+				bluetooth_sco_carkit = 0
+				bluetooth_a2dp = 0>
+				bluetooth_a2dp_headphones = 0
+				bluetooth_a2dp_speaker = 0
+				hdmi = 0
+				angl_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				remote_submix = 0
+				telephony_tx = 0
+				line = 0
+				hdmi_arc = 0
+				spdif = 0
+				fm = 0
+				aux_line = 0
+				speaker_safe = 0
+				ip = 0
+				bus = 0
+				stub = 1
+
+			component: phone/selected_output_devices/mask
+				earpiece = 0
+				speaker = 0
+				wired_headset = 0
+				wired_headphone = 0
+				bluetooth_sco = 0
+				bluetooth_sco_headset = 0
+				bluetooth_sco_carkit = 0
+				bluetooth_a2dp = 0>
+				bluetooth_a2dp_headphones = 0
+				bluetooth_a2dp_speaker = 0
+				hdmi = 0
+				angl_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				remote_submix = 0
+				telephony_tx = 0
+				line = 0
+				hdmi_arc = 0
+				spdif = 0
+				fm = 0
+				aux_line = 0
+				speaker_safe = 0
+				ip = 0
+				bus = 0
+				stub = 1
+
+			component: sonification/selected_output_devices/mask
+				earpiece = 0
+				speaker = 0
+				wired_headset = 0
+				wired_headphone = 0
+				bluetooth_sco = 0
+				bluetooth_sco_headset = 0
+				bluetooth_sco_carkit = 0
+				bluetooth_a2dp = 0>
+				bluetooth_a2dp_headphones = 0
+				bluetooth_a2dp_speaker = 0
+				hdmi = 0
+				angl_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				remote_submix = 0
+				telephony_tx = 0
+				line = 0
+				hdmi_arc = 0
+				spdif = 0
+				fm = 0
+				aux_line = 0
+				speaker_safe = 0
+				ip = 0
+				bus = 0
+				stub = 1
+
+			component: sonification_respectful/selected_output_devices/mask
+				earpiece = 0
+				speaker = 0
+				wired_headset = 0
+				wired_headphone = 0
+				bluetooth_sco = 0
+				bluetooth_sco_headset = 0
+				bluetooth_sco_carkit = 0
+				bluetooth_a2dp = 0>
+				bluetooth_a2dp_headphones = 0
+				bluetooth_a2dp_speaker = 0
+				hdmi = 0
+				angl_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				remote_submix = 0
+				telephony_tx = 0
+				line = 0
+				hdmi_arc = 0
+				spdif = 0
+				fm = 0
+				aux_line = 0
+				speaker_safe = 0
+				ip = 0
+				bus = 0
+				stub = 1
+
+			component: dtmf/selected_output_devices/mask
+				earpiece = 0
+				speaker = 0
+				wired_headset = 0
+				wired_headphone = 0
+				bluetooth_sco = 0
+				bluetooth_sco_headset = 0
+				bluetooth_sco_carkit = 0
+				bluetooth_a2dp = 0>
+				bluetooth_a2dp_headphones = 0
+				bluetooth_a2dp_speaker = 0
+				hdmi = 0
+				angl_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				remote_submix = 0
+				telephony_tx = 0
+				line = 0
+				hdmi_arc = 0
+				spdif = 0
+				fm = 0
+				aux_line = 0
+				speaker_safe = 0
+				ip = 0
+				bus = 0
+				stub = 1
+
+			component: enforced_audible/selected_output_devices/mask
+				earpiece = 0
+				speaker = 0
+				wired_headset = 0
+				wired_headphone = 0
+				bluetooth_sco = 0
+				bluetooth_sco_headset = 0
+				bluetooth_sco_carkit = 0
+				bluetooth_a2dp = 0>
+				bluetooth_a2dp_headphones = 0
+				bluetooth_a2dp_speaker = 0
+				hdmi = 0
+				angl_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				remote_submix = 0
+				telephony_tx = 0
+				line = 0
+				hdmi_arc = 0
+				spdif = 0
+				fm = 0
+				aux_line = 0
+				speaker_safe = 0
+				ip = 0
+				bus = 0
+				stub = 1
+
+			component: transmitted_through_speaker/selected_output_devices/mask
+				earpiece = 0
+				speaker = 0
+				wired_headset = 0
+				wired_headphone = 0
+				bluetooth_sco = 0
+				bluetooth_sco_headset = 0
+				bluetooth_sco_carkit = 0
+				bluetooth_a2dp = 0>
+				bluetooth_a2dp_headphones = 0
+				bluetooth_a2dp_speaker = 0
+				hdmi = 0
+				angl_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				remote_submix = 0
+				telephony_tx = 0
+				line = 0
+				hdmi_arc = 0
+				spdif = 0
+				fm = 0
+				aux_line = 0
+				speaker_safe = 0
+				ip = 0
+				bus = 0
+				stub = 1
+
+			component: accessibility/selected_output_devices/mask
+				earpiece = 0
+				speaker = 0
+				wired_headset = 0
+				wired_headphone = 0
+				bluetooth_sco = 0
+				bluetooth_sco_headset = 0
+				bluetooth_sco_carkit = 0
+				bluetooth_a2dp = 0>
+				bluetooth_a2dp_headphones = 0
+				bluetooth_a2dp_speaker = 0
+				hdmi = 0
+				angl_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				remote_submix = 0
+				telephony_tx = 0
+				line = 0
+				hdmi_arc = 0
+				spdif = 0
+				fm = 0
+				aux_line = 0
+				speaker_safe = 0
+				ip = 0
+				bus = 0
+				stub = 1
+
+			component: rerouting/selected_output_devices/mask
+				earpiece = 0
+				speaker = 0
+				wired_headset = 0
+				wired_headphone = 0
+				bluetooth_sco = 0
+				bluetooth_sco_headset = 0
+				bluetooth_sco_carkit = 0
+				bluetooth_a2dp = 0>
+				bluetooth_a2dp_headphones = 0
+				bluetooth_a2dp_speaker = 0
+				hdmi = 0
+				angl_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				remote_submix = 0
+				telephony_tx = 0
+				line = 0
+				hdmi_arc = 0
+				spdif = 0
+				fm = 0
+				aux_line = 0
+				speaker_safe = 0
+				ip = 0
+				bus = 0
+				stub = 1
+
diff --git a/common/audio/reference_configurable_audio_policy/Structure/PolicyClass.xml b/common/audio/reference_configurable_audio_policy/Structure/PolicyClass.xml
new file mode 100644
index 000000000..296879f31
--- /dev/null
+++ b/common/audio/reference_configurable_audio_policy/Structure/PolicyClass.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemClass xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="../../Schemas/SystemClass.xsd" Name="Policy">
+    <SubsystemInclude Path="PolicySubsystem.xml"/>
+</SystemClass>
diff --git a/common/audio/reference_configurable_audio_policy/Structure/PolicySubsystem-CommonTypes.xml b/common/audio/reference_configurable_audio_policy/Structure/PolicySubsystem-CommonTypes.xml
new file mode 100644
index 000000000..461e44a7c
--- /dev/null
+++ b/common/audio/reference_configurable_audio_policy/Structure/PolicySubsystem-CommonTypes.xml
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ComponentTypeSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xmlns:xi="http://www.w3.org/2001/XInclude"
+              xsi:noNamespaceSchemaLocation="Schemas/ComponentTypeSet.xsd">
+    <!-- Output devices definition as a bitfield for the supported devices per output
+    profile. It must match with the output device enum parameter.
+    -->
+     <!--#################### GLOBAL COMPONENTS BEGIN ####################-->
+
+     <!--#################### GLOBAL COMPONENTS END ####################-->
+
+    <ComponentType Name="OutputDevicesMask" Description="32th bit is not allowed as dedicated
+                                                     for input devices detection">
+        <BitParameterBlock Name="mask" Size="32">
+            <BitParameter Name="earpiece" Size="1" Pos="0"/>
+            <BitParameter Name="speaker" Size="1" Pos="1"/>
+            <BitParameter Name="wired_headset" Size="1" Pos="2"/>
+            <BitParameter Name="wired_headphone" Size="1" Pos="3"/>
+            <BitParameter Name="bluetooth_sco" Size="1" Pos="4"/>
+            <BitParameter Name="bluetooth_sco_headset" Size="1" Pos="5"/>
+            <BitParameter Name="bluetooth_sco_carkit" Size="1" Pos="6"/>
+            <BitParameter Name="bluetooth_a2dp" Size="1" Pos="7"/>
+            <BitParameter Name="bluetooth_a2dp_headphones" Size="1" Pos="8"/>
+            <BitParameter Name="bluetooth_a2dp_speaker" Size="1" Pos="9"/>
+            <BitParameter Name="hdmi" Size="1" Pos="10"/>
+            <BitParameter Name="angl_dock_headset" Size="1" Pos="11"/>
+            <BitParameter Name="dgtl_dock_headset" Size="1" Pos="12"/>
+            <BitParameter Name="usb_accessory" Size="1" Pos="13"/>
+            <BitParameter Name="usb_device" Size="1" Pos="14"/>
+            <BitParameter Name="remote_submix" Size="1" Pos="15"/>
+            <BitParameter Name="telephony_tx" Size="1" Pos="16"/>
+            <BitParameter Name="line" Size="1" Pos="17"/>
+            <BitParameter Name="hdmi_arc" Size="1" Pos="18"/>
+            <BitParameter Name="spdif" Size="1" Pos="19"/>
+            <BitParameter Name="fm" Size="1" Pos="20"/>
+            <BitParameter Name="aux_line" Size="1" Pos="21"/>
+            <BitParameter Name="speaker_safe" Size="1" Pos="22"/>
+            <BitParameter Name="ip" Size="1" Pos="23"/>
+            <BitParameter Name="bus" Size="1" Pos="24"/>
+            <BitParameter Name="stub" Size="1" Pos="30"/>
+        </BitParameterBlock>
+    </ComponentType>
+
+    <!-- Input devices definition as a bitfield for the supported devices per Input
+    profile. It must match with the Input device enum parameter.
+    -->
+    <ComponentType Name="InputDevicesMask">
+        <BitParameterBlock Name="mask" Size="32">
+            <BitParameter Name="communication" Size="1" Pos="0"/>
+            <BitParameter Name="ambient" Size="1" Pos="1"/>
+            <BitParameter Name="builtin_mic" Size="1" Pos="2"/>
+            <BitParameter Name="bluetooth_sco_headset" Size="1" Pos="3"/>
+            <BitParameter Name="wired_headset" Size="1" Pos="4"/>
+            <BitParameter Name="hdmi" Size="1" Pos="5"/>
+            <BitParameter Name="telephony_rx" Size="1" Pos="6"/>
+            <BitParameter Name="back_mic" Size="1" Pos="7"/>
+            <BitParameter Name="remote_submix" Size="1" Pos="8"/>
+            <BitParameter Name="anlg_dock_headset" Size="1" Pos="9"/>
+            <BitParameter Name="dgtl_dock_headset" Size="1" Pos="10"/>
+            <BitParameter Name="usb_accessory" Size="1" Pos="11"/>
+            <BitParameter Name="usb_device" Size="1" Pos="12"/>
+            <BitParameter Name="fm_tuner" Size="1" Pos="13"/>
+            <BitParameter Name="tv_tuner" Size="1" Pos="14"/>
+            <BitParameter Name="line" Size="1" Pos="15"/>
+            <BitParameter Name="spdif" Size="1" Pos="16"/>
+            <BitParameter Name="bluetooth_a2dp" Size="1" Pos="17"/>
+            <BitParameter Name="loopback" Size="1" Pos="18"/>
+            <BitParameter Name="ip" Size="1" Pos="19"/>
+            <BitParameter Name="bus" Size="1" Pos="20"/>
+            <BitParameter Name="stub" Size="1" Pos="30"/>
+        </BitParameterBlock>
+    </ComponentType>
+
+    <ComponentType Name="OutputFlags"
+                   Description="the audio output flags serve two purposes:
+                    - when an AudioTrack is created they indicate a wish to be connected to an
+                      output stream with attributes corresponding to the specified flags.
+                    - when present in an output profile descriptor listed for a particular audio
+                      hardware module, they indicate that an output stream can be opened that
+                      supports the attributes indicated by the flags.
+                    The audio policy manager will try to match the flags in the request
+                    (when getOuput() is called) to an available output stream.">
+        <BitParameterBlock Name="mask" Size="32">
+            <BitParameter Name="direct" Size="1" Pos="0"/>
+            <BitParameter Name="primary" Size="1" Pos="1"/>
+            <BitParameter Name="fast" Size="1" Pos="2"/>
+            <BitParameter Name="deep_buffer" Size="1" Pos="3"/>
+            <BitParameter Name="compress_offload" Size="1" Pos="4"/>
+            <BitParameter Name="non_blocking" Size="1" Pos="5"/>
+            <BitParameter Name="hw_av_sync" Size="1" Pos="6"/>
+            <BitParameter Name="tts" Size="1" Pos="7"/>
+            <BitParameter Name="raw" Size="1" Pos="8"/>
+            <BitParameter Name="sync" Size="1" Pos="9"/>
+            <BitParameter Name="iec958_nonaudio" Size="1" Pos="10"/>
+        </BitParameterBlock>
+    </ComponentType>
+
+    <ComponentType Name="InputFlags"
+                   Description="The audio input flags are analogous to audio output flags.
+                                Currently they are used only when an AudioRecord is created,
+                                to indicate a preference to be connected to an input stream with
+                                attributes corresponding to the specified flags.">
+        <BitParameterBlock Name="mask" Size="32">
+            <BitParameter Name="fast" Size="1" Pos="0"/>
+            <BitParameter Name="hw_hotword" Size="1" Pos="2"/>
+            <BitParameter Name="raw" Size="1" Pos="3"/>
+            <BitParameter Name="sync" Size="1" Pos="4"/>
+        </BitParameterBlock>
+    </ComponentType>
+
+    <ComponentType Name="InputSourcesMask" Description="The audio input source is also known
+                                                        as the use case.">
+        <BitParameterBlock Name="mask" Size="32">
+            <BitParameter Name="default" Size="1" Pos="0"/>
+            <BitParameter Name="mic" Size="1" Pos="1"/>
+            <BitParameter Name="voice_uplink" Size="1" Pos="2"/>
+            <BitParameter Name="voice_downlink" Size="1" Pos="3"/>
+            <BitParameter Name="voice_call" Size="1" Pos="4"/>
+            <BitParameter Name="camcorder" Size="1" Pos="5"/>
+            <BitParameter Name="voice_recognition" Size="1" Pos="6"/>
+            <BitParameter Name="voice_communication" Size="1" Pos="7"/>
+            <BitParameter Name="remote_submix" Size="1" Pos="8"/>
+            <BitParameter Name="unprocessed" Size="1" Pos="9"/>
+            <BitParameter Name="fm_tuner" Size="1" Pos="10"/>
+            <BitParameter Name="hotword" Size="1" Pos="11"/>
+        </BitParameterBlock>
+    </ComponentType>
+
+    <!-- Routing Strategy definition as an enumeration. Numerical value must match the value
+         of the routing strategy in policy header file. -->
+    <ComponentType Name="Strategy">
+        <EnumParameter Name="strategy" Size="32">
+            <ValuePair Literal="media" Numerical="0"/>
+            <ValuePair Literal="phone" Numerical="1"/>
+            <ValuePair Literal="sonification" Numerical="2"/>
+            <ValuePair Literal="sonification_respectful" Numerical="3"/>
+            <ValuePair Literal="dtmf" Numerical="4"/>
+            <ValuePair Literal="enforced_audible" Numerical="5"/>
+            <ValuePair Literal="transmitted_through_speaker" Numerical="6"/>
+            <ValuePair Literal="accessibility" Numerical="7"/>
+            <ValuePair Literal="rerouting" Numerical="8"/>
+        </EnumParameter>
+    </ComponentType>
+
+    <!--#################### STRATEGY COMMON TYPES BEGIN ####################-->
+
+    <ComponentType Name="StrategyConfig" Mapping="Strategy:'%1'">
+        <Component Name="selected_output_devices" Type="OutputDevicesMask"/>
+    </ComponentType>
+
+    <!--#################### STRATEGY COMMON TYPES END ####################-->
+
+    <!--#################### STREAM COMMON TYPES BEGIN ####################-->
+
+    <ComponentType Name="VolumeProfileType">
+        <EnumParameter Name="volume_profile" Size="32">
+            <ValuePair Literal="voice_call" Numerical="0"/>
+            <ValuePair Literal="system" Numerical="1"/>
+            <ValuePair Literal="ring" Numerical="2"/>
+            <ValuePair Literal="music" Numerical="3"/>
+            <ValuePair Literal="alarm" Numerical="4"/>
+            <ValuePair Literal="notification" Numerical="5"/>
+            <ValuePair Literal="bluetooth_sco" Numerical="6"/>
+            <ValuePair Literal="enforced_audible" Numerical="7"/>
+            <ValuePair Literal="dtmf" Numerical="8"/>
+            <ValuePair Literal="tts" Numerical="9"/>
+            <ValuePair Literal="accessibility" Numerical="10"/>
+            <ValuePair Literal="rerouting" Numerical="11"/>
+            <ValuePair Literal="patch" Numerical="12"/>
+        </EnumParameter>
+    </ComponentType>
+
+    <ComponentType Name="Stream">
+        <Component Name="applicable_strategy" Type="Strategy"/>
+        <Component Name="applicable_volume_profile" Type="VolumeProfileType"
+                   Description="Volume profile followed by a given stream type."/>
+    </ComponentType>
+
+    <!--#################### STREAM COMMON TYPES END ####################-->
+
+    <!--#################### USAGE COMMON TYPES BEGIN ####################-->
+
+    <ComponentType Name="Usage">
+        <Component Name="applicable_strategy" Type="Strategy" Mapping="Usage:'%1'"/>
+    </ComponentType>
+
+    <!--#################### USAGE COMMON TYPES END ####################-->
+
+    <!--#################### INPUT SOURCE COMMON TYPES BEGIN ####################-->
+
+    <ComponentType Name="InputSource">
+        <Component Name="applicable_input_device" Type="InputDevicesMask"
+                   Mapping="InputSource:'%1'" Description="Selected Input device"/>
+    </ComponentType>
+
+    <!--#################### INPUT SOURCE COMMON TYPES END ####################-->
+
+</ComponentTypeSet>
diff --git a/common/audio/reference_configurable_audio_policy/Structure/PolicySubsystem.xml b/common/audio/reference_configurable_audio_policy/Structure/PolicySubsystem.xml
new file mode 100644
index 000000000..71b2b6238
--- /dev/null
+++ b/common/audio/reference_configurable_audio_policy/Structure/PolicySubsystem.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Subsystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:xi="http://www.w3.org/2001/XInclude"
+           xsi:noNamespaceSchemaLocation="Schemas/Subsystem.xsd"
+           Name="policy" Type="Policy">
+
+    <ComponentLibrary>
+        <!--#################### GLOBAL COMPONENTS BEGIN ####################-->
+        <!-- Common Types defintion -->
+        <xi:include href="PolicySubsystem-CommonTypes.xml"/>
+
+        <!--#################### GLOBAL COMPONENTS END ####################-->
+
+        <!--#################### STRATEGY BEGIN ####################-->
+
+        <ComponentType Name="Strategies" Description="Identifier must match the enum value to make
+                             the link between the PolicyManager and PFW">
+            <Component Name="media" Type="StrategyConfig" Mapping="Amend1:Media,Identifier:0"/>
+            <Component Name="phone" Type="StrategyConfig" Mapping="Amend1:Phone,Identifier:1"/>
+            <Component Name="sonification" Type="StrategyConfig"
+                                           Mapping="Amend1:Sonification,Identifier:2"/>
+            <Component Name="sonification_respectful" Type="StrategyConfig"
+                       Mapping="Amend1:SonificationRespectful,Identifier:3"/>
+            <Component Name="dtmf" Type="StrategyConfig" Mapping="Amend1:Dtmf,Identifier:4"/>
+            <Component Name="enforced_audible" Type="StrategyConfig"
+                                               Mapping="Amend1:EnforcedAudible,Identifier:5"/>
+            <Component Name="transmitted_through_speaker" Type="StrategyConfig"
+                       Mapping="Amend1:TransmittedThroughSpeaker,Identifier:6"/>
+            <Component Name="accessibility" Type="StrategyConfig"
+                                            Mapping="Amend1:Accessibility,Identifier:7"/>
+            <Component Name="rerouting" Type="StrategyConfig"
+                                        Mapping="Amend1:Rerouting,Identifier:8"/>
+        </ComponentType>
+
+        <!--#################### STRATEGY END ####################-->
+
+        <!--#################### STREAM BEGIN ####################-->
+
+        <ComponentType Name="Streams" Description="associated to audio_stream_type_t definition,
+                             identifier mapping must match the value of the enum">
+            <Component Name="voice_call" Type="Stream" Mapping="Stream:VoiceCall,Identifier:0"/>
+            <Component Name="system" Type="Stream" Mapping="Stream:System,Identifier:1"/>
+            <Component Name="ring" Type="Stream" Mapping="Stream:Ring,Identifier:2"/>
+            <Component Name="music" Type="Stream" Mapping="Stream:Music,Identifier:3"/>
+            <Component Name="alarm" Type="Stream" Mapping="Stream:Alarm,Identifier:4"/>
+            <Component Name="notification" Type="Stream"
+                                           Mapping="Stream:Notification,Identifier:5"/>
+            <Component Name="bluetooth_sco" Type="Stream"
+                                            Mapping="Stream:BluetoothSco,Identifier:6"/>
+            <Component Name="enforced_audible" Type="Stream"
+                                               Mapping="Stream:EnforceAudible,Identifier:7"
+                       Description="Sounds that cannot be muted by user and must
+                                    be routed to speaker"/>
+            <Component Name="dtmf" Type="Stream" Mapping="Stream:Dtmf,Identifier:8"/>
+            <Component Name="tts" Type="Stream" Mapping="Stream:Tts,Identifier:9"
+                             Description="Transmitted Through Speaker.
+                                          Plays over speaker only, silent on other devices"/>
+            <Component Name="accessibility" Type="Stream"
+                                            Mapping="Stream:Accessibility,Identifier:10"
+                             Description="For accessibility talk back prompts"/>
+            <Component Name="rerouting" Type="Stream" Mapping="Stream:Rerouting,Identifier:11"
+                             Description="For dynamic policy output mixes"/>
+            <Component Name="patch" Type="Stream" Mapping="Stream:Patch,Identifier:12"
+                             Description="For internal audio flinger tracks. Fixed volume"/>
+        </ComponentType>
+
+        <!--#################### STREAM END ####################-->
+
+        <!--#################### USAGE BEGIN ####################-->
+
+        <ComponentType Name="Usages" Description="associated to audio_stream_type_t definition,
+                             identifier mapping must match the value of the enum">
+            <Component Name="unknown" Type="Usage" Mapping="Amend1:Unknown,Identifier:0"/>
+            <Component Name="media" Type="Usage" Mapping="Amend1:Media,Identifier:1"/>
+            <Component Name="voice_communication" Type="Usage"
+                                                  Mapping="Amend1:VoiceCommunication,Identifier:2"/>
+            <Component Name="voice_communication_signalling" Type="Usage"
+                       Mapping="Amend1:VoiceCommunicationSignalling,Identifier:3"/>
+            <Component Name="alarm" Type="Usage" Mapping="Amend1:Alarm,Identifier:4"/>
+            <Component Name="notification" Type="Usage" Mapping="Amend1:Notification,Identifier:5"/>
+            <Component Name="notification_telephony_ringtone" Type="Usage"
+                       Mapping="Amend1:NotificationTelephonyRingtone,Identifier:6"/>
+            <Component Name="notification_communication_request" Type="Usage"
+                       Mapping="Amend1:NotificationCommunicationRequest,Identifier:7"/>
+            <Component Name="notification_communication_instant" Type="Usage"
+                       Mapping="Amend1:NotificationCommunicationInstant,Identifier:8"/>
+            <Component Name="notification_communication_delayed" Type="Usage"
+                       Mapping="Amend1:NotificationCommunicationDelated,Identifier:9"/>
+            <Component Name="notification_event" Type="Usage"
+                                                 Mapping="Amend1:NotificationEvent,Identifier:10"/>
+            <Component Name="assistance_accessibility" Type="Usage"
+                       Mapping="Amend1:AssistanceAccessibility,Identifier:11"/>
+            <Component Name="assistance_navigation_guidance" Type="Usage"
+                       Mapping="Amend1:AssistanceNavigationGuidance,Identifier:12"/>
+            <Component Name="assistance_sonification" Type="Usage"
+                       Mapping="Amend1:AssistanceSonification,Identifier:13"/>
+            <Component Name="game" Type="Usage" Mapping="Amend1:BluetoothSco,Identifier:14"/>
+            <Component Name="virtual_source" Type="Usage"
+                                             Mapping="Amend1:VirtualSource,Identifier:15"/>
+        </ComponentType>
+
+        <!--#################### USAGE END ####################-->
+
+        <!--#################### INPUT SOURCE BEGIN ####################-->
+
+        <ComponentType Name="InputSources" Description="associated to audio_source_t definition,
+                             identifier mapping must match the value of the enum">
+            <Component Name="default" Type="InputSource" Mapping="Amend1:Default,Identifier:0"/>
+            <Component Name="mic" Type="InputSource" Mapping="Amend1:Mic,Identifier:1"/>
+            <Component Name="voice_uplink" Type="InputSource"
+                                           Mapping="Amend1:VoiceUplink,Identifier:2"/>
+            <Component Name="voice_downlink" Type="InputSource"
+                                             Mapping="Amend1:VoiceDownlink,Identifier:3"/>
+            <Component Name="voice_call" Type="InputSource"
+                                         Mapping="Amend1:VoiceCall,Identifier:4"/>
+            <Component Name="camcorder" Type="InputSource" Mapping="Amend1:Camcorder,Identifier:5"/>
+            <Component Name="voice_recognition" Type="InputSource"
+                                                Mapping="Amend1:VoiceRecognition,Identifier:6"/>
+            <Component Name="voice_communication" Type="InputSource"
+                                                  Mapping="Amend1:VoiceCommunication,Identifier:7"/>
+            <Component Name="remote_submix" Type="InputSource"
+                                            Mapping="Amend1:RemoteSubmix,Identifier:8"/>
+            <Component Name="unprocessed" Type="InputSource"
+                                            Mapping="Amend1:Unprocessed,Identifier:9"/>
+            <Component Name="fm_tuner" Type="InputSource" Mapping="Amend1:FmTuner,Identifier:1998"/>
+            <Component Name="hotword" Type="InputSource" Mapping="Amend1:Hotword,Identifier:1999"/>
+        </ComponentType>
+
+        <!--#################### INPUT SOURCE END ####################-->
+
+    </ComponentLibrary>
+
+    <InstanceDefinition>
+        <Component Name="streams" Type="Streams"/>
+        <Component Name="strategies" Type="Strategies"/>
+        <Component Name="input_sources" Type="InputSources"/>
+        <Component Name="usages" Type="Usages"/>
+    </InstanceDefinition>
+</Subsystem>
diff --git a/common/audio/reference_configurable_audio_policy/policy_criteria.txt b/common/audio/reference_configurable_audio_policy/policy_criteria.txt
new file mode 100644
index 000000000..480cbe1cd
--- /dev/null
+++ b/common/audio/reference_configurable_audio_policy/policy_criteria.txt
@@ -0,0 +1,10 @@
+ExclusiveCriterion TelephonyMode                :   Normal          RingTone                InCall              InCommunication
+InclusiveCriterion AvailableInputDevices        :   Communication Ambient BuiltinMic BluetoothScoHeadset WiredHeadset Hdmi TelephonyRx BackMic RemoteSubmix AnlgDockHeadset DgtlDockHeadset UsbAccessory UsbDevice FmTuner TvTuner Line Spdif BluetoothA2dp Loopback Ip Bus Stub
+InclusiveCriterion AvailableOutputDevices       :   Earpiece Speaker WiredSpeaker WiredHeadset WiredHeadphone BluetoothSco BluetoothScoHeadset BluetoothScoCarkit BluetoothA2dp BluetoothA2dpHeadphones BluetoothA2dpSpeaker Hdmi AnlgDockHeadset DgtlDockHeadset UsbAccessory UsbDevice RemoteSubmix TelephonyTx Line HdmiArc Spdif Fm AuxLine SpeakerSafe Ip Bus Stub
+ExclusiveCriterion ForceUseForCommunication     :   ForceNone       ForceSpeaker            ForceBtSco
+ExclusiveCriterion ForceUseForMedia             :   ForceNone       ForceSpeaker			ForceHeadphones         ForceBtA2dp         ForceWiredAccessory ForceAnalogDock ForceDigitalDock    ForceNoBtA2dp       ForceSystemEnforced
+ExclusiveCriterion ForceUseForRecord            :   ForceNone       ForceBtSco              ForceWiredAccessory
+ExclusiveCriterion ForceUseForDock              :   ForceNone       ForceWiredAccessory     ForceBtCarDock      ForceBtDeskDock     ForceAnalogDock ForceDigitalDock
+ExclusiveCriterion ForceUseForSystem            :   ForceNone       ForceSystemEnforced
+ExclusiveCriterion ForceUseForHdmiSystemAudio   :   ForceNone       ForceHdmiSystemEnforced
+ExclusiveCriterion ForceUseForEncodedSurround   :   ForceNone       ForceEncodedSurroundNever   ForceEncodedSurroundAlways

From 9a6fc28c900f718355cb05ab98850a966570ff80 Mon Sep 17 00:00:00 2001
From: xhu2x <xiaopingx.hu@intel.com>
Date: Wed, 3 May 2017 16:45:28 +0800
Subject: [PATCH 071/427] Add OTA configurations

Modify mixin.spec that could support OAT feature

Bug ID: https://01.org/jira/browse/AIA-391
Test: Test it on Joule, the script is successful.

Signed-off-by: hu,xiaopingx xiaopingx.hu@intel.com
Signed-off-by: Chen,Xihua xihua.chen@intel.com
---
 androidia_64/mixins.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index c754b0827..598c865ca 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -35,3 +35,4 @@ debug-crashlogd: true
 debug-logs: true
 debug-phonedoctor: true
 debug-tools: true
+flashfiles: ini(oemvars=false,version=3.0,fastboot_min_battery_level=3500,installer=true)

From 1512c002ee0f055eaaba9a60fc60aac455bae115 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Wed, 24 May 2017 05:33:25 +0530
Subject: [PATCH 072/427] Update to latest Mixin changes.

Jira: None.
Test: Builds and boots to home screen.

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/AndroidBoard.mk  |  75 ++++++++++++
 androidia_64/BoardConfig.mk   |  25 +++-
 androidia_64/device.mk        |   1 +
 androidia_64/flashfiles.ini   | 220 ++++++++++++++++++++++++++++++++++
 androidia_64/init.recovery.rc |  35 ++++++
 5 files changed, 355 insertions(+), 1 deletion(-)
 create mode 100644 androidia_64/flashfiles.ini

diff --git a/androidia_64/AndroidBoard.mk b/androidia_64/AndroidBoard.mk
index bd8fa4360..a15820c68 100644
--- a/androidia_64/AndroidBoard.mk
+++ b/androidia_64/AndroidBoard.mk
@@ -291,4 +291,79 @@ $(INSTALLED_FACTORYIMAGE_TARGET) : $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK)
 
 .PHONY: factoryimage
 factoryimage: $(INSTALLED_FACTORYIMAGE_TARGET)
+##############################################################
+# Source: device/intel/mixins/groups/variants/default/AndroidBoard.mk
+##############################################################
+# flashfile_add_blob <blob_name> <path> <mandatory> <var_name>
+# - Delete ::variant:: from <path>
+# - If the result does not exists and <mandatory> is set, error
+# - If <var_name> is set, put the result in <var_name>
+# - Add the pair <result>:<blob_name> in BOARD_FLASHFILES_FIRMWARE
+define flashfile_add_blob
+$(eval blob := $(subst ::variant::,,$(2))) \
+$(if $(wildcard $(blob)), \
+    $(if $(4), $(eval $(4) := $(blob))) \
+    $(eval BOARD_FLASHFILES_FIRMWARE += $(blob):$(1)) \
+    , \
+    $(if $(3), $(error $(blob) does not exist)))
+endef
+
+##############################################################
+# Source: device/intel/mixins/groups/flashfiles/ini/AndroidBoard.mk
+##############################################################
+ff_intermediates := $(call intermediates-dir-for,PACKAGING,flashfiles)
+
+# We need a copy of the flashfiles configuration ini in the
+# TFP RADIO/ directory
+ff_config := $(ff_intermediates)/flashfiles.ini
+$(ff_config): $(FLASHFILES_CONFIG) | $(ACP)
+	$(copy-file-to-target)
+
+$(call add_variant_flashfiles,$(ff_intermediates))
+
+INSTALLED_RADIOIMAGE_TARGET += $(ff_config)
+
+
+$(call flashfile_add_blob,extra_script.edify,$(TARGET_DEVICE_DIR)/flashfiles/::variant::/extra_script.edify)
+
+# We take any required images that can't be derived elsewhere in
+# the TFP and put them in RADIO/provdata.zip.
+ff_intermediates := $(call intermediates-dir-for,PACKAGING,flashfiles)
+provdata_zip := $(ff_intermediates)/provdata.zip
+provdata_zip_deps := $(foreach pair,$(BOARD_FLASHFILES),$(call word-colon,1,$(pair)))
+ff_root := $(ff_intermediates)/root
+
+define copy-flashfile
+$(hide) $(ACP) -fp $(1) $(2)
+
+endef
+
+define deploy_provdata
+$(eval ff_var := $(subst provdata,,$(basename $(notdir $(1)))))
+$(hide) rm -f $(1)
+$(hide) rm -rf $(ff_intermediates)/root$(ff_var)
+$(hide) mkdir -p $(ff_intermediates)/root$(ff_var)
+$(foreach pair,$(BOARD_FLASHFILES$(ff_var)), \
+	$(call copy-flashfile,$(call word-colon,1,$(pair)),$(ff_intermediates)/root$(ff_var)/$(call word-colon,2,$(pair))))
+$(hide) zip -qj $(1) $(ff_intermediates)/root$(ff_var)/*
+endef
+
+ifneq ($(FLASHFILE_VARIANTS),)
+provdata_zip :=
+$(foreach var,$(FLASHFILE_VARIANTS), \
+	$(eval provdata_zip += $(ff_intermediates)/provdata_$(var).zip) \
+	$(eval BOARD_FLASHFILES_$(var) := $(BOARD_FLASHFILES)) \
+	$(eval BOARD_FLASHFILES_$(var) += $(BOARD_FLASHFILES_FIRMWARE_$(var))) \
+	$(eval provdata_zip_deps += $(foreach pair,$(BOARD_FLASHFILES_FIRMWARE_$(var)),$(call word-colon,1,$(pair)))))
+else
+$(eval BOARD_FLASHFILES += $(BOARD_FLASHFILES_FIRMWARE))
+$(eval provdata_zip_deps += $(foreach pair,$(BOARD_FLASHFILES_FIRMWARE),$(call word-colon,1,$(pair))))
+endif
+
+$(provdata_zip): $(provdata_zip_deps) | $(ACP)
+	$(call deploy_provdata,$@)
+
+
+INSTALLED_RADIOIMAGE_TARGET += $(provdata_zip)
+
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index acf6e334a..7a31383d2 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -106,7 +106,7 @@ endif
 
 BOARD_SYSTEMIMAGE_PARTITION_SIZE = 3758096384
 
-BOARD_BOOTLOADER_PARTITION_SIZE ?= 42914560
+BOARD_BOOTLOADER_PARTITION_SIZE ?= 62914560
 BOARD_BOOTLOADER_BLOCK_SIZE := 512
 TARGET_BOOTLOADER_BOARD_NAME := $(TARGET_DEVICE)
 
@@ -144,6 +144,21 @@ BOARD_FLASHFILES += $(PRODUCT_OUT)/config.img
 BOARD_FLASHFILES += $(PRODUCT_OUT)/vendor.img
 BOARD_FLASHFILES += $(PRODUCT_OUT)/factory.img
 BOARD_FLASHFILES += $(TARGET_DEVICE_DIR)/flash.json
+
+# -- OTA RELATED DEFINES --
+# tell build system where to get the recovery.fstab.
+TARGET_RECOVERY_FSTAB ?= $(TARGET_DEVICE_DIR)/fstab 
+# Used by ota_from_target_files to add platform-specific directives
+# to the OTA updater scripts
+TARGET_RELEASETOOLS_EXTENSIONS ?= device/intel/common/recovery
+# Adds edify commands swap_entries and copy_partition for robust
+# update of the EFI system partition
+TARGET_RECOVERY_UPDATER_LIBS := libupdater_esp
+# Extra libraries needed to be rolled into recovery updater
+# libgpt_static and libefivar are needed by libupdater_esp
+TARGET_RECOVERY_UPDATER_EXTRA_LIBS := libcommon_recovery libgpt_static libefivar
+# By default recovery minui expects RGBA framebuffer
+TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
 ##############################################################
 # Source: device/intel/mixins/groups/audio/android_ia/BoardConfig.mk
 ##############################################################
@@ -224,6 +239,14 @@ BOARD_SEPOLICY_M4DEFS += module_factory_partition=true
 ##############################################################
 BOARD_SEPOLICY_M4DEFS += module_debug_phonedoctor=true
 BOARD_SEPOLICY_DIRS += device/intel/sepolicy/debug-phonedoctor
+##############################################################
+# Source: device/intel/mixins/groups/flashfiles/ini/BoardConfig.mk
+##############################################################
+FLASHFILES_CONFIG ?= $(TARGET_DEVICE_DIR)/flashfiles.ini
+USE_INTEL_FLASHFILES := true
+VARIANT_SPECIFIC_FLASHFILES ?= false
+FAST_FLASHFILES := true
+
 # ------------------ END MIX-IN DEFINITIONS ------------------
 
 # Install Native Bridge
diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index b796d9f74..0809d75ac 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -35,6 +35,7 @@ PRODUCT_COPY_FILES += \
     $(if $(wildcard $(PRODUCT_DIR)init.$(TARGET_PRODUCT).rc),$(PRODUCT_DIR)init.$(TARGET_PRODUCT).rc,$(LOCAL_PATH)/init.rc):root/init.$(TARGET_PRODUCT).rc \
     $(if $(wildcard $(PRODUCT_DIR)ueventd.$(TARGET_PRODUCT).rc),$(PRODUCT_DIR)ueventd.$(TARGET_PRODUCT).rc,$(LOCAL_PATH)/ueventd.rc):root/ueventd.$(TARGET_PRODUCT).rc \
     $(LOCAL_PATH)/gpt.ini:root/gpt.$(TARGET_PRODUCT).ini \
+    $(LOCAL_PATH)/init.recovery.rc:root/init.recovery.$(TARGET_PRODUCT).rc \
 
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/tablet_core_hardware.xml:system/etc/permissions/tablet_core_hardware.xml
diff --git a/androidia_64/flashfiles.ini b/androidia_64/flashfiles.ini
new file mode 100644
index 000000000..345b1e8cf
--- /dev/null
+++ b/androidia_64/flashfiles.ini
@@ -0,0 +1,220 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/config-partition/enabled/flashfiles.ini
+##############################################################
+[output.install.cmd]
+additional-files += radio:config.img
+
+[command.format.config]
+tool = fastboot
+arg = format config
+description = Format config partition
+##############################################################
+# Source: device/intel/mixins/groups/vendor-partition/true/flashfiles.ini
+##############################################################
+[command.flash.vendor]
+tool = fastboot
+args = flash vendor $file
+file = images:vendor.img
+timeout = 600000
+description = Flash vendor partition
+##############################################################
+# Source: device/intel/mixins/groups/factory-partition/true/flashfiles.ini
+##############################################################
+[output.installer.cmd]
+additional-files += factory.img
+
+[group.erase-factory]
+name = Erase factory partition
+description = Erase factory partition, use with caution
+default = false
+
+[command.format.factory]
+tool = fastboot
+args = format factory
+description = Format factory partition
+group = erase-factory
+##############################################################
+# Source: device/intel/mixins/groups/flashfiles/ini/flashfiles.ini
+##############################################################
+# This file describe the commands needed to flash the board.
+# it is used to generate a json file for PhoneFlashTool, and
+# also to generate a script for the USB thumb drive installer.
+
+# there are 4 types of sections:
+# [output.xxx.yy] : tell the script to generate a file named xxx.yyy
+# [configuration.xxx] : add a new configuration in the PhoneFlashTool droplist
+#     each configuration defines the list of sets of commands.
+#     each command sets will be executed in the order they are in this file.
+#     for a configuration to be embeded in a json output file, it must
+#     be present in the "configurations" list of it
+# [command.xxxx.yyyy] : add a new command yyyy to the command set xxxxx
+#     so if a configuration has sets = "format reboot" then all commands
+#     [command.format.yyy] will be executed, followed by all [command.reboot.yyy]
+#     if the command requires a file to be passed, you can use $my_file in the args
+#     and then my_file = src:filename where src is the location of the file at
+#     build time (provdatazip, image, ...).
+# [group.xxxx] : add a checkbox in PFT UI, to enable/disable all commands
+#     which are member of this group. the default can be overriden in a configuration
+#     by setting override-xxxx = true or false.
+
+
+[global]
+# if you need additional files in the flashfiles.zip.
+# additional-files += radio:dediprog.bin
+
+[output.flash.json]
+fastboot-command-options += timeout=60000 retry=1 mandatory=true
+enable = true
+version = 3.0
+configurations += update blank
+
+[output.installer.cmd]
+sets = unlock partition erase format flash configure lock reboot
+additional-files += provdatazip:installer.efi provdatazip:startup.nsh images:cache.img
+enable = true
+
+[configuration.update]
+startState = pos
+sets = unlock flash capsule lock reboot
+default = true
+description = update phone to new release
+brief = update
+
+[configuration.blank]
+startState = dnx_os
+sets = fw_update bootstrap unlock partition erase format flash capsule configure lock reboot
+description = erase and flash all partitions, all data will be lost.
+brief = blank
+
+[group.delete-capsule]
+name = Disable capsule update
+description = Disable capsule update by deleting the capsule file from the ESP partition
+default = false
+
+[output.flash.json]
+fastboot-command-preconditions += battery
+
+[parameter.battery]
+name = battery
+type = variable
+tool = fastboot
+arg = getvar battery-voltage
+description = Fetch battery
+computedValue = $1
+filter = battery-voltage:[\s]*([0-9]+)mV
+value = 3500
+
+# The command.battery will be called before each fastboot command to get the battery level
+[group.check-battery]
+name = Check battery level
+description = Check battery level before sending fastboot command
+default = true
+
+[command.battery]
+tool = setVariable
+variable = battery
+description = Get battery level
+group = check-battery
+mandatory = false
+defaultValue = 3500
+
+# The precondition.battery will be checked before each fastboot command to ensure that battery
+# level is above the specified threshold
+[precondition.battery]
+tool = fastboot
+exception = bootstrap
+description = Check battery level: ${battery}mV
+expression = ${battery} >= 3500
+skipOnFailure = false
+
+[command.unlock.unlock]
+tool = fastboot
+args = flashing unlock
+description = Set device state to unlocked
+
+[command.erase.misc]
+tool = fastboot
+args = erase misc
+description = Erase misc partition
+
+[command.erase.persistent]
+tool = fastboot
+args = erase persistent
+description = Erase persistent partition
+
+[command.erase.metadata]
+tool = fastboot
+args = erase metadata
+description = Erase metadata partition
+
+[group.erase-efivars]
+name = Erase efi vars
+description = Erase all optional efi vars
+default = true
+
+[command.erase.efivars]
+tool = fastboot
+args = oem erase-efivars
+description = Erase all optional efi vars
+group = erase-efivars
+
+[command.format.cache]
+tool = fastboot
+args = format cache
+description = Format cache partition
+
+[command.flash.boot]
+tool = fastboot
+args = flash boot $file
+file = boot:boot:boot.img
+description = Flash boot partition
+
+[command.flash.recovery]
+tool = fastboot
+args = flash recovery $file
+file = boot:recovery:recovery.img
+description = Flash recovery partition
+
+[command.flash.system]
+tool = fastboot
+args = flash system $file
+file = images:system.img
+timeout = 600000
+description = Flash system partition
+
+[command.flash.bootloader]
+tool = fastboot
+args = flash bootloader $file
+file = bootloader:bootloader
+description = Flash bootloader partition
+
+[command.capsule.rm-capsule]
+tool = fastboot
+args = oem rm /ESP/BIOSUPDATE.FV
+group = delete-capsule
+description = Delete firmware capsule
+
+
+[command.format.data]
+tool = fastboot
+args = format data
+description = Format data partition
+
+[group.lock-device]
+name = Lock the device (it implies the userdata partition wipe)
+description = Put the device in locked state at the end of the flash procedure.
+default = true
+
+[command.lock.lock]
+tool = fastboot
+args = flashing lock
+group = lock-device
+description = Set device state to locked
+
+[command.reboot.continue]
+tool = fastboot
+args = continue
+description = Boot to main OS
+# ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/init.recovery.rc b/androidia_64/init.recovery.rc
index d414cc332..9572d58c7 100644
--- a/androidia_64/init.recovery.rc
+++ b/androidia_64/init.recovery.rc
@@ -29,6 +29,41 @@ on early-boot
     # tracefs is mounted after 1st access to it
     chmod 0755 /sys/kernel/debug/tracing
 ##############################################################
+# Source: device/intel/mixins/groups/usb-gadget/g_ffs/init.recovery.rc
+##############################################################
+on boot
+    mkdir /config 0500 root root
+    mount configfs none /config
+    mkdir /config/usb_gadget/g1 0770 shell shell
+    write /config/usb_gadget/g1/idVendor 0x18d1
+    mkdir /config/usb_gadget/g1/strings/0x409 0770
+    write /config/usb_gadget/g1/strings/0x409/serialnumber ${ro.serialno}
+    write /config/usb_gadget/g1/strings/0x409/manufacturer ${ro.product.manufacturer}
+    write /config/usb_gadget/g1/strings/0x409/product ${ro.product.model}
+    mkdir /config/usb_gadget/g1/functions/ffs.adb
+    mkdir /config/usb_gadget/g1/configs/b.1 0770 shell shell
+    mkdir /config/usb_gadget/g1/configs/b.1/strings/0x409 0770 shell shell
+    write /config/usb_gadget/g1/configs/b.1/MaxPower 500
+    mkdir /dev/usb-ffs 0770 shell shell
+    mkdir /dev/usb-ffs/adb 0770 shell shell
+    mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=2000
+    setprop sys.usb.configfs 1
+    setprop sys.usb.controller dwc3.0.auto
+ 
+on property:sys.usb.config=none && property:sys.usb.configfs=1
+    setprop sys.usb.ffs.ready 0
+ 
+on property:init.svc.adbd=stopped
+    setprop sys.usb.ffs.ready 0
+ 
+on property:sys.usb.ffs.ready=1
+    symlink /config/usb_gadget/g1/configs/b.1 /config/usb_gadget/g1/os_desc/b.1
+    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "adb"
+    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f1
+    write /config/usb_gadget/g1/UDC dwc3.0.auto
+    setprop persist.sys.usb.config adb
+
+##############################################################
 # Source: device/intel/mixins/groups/boot-arch/android_ia/init.recovery.rc
 ##############################################################
 service watchdogd /sbin/watchdogd

From d2e414423cd1d731de1019e42834e94c4d035018 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Wed, 24 May 2017 11:17:25 +0530
Subject: [PATCH 073/427] Update to latest mixin changes

- make factory compatible with GRUB
- disable verity

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/fstab   | 6 +++---
 androidia_64/gpt.ini | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/androidia_64/fstab b/androidia_64/fstab
index 4dded502d..11e245fae 100644
--- a/androidia_64/fstab
+++ b/androidia_64/fstab
@@ -19,7 +19,7 @@
 
 /dev/block/mmcblk1p7	/system         ext4    ro															wait
 /dev/block/mmcblk1p8	/cache          ext4    noatime,nosuid,nodev,errors=panic                           wait,check
-/dev/block/mmcblk1p12	/data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,forceencrypt=/dev/block/mmcblk1p6
+/dev/block/mmcblk1p13	/data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,forceencrypt=/dev/block/mmcblk1p6
 /dev/block/mmcblk1p3	/boot           emmc    defaults                                                    defaults
 /dev/block/mmcblk1p4	/recovery       emmc    defaults                                                    defaults
 /dev/block/mmcblk1p5	/misc           emmc    defaults                                                    defaults
@@ -37,9 +37,9 @@
 # Following line is required if you use a vendor image.
 # If the vendor image is not used,
 # following line should be commented with the related ones in BoardConfig.mk
-/dev/block/mmcblk1p10	/vendor         ext4    ro                                         wait,verify=/dev/block/mmcblk1p6
+/dev/block/mmcblk1p10	/vendor         ext4    ro                                         wait
 ##############################################################
 # Source: device/intel/mixins/groups/factory-partition/true/fstab
 ##############################################################
-/dev/block/mmcblk1p13      /factory        ext4    rw                                         wait
+/dev/block/mmcblk1p12      /factory        ext4    rw                                         wait
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/gpt.ini b/androidia_64/gpt.ini
index 166d6751b..7409aab97 100644
--- a/androidia_64/gpt.ini
+++ b/androidia_64/gpt.ini
@@ -4,7 +4,7 @@
 # Source: device/intel/mixins/groups/boot-arch/android_ia/gpt.ini
 ##############################################################
 [base]
-partitions = bootloader bootloader2 boot recovery misc metadata system cache persistent vendor config data factory
+partitions = bootloader bootloader2 boot recovery misc metadata system cache persistent vendor config factory data
 
 [partition.bootloader]
 label = android_bootloader

From fcdec19eb7d6f5a16bdc9554e842ba76c0912a1d Mon Sep 17 00:00:00 2001
From: Sebastien Guiriec <sebastien.guiriec@intel.com>
Date: Tue, 23 May 2017 16:33:19 +0200
Subject: [PATCH 074/427] Audio: Fix BT Audio with XML policy.

Default A2DP policy XML file is not well define for A2DP output.
This patch is adding more precise format definition for A2DP output
source like inside the AOSP reference config.

Jira: None

Test: Validated under Intel NuC

Signed-off-by: Sebastien Guiriec <sebastien.guiriec@intel.com>
---
 .../default/policy/a2dp_audio_policy_configuration.xml      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/audio/default/policy/a2dp_audio_policy_configuration.xml b/common/audio/default/policy/a2dp_audio_policy_configuration.xml
index 7bcab5cdd..ced746316 100644
--- a/common/audio/default/policy/a2dp_audio_policy_configuration.xml
+++ b/common/audio/default/policy/a2dp_audio_policy_configuration.xml
@@ -2,7 +2,11 @@
 <!-- A2dp Audio HAL Audio Policy Configuration file -->
 <module name="a2dp" halVersion="2.0">
     <mixPorts>
-        <mixPort name="a2dp output" role="source"/>
+        <mixPort name="a2dp output" role="source">
+            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                     samplingRates="44100"
+                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+        </mixPort>
         <mixPort name="a2dp input" role="sink">
             <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                      samplingRates="44100,48000"

From 29a07b9cbe2c55e52079e28c3a75adf6df4879d4 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Thu, 18 May 2017 17:27:10 -0500
Subject: [PATCH 075/427] Add support for stub HAL

This is required for Joule support or any device
with no attached audio hardware

Tracked-On: https://jira01.devtools.intel.com/browse/OAM-44350
Test: make sure audio apps work (no sound of course) and that USB audio
is detected and takes over

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 androidia_64/BoardConfig.mk                   |  5 ++
 androidia_64/device.mk                        |  9 ++-
 common/audio/AndroidBoard.mk                  |  9 +++
 common/audio/stub/mixer_paths_0.xml           |  3 +
 .../policy/audio_policy_configuration.xml     | 65 +++++++++++++++++++
 5 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 common/audio/stub/mixer_paths_0.xml
 create mode 100644 common/audio/stub/policy/audio_policy_configuration.xml

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 7a31383d2..ce9696725 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -165,10 +165,15 @@ TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
 BOARD_USES_ALSA_AUDIO := true
 BOARD_USES_TINY_ALSA_AUDIO := true
 BOARD_USES_GENERIC_AUDIO ?= false
+ifneq ($(BOARD_USES_GENERIC_AUDIO), true)
 # Audio HAL selection Flag default setting.
 #  INTEL_AUDIO_HAL:= audio     -> baseline HAL
 #  INTEL_AUDIO_HAL:= audio_pfw -> PFW-based HAL
 INTEL_AUDIO_HAL := audio
+else
+INTEL_AUDIO_HAL := stub
+endif
+
 # Use XML audio policy configuration file
 USE_XML_AUDIO_POLICY_CONF ?= 1
 # Use configurable audio policy
diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 0809d75ac..dd313db2a 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -330,9 +330,16 @@ PRODUCT_PACKAGES_DEBUG += \
          tinyplay \
          tinycap
 
+ifneq ($(BOARD_USES_GENERIC_AUDIO), true)
+PRODUCT_PACKAGES += \
+    audio.primary.android_ia
+else
+PRODUCT_PACKAGES += \
+    audio.primary.default
+endif
+
 # Extended Audio HALs
 PRODUCT_PACKAGES += \
-    audio.primary.android_ia \
     audio.r_submix.default \
     audio.usb.default \
     audio_policy.default.so \
diff --git a/common/audio/AndroidBoard.mk b/common/audio/AndroidBoard.mk
index 2f8aadcb1..5fa7820ce 100644
--- a/common/audio/AndroidBoard.mk
+++ b/common/audio/AndroidBoard.mk
@@ -1,6 +1,15 @@
 LOCAL_PATH := $(call my-dir)
 
 # audio hardware is not discoverable, select hardware or use basic default
+ifeq ($(INTEL_AUDIO_HAL), stub)
+
+# this option only enables USB, A2DP and remote submix audio.
+# the audio.primary.default HAL is part of the build to pass
+# CTS tests but only acts as a NULL sink/source
+
+AUDIO_HARDWARE := stub
+
+else
 AUDIO_HARDWARE := default
 #AUDIO_HARDWARE := PCH-CX20724
 # Next configuration is used for Intel NUC6i5SYH
diff --git a/common/audio/stub/mixer_paths_0.xml b/common/audio/stub/mixer_paths_0.xml
new file mode 100644
index 000000000..0661ef118
--- /dev/null
+++ b/common/audio/stub/mixer_paths_0.xml
@@ -0,0 +1,3 @@
+<mixer>
+  <!-- Dummy file in case of stub HAL -->
+</mixer>
diff --git a/common/audio/stub/policy/audio_policy_configuration.xml b/common/audio/stub/policy/audio_policy_configuration.xml
new file mode 100644
index 000000000..eb96f32c7
--- /dev/null
+++ b/common/audio/stub/policy/audio_policy_configuration.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Copyright (C) 2017 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.
+-->
+
+<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+    <!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
+
+    <!-- Modules section:
+        There is one section per audio HW module present on the platform.
+        Each module section will contains two mandatory tags for audio HAL “halVersion” and “name”.
+        The module names are the same as in current .conf file:
+                “primary”, “A2DP”, “remote_submix”, “USB”
+        Each module will contain the following sections:
+        “devicePorts”: a list of device descriptors for all input and output devices accessible via this
+        module.
+        This contains both permanently attached devices and removable devices.
+        “mixPorts”: listing all output and input streams exposed by the audio HAL
+        “routes”: list of possible connections between input and output devices or between stream and
+        devices.
+            "route": is defined by an attribute:
+                -"type": <mux|mix> means all sources are mutual exclusive (mux) or can be mixed (mix)
+                -"sink": the sink involved in this route
+                -"sources": all the sources than can be connected to the sink via vis route
+        “attachedDevices”: permanently attached devices.
+        The attachedDevices section is a list of devices names. The names correspond to device names
+        defined in <devicePorts> section.
+        “defaultOutputDevice”: device to be used by default when no policy rule applies
+    -->
+    <modules>
+
+        <!-- Stub Audio HAL -->
+        <xi:include href="stub_audio_policy_configuration.xml"/>
+
+        <!-- A2dp Audio HAL -->
+        <xi:include href="a2dp_audio_policy_configuration.xml"/>
+
+        <!-- Usb Audio HAL -->
+        <xi:include href="usb_audio_policy_configuration.xml"/>
+
+        <!-- Remote Submix Audio HAL -->
+        <xi:include href="r_submix_audio_policy_configuration.xml"/>
+
+    </modules>
+    <!-- End of Modules section -->
+
+    <!-- Volume section -->
+
+    <xi:include href="audio_policy_volumes.xml"/>
+    <xi:include href="default_volume_tables.xml"/>
+
+    <!-- End of Volume section -->
+
+</audioPolicyConfiguration>

From fc4ec9e3e4a599e209b277574f2cc560522c12f6 Mon Sep 17 00:00:00 2001
From: Sebastien Guiriec <sebastien.guiriec@intel.com>
Date: Fri, 5 May 2017 08:56:31 +0200
Subject: [PATCH 076/427] Update for Parameter Framework Audio base HAL.

This patch is adding the reference configuration files in order to
support the Audio Parameter Framework base HAL for Intel NuC. Please note
that the configuration is still on baseline audio HAL. After swith to
Parameter Framework baseline HAL only run of mixin-update script will
be needed.

Jira:None

Test: Validated under Intel NuC 6i5SYH.

Signed-off-by: Sebastien Guiriec <sebastien.guiriec@intel.com>
---
 common/audio/AndroidBoard.mk                  |  52 +++++--
 common/audio/PCH-ALC283/AndroidBoard.mk       | 143 ++++++++++++++++++
 .../parameter-framework/AudioCriteria.txt     |   7 +
 .../AudioParameterFramework.xml               |  13 ++
 .../Audio/AudioConfigurableDomains-Tuning.xml |  45 ++++++
 .../Settings/Audio/routing_alc283.pfw         |  39 +++++
 .../Settings/Audio/routing_hdmi.pfw           |  22 +++
 .../Structure/Audio/AudioClass.xml            |   6 +
 .../Structure/Audio/HdmiSubsystem.xml         |  22 +++
 .../Audio/RealtekAlc283Subsystem.xml          |  31 ++++
 .../policy/audio_policy_configuration.xml     |  80 +++++-----
 .../PCH-ALC283/topology/layout_probes.xml     |   2 +
 .../PCH-ALC283/topology/layout_topology.xml   |  44 ++++++
 .../PCH-ALC283/topology/layout_types.xml      |  74 +++++++++
 .../audio/PCH-ALC283/topology/layout_ui.xml   |  20 +++
 .../policy/audio_policy_configuration.xml     |  45 ++----
 .../stub_audio_policy_configuration.xml       |  47 ------
 common/audio/default/route/audio_criteria.xml |  49 ++++++
 .../default/route/audio_criterion_types.xml   |  65 ++++++++
 19 files changed, 685 insertions(+), 121 deletions(-)
 create mode 100644 common/audio/PCH-ALC283/AndroidBoard.mk
 create mode 100644 common/audio/PCH-ALC283/parameter-framework/AudioCriteria.txt
 create mode 100644 common/audio/PCH-ALC283/parameter-framework/AudioParameterFramework.xml
 create mode 100644 common/audio/PCH-ALC283/parameter-framework/Settings/Audio/AudioConfigurableDomains-Tuning.xml
 create mode 100644 common/audio/PCH-ALC283/parameter-framework/Settings/Audio/routing_alc283.pfw
 create mode 100644 common/audio/PCH-ALC283/parameter-framework/Settings/Audio/routing_hdmi.pfw
 create mode 100644 common/audio/PCH-ALC283/parameter-framework/Structure/Audio/AudioClass.xml
 create mode 100644 common/audio/PCH-ALC283/parameter-framework/Structure/Audio/HdmiSubsystem.xml
 create mode 100644 common/audio/PCH-ALC283/parameter-framework/Structure/Audio/RealtekAlc283Subsystem.xml
 create mode 100644 common/audio/PCH-ALC283/topology/layout_probes.xml
 create mode 100644 common/audio/PCH-ALC283/topology/layout_topology.xml
 create mode 100644 common/audio/PCH-ALC283/topology/layout_types.xml
 create mode 100644 common/audio/PCH-ALC283/topology/layout_ui.xml
 delete mode 100644 common/audio/default/policy/stub_audio_policy_configuration.xml
 create mode 100644 common/audio/default/route/audio_criteria.xml
 create mode 100644 common/audio/default/route/audio_criterion_types.xml

diff --git a/common/audio/AndroidBoard.mk b/common/audio/AndroidBoard.mk
index 5fa7820ce..316d50d3a 100644
--- a/common/audio/AndroidBoard.mk
+++ b/common/audio/AndroidBoard.mk
@@ -26,6 +26,10 @@ LOCAL_REQUIRED_MODULES := \
     audio_policy_configuration_files \
     audio_settings_configuration_files
 
+ifeq ($(INTEL_AUDIO_HAL),audio_pfw)
+LOCAL_REQUIRED_MODULES += audio_hal_configuration_files
+endif
+
 include $(BUILD_PHONY_PACKAGE)
 
 ###########################################
@@ -37,7 +41,6 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_REQUIRED_MODULES := \
     a2dp_audio_policy_configuration.xml \
     r_submix_audio_policy_configuration.xml \
-    stub_audio_policy_configuration.xml \
     usb_audio_policy_configuration.xml \
     audio_policy_volumes.xml \
     default_volume_tables.xml \
@@ -82,7 +85,7 @@ LOCAL_SRC_FILES := default/policy/$(LOCAL_MODULE)
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := stub_audio_policy_configuration.xml
+LOCAL_MODULE := usb_audio_policy_configuration.xml
 LOCAL_MODULE_OWNER := intel
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
@@ -91,23 +94,46 @@ LOCAL_SRC_FILES := default/policy/$(LOCAL_MODULE)
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := usb_audio_policy_configuration.xml
+LOCAL_MODULE := audio_policy_configuration.xml
 LOCAL_MODULE_OWNER := intel
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
-LOCAL_SRC_FILES := default/policy/$(LOCAL_MODULE)
+LOCAL_SRC_FILES := $(AUDIO_HARDWARE)/policy/$(LOCAL_MODULE)
 include $(BUILD_PREBUILT)
+###########################################
 
+###########################################
+# Audio HAL configuration file
+###########################################
 include $(CLEAR_VARS)
-LOCAL_MODULE := audio_policy_configuration.xml
+LOCAL_MODULE := audio_hal_configuration_files
+LOCAL_MODULE_TAGS := optional
+LOCAL_REQUIRED_MODULES := \
+    vendor_audio_criteria.xml \
+    vendor_audio_criterion_types.xml
+
+include $(BUILD_PHONY_PACKAGE)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := vendor_audio_criteria.xml
+LOCAL_MODULE_STEM := audio_criteria.xml
 LOCAL_MODULE_OWNER := intel
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
-LOCAL_SRC_FILES := $(AUDIO_HARDWARE)/policy/$(LOCAL_MODULE)
+LOCAL_SRC_FILES := default/route/$(LOCAL_MODULE_STEM)
 include $(BUILD_PREBUILT)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE :=  vendor_audio_criterion_types.xml
+LOCAL_MODULE_STEM :=  audio_criterion_types.xml
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
+LOCAL_SRC_FILES := default/route/$(LOCAL_MODULE_STEM)
+include $(BUILD_PREBUILT)
 ###########################################
 
 ###########################################
@@ -116,19 +142,25 @@ include $(BUILD_PREBUILT)
 include $(CLEAR_VARS)
 LOCAL_MODULE := audio_settings_configuration_files
 LOCAL_MODULE_TAGS := optional
-LOCAL_REQUIRED_MODULES := \
-    mixer_paths_0.xml
-
+ifeq ($(INTEL_AUDIO_HAL),audio_pfw)
+LOCAL_REQUIRED_MODULES := audio_parameter_framework
+else
+LOCAL_REQUIRED_MODULES := mixer_paths_0.xml
+endif
 include $(BUILD_PHONY_PACKAGE)
 
+ifeq ($(INTEL_AUDIO_HAL),audio_pfw)
+include device/intel/android_ia/common/audio/$(AUDIO_HARDWARE)/AndroidBoard.mk
+else
 include $(CLEAR_VARS)
 LOCAL_MODULE := mixer_paths_0.xml
 LOCAL_MODULE_OWNER := intel
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
-LOCAL_SRC_FILES := $(AUDIO_HARDWARE)/mixer_paths_0.xml
+LOCAL_SRC_FILES := $(AUDIO_HARDWARE)/$(LOCAL_MODULE)
 include $(BUILD_PREBUILT)
+endif
 ###########################################
 
 ifeq ($(USE_CONFIGURABLE_AUDIO_POLICY), 1)
diff --git a/common/audio/PCH-ALC283/AndroidBoard.mk b/common/audio/PCH-ALC283/AndroidBoard.mk
new file mode 100644
index 000000000..d5f86031f
--- /dev/null
+++ b/common/audio/PCH-ALC283/AndroidBoard.mk
@@ -0,0 +1,143 @@
+LOCAL_PATH := $(call my-dir)
+PFW_CORE := external/parameter-framework
+BUILD_PFW_SETTINGS := $(PFW_CORE)/support/android/build_pfw_settings.mk
+PFW_DEFAULT_SCHEMAS_DIR := $(PFW_CORE)/upstream/schemas
+PFW_SCHEMAS_DIR := $(PFW_DEFAULT_SCHEMAS_DIR)
+
+###########################################
+# Audio stack Package
+###########################################
+include $(CLEAR_VARS)
+LOCAL_MODULE := audio_parameter_framework
+LOCAL_MODULE_TAGS := optional
+LOCAL_REQUIRED_MODULES := \
+    libremote-processor \
+    remote-process \
+    AudioConfigurableDomains.xml \
+    topology.audio.$(TARGET_DEVICE)
+
+include $(BUILD_PHONY_PACKAGE)
+
+
+###########################################
+# Audio Tuning Tool Configuration file
+###########################################
+include $(CLEAR_VARS)
+LOCAL_MODULE := topology.audio.$(TARGET_DEVICE)
+LOCAL_MODULE_TAGS := optional
+LOCAL_REQUIRED_MODULES := \
+    layout_types.xml \
+    layout_topology.xml \
+    layout_ui.xml \
+    layout_probes.xml
+
+include $(BUILD_PHONY_PACKAGE)
+
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := layout_types.xml
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_RELATIVE_PATH := tuning/audio
+LOCAL_SRC_FILES := topology/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := layout_topology.xml
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_RELATIVE_PATH := tuning/audio
+LOCAL_SRC_FILES := topology/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := layout_ui.xml
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_RELATIVE_PATH := tuning/audio
+LOCAL_SRC_FILES := topology/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := layout_probes.xml
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_RELATIVE_PATH := tuning/audio
+LOCAL_SRC_FILES := topology/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+###########################################
+
+###########################################
+# Audio PFW Package
+###########################################
+include $(CLEAR_VARS)
+LOCAL_MODULE := AudioConfigurableDomains.xml
+LOCAL_MODULES_TAGS := optional
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+    AudioParameterFramework.xml \
+    AudioClass.xml \
+    RealtekAlc283Subsystem.xml \
+    HdmiSubsystem.xml
+
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Audio
+LOCAL_REQUIRED_MODULES := \
+    libtinyalsa-subsystem
+
+PFW_TOPLEVEL_FILE := $(TARGET_OUT_ETC)/parameter-framework/AudioParameterFramework.xml
+PFW_CRITERIA_FILE := $(LOCAL_PATH)/parameter-framework/AudioCriteria.txt
+PFW_TUNING_FILE   := $(LOCAL_PATH)/$(LOCAL_MODULE_RELATIVE_PATH)/AudioConfigurableDomains-Tuning.xml
+
+PFW_EDD_FILES := \
+    $(LOCAL_PATH)/$(LOCAL_MODULE_RELATIVE_PATH)/routing_alc283.pfw \
+    $(LOCAL_PATH)/$(LOCAL_MODULE_RELATIVE_PATH)/routing_hdmi.pfw
+
+include $(BUILD_PFW_SETTINGS)
+
+###########################################
+# Audio PFW top file
+###########################################
+include $(CLEAR_VARS)
+LOCAL_MODULE := AudioParameterFramework.xml
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_RELATIVE_PATH := parameter-framework
+LOCAL_SRC_FILES := parameter-framework/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+###########################################
+
+###########################################
+# Audio PFW Structure files
+###########################################
+include $(CLEAR_VARS)
+LOCAL_MODULE := AudioClass.xml
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Structure/Audio
+LOCAL_SRC_FILES := $(LOCAL_MODULE_RELATIVE_PATH)/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := RealtekAlc283Subsystem.xml
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Structure/Audio
+LOCAL_SRC_FILES := $(LOCAL_MODULE_RELATIVE_PATH)/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := HdmiSubsystem.xml
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Structure/Audio
+LOCAL_SRC_FILES := $(LOCAL_MODULE_RELATIVE_PATH)/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+###########################################
diff --git a/common/audio/PCH-ALC283/parameter-framework/AudioCriteria.txt b/common/audio/PCH-ALC283/parameter-framework/AudioCriteria.txt
new file mode 100644
index 000000000..9f6043489
--- /dev/null
+++ b/common/audio/PCH-ALC283/parameter-framework/AudioCriteria.txt
@@ -0,0 +1,7 @@
+ExclusiveCriterion  Mode                   :  Normal
+InclusiveCriterion  RoutageState           :  Configure   Flow          Path
+InclusiveCriterion  OpenedPlaybackRoutes   :  primary_output       hdmi_stereo     hdmi_multi
+InclusiveCriterion  OpenedCaptureRoutes    :  primary_input
+InclusiveCriterion  SelectedInputDevices   :  Headset
+InclusiveCriterion  SelectedOutputDevices  :  Headphones  Headset       Line      Ihf      AuxDigital 
+ExclusiveCriterion  ScreenState            :  Off         On
diff --git a/common/audio/PCH-ALC283/parameter-framework/AudioParameterFramework.xml b/common/audio/PCH-ALC283/parameter-framework/AudioParameterFramework.xml
new file mode 100644
index 000000000..870a29e52
--- /dev/null
+++ b/common/audio/PCH-ALC283/parameter-framework/AudioParameterFramework.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ParameterFrameworkConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Schemas/ParameterFrameworkConfiguration.xsd"
+    SystemClassName="Audio" ServerPort="5000" TuningAllowed="true">
+    <SubsystemPlugins>
+        <Location Folder="">
+            <Plugin Name="libtinyalsa-subsystem.so"/>
+        </Location>
+    </SubsystemPlugins>
+    <StructureDescriptionFileLocation Path="Structure/Audio/AudioClass.xml"/>
+    <SettingsConfiguration>
+        <ConfigurableDomainsFileLocation Path="Settings/Audio/AudioConfigurableDomains.xml"/>
+    </SettingsConfiguration>
+</ParameterFrameworkConfiguration>
diff --git a/common/audio/PCH-ALC283/parameter-framework/Settings/Audio/AudioConfigurableDomains-Tuning.xml b/common/audio/PCH-ALC283/parameter-framework/Settings/Audio/AudioConfigurableDomains-Tuning.xml
new file mode 100644
index 000000000..1ac247c16
--- /dev/null
+++ b/common/audio/PCH-ALC283/parameter-framework/Settings/Audio/AudioConfigurableDomains-Tuning.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ConfigurableDomains xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Schemas/ConfigurableDomains.xsd" SystemClassName="Audio">
+  <ConfigurableDomain Name="OutputDevice.Selected" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Multimedia.Headset">
+        <CompoundRule Type="Any">
+          <SelectionCriterionRule SelectionCriterion="SelectedOutputDevices" MatchesWhen="Includes" Value="Headset"/>
+          <SelectionCriterionRule SelectionCriterion="SelectedOutputDevices" MatchesWhen="Includes" Value="Headphones"/>
+          <SelectionCriterionRule SelectionCriterion="SelectedOutputDevices" MatchesWhen="Includes" Value="Line"/>
+        </CompoundRule>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Audio/alc283/output/headset/volume"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Multimedia.Headset">
+        <ConfigurableElement Path="/Audio/alc283/output/headset/volume">
+          <IntegerParameter Name="volume">50 50</IntegerParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+
+  <ConfigurableDomain Name="InputDevice.Selected" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Multimedia.Headset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="SelectedInputDevices" MatchesWhen="Includes" Value="Headset"/>
+        </CompoundRule>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Audio/alc283/input/headset/volume"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Multimedia.Headset">
+        <ConfigurableElement Path="/Audio/alc283/input/headset/volume">
+          <IntegerParameter Name="volume">50 50</IntegerParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+
+</ConfigurableDomains>
diff --git a/common/audio/PCH-ALC283/parameter-framework/Settings/Audio/routing_alc283.pfw b/common/audio/PCH-ALC283/parameter-framework/Settings/Audio/routing_alc283.pfw
new file mode 100644
index 000000000..a7b2f1434
--- /dev/null
+++ b/common/audio/PCH-ALC283/parameter-framework/Settings/Audio/routing_alc283.pfw
@@ -0,0 +1,39 @@
+domainGroup: Routing.Alc283
+
+	#########################################
+	############### Configure ###############
+	#########################################
+
+	domainGroup: Configure
+		RoutageState Includes Configure
+
+		domainGroup: Playback
+			domainGroup: Media
+				domain: Headset
+					conf: Bind
+						ALL
+							OpenedPlaybackRoutes Includes primary_output
+							ANY
+								SelectedOutputDevices Includes Headset
+								SelectedOutputDevices Includes Headphones
+								SelectedOutputDevices Includes Line
+						/Audio/alc283/output/headset/switch = 1 1
+
+					conf: Unbind
+						/Audio/alc283/output/headset/switch = 0 0
+
+		domainGroup: Capture
+			domainGroup: Media
+				confType: Bind
+					ANY
+						OpenedCaptureRoutes Includes primary_input
+
+				domain: Headset
+					conf: Bind
+						SelectedInputDevices Includes Headset
+						/Audio/alc283/input/headset/switch = 1 1
+
+					conf: Unbind
+						/Audio/alc283/input/headset/switch = 0 0
+
+
diff --git a/common/audio/PCH-ALC283/parameter-framework/Settings/Audio/routing_hdmi.pfw b/common/audio/PCH-ALC283/parameter-framework/Settings/Audio/routing_hdmi.pfw
new file mode 100644
index 000000000..23df1e5b1
--- /dev/null
+++ b/common/audio/PCH-ALC283/parameter-framework/Settings/Audio/routing_hdmi.pfw
@@ -0,0 +1,22 @@
+domainGroup: Routing.Hdmi
+
+	#########################################
+	############### Configure ###############
+	#########################################
+
+	domainGroup: Configure
+		RoutageState Includes Configure
+
+		domainGroup: Playack
+			domain: Port0
+				conf: Bind
+					ALL
+						ANY
+							OpenedPlaybackRoutes Includes hdmi_stereo
+							OpenedPlaybackRoutes Includes hdmi_multi
+						SelectedOutputDevices Includes AuxDigital
+					/Audio/hdmi/output/port0/switch = 1
+
+				conf: Unbind
+					/Audio/hdmi/output/port0/switch = 0
+
diff --git a/common/audio/PCH-ALC283/parameter-framework/Structure/Audio/AudioClass.xml b/common/audio/PCH-ALC283/parameter-framework/Structure/Audio/AudioClass.xml
new file mode 100644
index 000000000..ba2bbbf8a
--- /dev/null
+++ b/common/audio/PCH-ALC283/parameter-framework/Structure/Audio/AudioClass.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemClass xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../Schemas/SystemClass.xsd" Name="Audio">
+    <SubsystemInclude Path="RealtekAlc283Subsystem.xml"/>
+    <SubsystemInclude Path="HdmiSubsystem.xml"/>
+</SystemClass>
+
diff --git a/common/audio/PCH-ALC283/parameter-framework/Structure/Audio/HdmiSubsystem.xml b/common/audio/PCH-ALC283/parameter-framework/Structure/Audio/HdmiSubsystem.xml
new file mode 100644
index 000000000..92b9fcd1a
--- /dev/null
+++ b/common/audio/PCH-ALC283/parameter-framework/Structure/Audio/HdmiSubsystem.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Subsystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xsi:noNamespaceSchemaLocation="../../Schemas/Subsystem.xsd"
+    Name="hdmi" Type="ALSA"
+    Mapping="Card:PCH,Debug">
+
+   <ComponentLibrary>
+        <!-- Outputs -->
+        <ComponentType Name="HdmiNode">
+            <BooleanParameter Name="switch" Mapping="Control:'IEC958 Playback Switch'"/>
+        </ComponentType>
+
+        <ComponentType Name="OutputNode">
+            <Component Name="port0" Type="HdmiNode"/>
+        </ComponentType>
+   </ComponentLibrary>
+
+    <InstanceDefinition>
+        <Component Name="output" Type="OutputNode"/>
+    </InstanceDefinition>
+</Subsystem>
diff --git a/common/audio/PCH-ALC283/parameter-framework/Structure/Audio/RealtekAlc283Subsystem.xml b/common/audio/PCH-ALC283/parameter-framework/Structure/Audio/RealtekAlc283Subsystem.xml
new file mode 100644
index 000000000..08790e969
--- /dev/null
+++ b/common/audio/PCH-ALC283/parameter-framework/Structure/Audio/RealtekAlc283Subsystem.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Subsystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xsi:noNamespaceSchemaLocation="../../Schemas/Subsystem.xsd"
+    Name="alc283" Type="ALSA"
+    Mapping="Card:PCH,Debug">
+
+   <ComponentLibrary>
+        <!-- Outputs -->
+        <ComponentType Name="MasterNode">
+            <BooleanParameter Name="switch" ArrayLength="2" Mapping="Control:'Master Playback Switch'"/>
+            <IntegerParameter Name="volume" Size="8" Signed="false" Min="0" Max="87" ArrayLength="2" Mapping="Control:'Master Playback Volume'"/>
+        </ComponentType>
+        <ComponentType Name="OutputNodes">
+            <Component Name="headset" Type="MasterNode"/>
+        </ComponentType>
+        <!-- Inputs -->
+        <ComponentType Name="CaptureNode">
+            <BooleanParameter Name="switch" ArrayLength="2" Mapping="Control:'Capture Switch'"/>
+            <IntegerParameter Name="volume" Size="8" Signed="false" Min="0" Max="63" ArrayLength="2" Mapping="Control:'Capture Volume'"/>
+        </ComponentType>
+        <ComponentType Name="InputNodes">
+            <Component Name="headset" Type="CaptureNode"/>
+        </ComponentType>
+   </ComponentLibrary>
+
+    <InstanceDefinition>
+        <Component Name="output" Type="OutputNodes"/>
+        <Component Name="input" Type="InputNodes"/>
+    </InstanceDefinition>
+</Subsystem>
diff --git a/common/audio/PCH-ALC283/policy/audio_policy_configuration.xml b/common/audio/PCH-ALC283/policy/audio_policy_configuration.xml
index 414bcb76b..aee968171 100644
--- a/common/audio/PCH-ALC283/policy/audio_policy_configuration.xml
+++ b/common/audio/PCH-ALC283/policy/audio_policy_configuration.xml
@@ -15,51 +15,51 @@
 -->
 
 <audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-    <!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
-
-    <!-- Modules section:
-        There is one section per audio HW module present on the platform.
-        Each module section will contains two mandatory tags for audio HAL “halVersion” and “name”.
-        The module names are the same as in current .conf file:
-                “primary”, “A2DP”, “remote_submix”, “USB”
-        Each module will contain the following sections:
-        “devicePorts”: a list of device descriptors for all input and output devices accessible via this
-        module.
-        This contains both permanently attached devices and removable devices.
-        “mixPorts”: listing all output and input streams exposed by the audio HAL
-        “routes”: list of possible connections between input and output devices or between stream and
-        devices.
-            "route": is defined by an attribute:
-                -"type": <mux|mix> means all sources are mutual exclusive (mux) or can be mixed (mix)
-                -"sink": the sink involved in this route
-                -"sources": all the sources than can be connected to the sink via vis route
-        “attachedDevices”: permanently attached devices.
-        The attachedDevices section is a list of devices names. The names correspond to device names
-        defined in <devicePorts> section.
-        “defaultOutputDevice”: device to be used by default when no policy rule applies
-    -->
     <modules>
         <!-- Primary Audio HAL -->
         <module name="primary" halVersion="3.0">
+            <attachedDevices>
+                <item>Default Out</item>
+                <item>Default In</item>
+            </attachedDevices>
+            <defaultOutputDevice>Default Out</defaultOutputDevice>
             <mixPorts>
-                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY">
+                <mixPort name="primary_output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY"
+                         card="PCH" device="0"
+                         requirePreEnable="0" requirePostDisable="0" silencePrologMs="0"
+                         periodSize="240" periodCount="2"
+                         startThreshold="239" stopThreshold="480" silenceThreshold="0" availMin="240">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
-                <mixPort name="hdmi_stereo" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY">
+                <mixPort name="hdmi_stereo" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY"
+                         card="PCH" device="3"
+                         requirePreEnable="0" requirePostDisable="0" silencePrologMs="0"
+                         periodSize="240" periodCount="2"
+                         startThreshold="239" stopThreshold="480" silenceThreshold="0" availMin="240">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
-                <mixPort name="hdmi_multi" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT">
+                <mixPort name="hdmi_multi" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT"
+                         card="PCH" device="3"
+                         requirePreEnable="0" requirePostDisable="0" silencePrologMs="0"
+                         periodSize="240" periodCount="4"
+                         startThreshold="239" stopThreshold="960" silenceThreshold="0" availMin="240">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"/>
                 </mixPort>
-                <mixPort name="primary input" role="sink">
+                <mixPort name="primary_input" role="sink" flags="AUDIO_INPUT_FLAG_PRIMARY"
+                         card="PCH" device="0"
+                         requirePreEnable="0" requirePostDisable="0" silencePrologMs="0"
+                         periodSize="240" periodCount="2"
+                         startThreshold="1" stopThreshold="480" silenceThreshold="0" availMin="240"
+                         supportedUseCases="AUDIO_SOURCE_MIC,AUDIO_SOURCE_VOICE_COMMUNICATION,AUDIO_SOURCE_CAMCORDER,AUDIO_SOURCE_VOICE_RECOGNITION,AUDIO_SOURCE_HOTWORD">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
             </mixPorts>
+
             <devicePorts>
                 <!-- Output devices declaration, i.e. Sink DEVICE PORT -->
                 <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
@@ -77,32 +77,37 @@
                              channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
                 </devicePort>
 
-                <devicePort tagName="HDMI" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
+                <devicePort tagName="HDMI" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="32000,44100,48000"/>
                 </devicePort>
 
+                <devicePort tagName="Default Out" type="AUDIO_DEVICE_OUT_STUB" role="sink">
+                </devicePort>
+                <devicePort tagName="Default In" type="AUDIO_DEVICE_IN_STUB" role="source">
+                </devicePort>
+
             </devicePorts>
             <!-- route declaration, i.e. list all available sources for a given sink -->
             <routes>
                 <route type="mix" sink="Wired Headset"
-                       sources="primary output"/>
+                       sources="primary_output"/>
                 <route type="mix" sink="Wired Headphones"
-                       sources="primary output"/>
-                <route type="mix" sink="primary input"
-                       sources="Wired Headset Mic"/>
+                       sources="primary_output"/>
+                <route type="mix" sink="Default Out"
+                       sources="primary_output"/>
 
                 <route type="mix" sink="HDMI"
                        sources="hdmi_stereo,hdmi_multi"/>
+
+                <route type="mix" sink="primary_input"
+                       sources="Wired Headset Mic,Default In"/>
             </routes>
 
         </module>
 
-        <!-- Stub Audio HAL -->
-        <xi:include href="stub_audio_policy_configuration.xml"/>
-
         <!-- A2dp Audio HAL -->
         <xi:include href="a2dp_audio_policy_configuration.xml"/>
 
@@ -122,4 +127,9 @@
 
     <!-- End of Volume section -->
 
+    <!--Audio HAL Custom section -->
+    <xi:include href="audio_criteria.xml"/>
+    <xi:include href="audio_criterion_types.xml"/>
+    <!--End of Audio HAL Custom section -->
+
 </audioPolicyConfiguration>
diff --git a/common/audio/PCH-ALC283/topology/layout_probes.xml b/common/audio/PCH-ALC283/topology/layout_probes.xml
new file mode 100644
index 000000000..552be524f
--- /dev/null
+++ b/common/audio/PCH-ALC283/topology/layout_probes.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ProbeLayout/>
diff --git a/common/audio/PCH-ALC283/topology/layout_topology.xml b/common/audio/PCH-ALC283/topology/layout_topology.xml
new file mode 100644
index 000000000..732f17d0f
--- /dev/null
+++ b/common/audio/PCH-ALC283/topology/layout_topology.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<SUBSYSTEM description="Audio system" name="audio" path="/Audio/hdmi">
+    <SUBSYSTEM description="HDMI" name="hdmi" path="System class not loaded!" type="t_hdmi">
+        <UI_ELEM name="hdmi_out_pipe_in" type="t_ui_0_in_1_out"/>
+        <UI_ELEM name="hdmi_out_pipe_out" type="t_ui_1_in_0_out"/>
+        <LINK name="">
+            <FROM module="hdmi_out_pipe_in" output="out0"/>
+            <TO module="hdmi_out_pipe_out" input="in0"/>
+        </LINK>
+    </SUBSYSTEM>
+    <SUBSYSTEM description="Audio analog hardware" name="realtek" path="/Audio/alc28" type="t_alc283">
+        <SUBSYSTEM name="inputs" path="/Audio/alc283/input" type="t_codec_input">
+            <MODULE name="input_volume" path="/Audio/alc283/input/headset/volume" type="t_gain"/>
+            <UI_ELEM name="input_adc" type="t_adc"/>
+            <LINK name="">
+                <FROM module="input_adc" output="in0" position=""/>
+                <TO module="input_volume" position=""/>
+            </LINK>
+        </SUBSYSTEM>
+        <SUBSYSTEM name="outputs" path="/Audio/alc283/output" type="t_codec_output">
+            <UI_ELEM name="output_dac" type="t_dac"/>
+            <MODULE name="output_volume" path="/Audio/alc283/output/headset/volume" type="t_gain"/>
+            <LINK name="">
+                <FROM module="output_dac" output="out0"/>
+                <TO module="output_volume" input="in0"/>
+            </LINK>
+        </SUBSYSTEM>
+    </SUBSYSTEM>
+    <UI_ELEM name="media_pcm" type="t_ui_0_in_1_out"/>
+    <UI_ELEM name="hdmi_pcm" type="t_ui_0_in_1_out"/>
+    <UI_ELEM name="primary_hal" type="t_ui_2_in_2_out"/>
+    <LINK name="Record">
+        <FROM module="media_pcm" output="out0" position="UP"/>
+        <TO module="primary_hal" input="in1"/>
+    </LINK>
+    <LINK name="Playback">
+        <FROM module="primary_hal" output="out1"/>
+        <TO module="media_pcm" input="in0" position="UP"/>
+    </LINK>
+    <LINK name="Hdmi Playback">
+        <FROM module="primary_hal" output="out1"/>
+        <TO module="hdmi_pcm" input="in0" position="UP"/>
+    </LINK>
+</SUBSYSTEM>
diff --git a/common/audio/PCH-ALC283/topology/layout_types.xml b/common/audio/PCH-ALC283/topology/layout_types.xml
new file mode 100644
index 000000000..16bd708f8
--- /dev/null
+++ b/common/audio/PCH-ALC283/topology/layout_types.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<LAYOUT_TYPES>
+    <SUBSYSTEM_TYPE version="1.0" image="" name="t_realtek">
+        <INPUT name="aif1_in" position="Continuous"/>
+        <OUTPUT name="aif1_out" position="Continuous"/>
+    </SUBSYSTEM_TYPE>
+    <MODULE_TYPE image="pipe.png" name="t_hdmi">
+        <INPUT name="in0" position="Continuous"/>
+        <OUTPUT name="out0" position="Continuous"/>
+    </MODULE_TYPE>
+    <SUBSYSTEM_TYPE version="1.0" image="pipe.png" name="t_subsyst_0_in_1_out">
+        <OUTPUT name="out0" position="Continuous"/>
+    </SUBSYSTEM_TYPE>
+    <SUBSYSTEM_TYPE version="1.0" image="pipe.png" name="t_subsyst_1_in_0_out">
+        <INPUT name="in0"/>
+    </SUBSYSTEM_TYPE>
+    <SUBSYSTEM_TYPE version="1.0" image="pipe.png" name="t_subsyst_0_in_2_out">
+        <OUTPUT name="out0" position="Continuous"/>
+        <OUTPUT name="out1" position="Continuous"/>
+    </SUBSYSTEM_TYPE>
+    <SUBSYSTEM_TYPE version="1.0" image="pipe.png" name="t_subsyst_2_in_0_out">
+        <INPUT name="in0"/>
+        <INPUT name="in1"/>
+    </SUBSYSTEM_TYPE>
+    <SUBSYSTEM_TYPE version="1.0" image="pipe.png" name="t_subsyst_1_in_1_out">
+        <INPUT name="in0" position="Continuous"/>
+        <OUTPUT name="out0" position="Continuous"/>
+    </SUBSYSTEM_TYPE>
+    <SUBSYSTEM_TYPE version="1.0" image="pipe.png" name="t_subsyst_2_in_2_out">
+        <INPUT name="in0" position="Continuous"/>
+        <INPUT name="in1" position="Continuous"/>
+        <OUTPUT name="out0" position="Continuous"/>
+        <OUTPUT name="out1" position="Continuous"/>
+    </SUBSYSTEM_TYPE>
+    <SUBSYSTEM_TYPE image="codec_input.png" name="t_codec_input">
+        <OUTPUT name="out0" position="Continuous"/>
+    </SUBSYSTEM_TYPE>
+    <SUBSYSTEM_TYPE image="codec_output.png" name="t_codec_output">
+        <OUTPUT name="in0" position="Continuous"/>
+    </SUBSYSTEM_TYPE>
+    <UI_ELEM_TYPE image="adc.png" name="t_adc">
+        <OUTPUT name="in0" position="Continuous"/>
+        <OUTPUT name="out0" position="Continuous"/>
+    </UI_ELEM_TYPE>
+    <UI_ELEM_TYPE image="dac.png" name="t_dac">
+        <OUTPUT name="in0" position="Continuous"/>
+        <OUTPUT name="out0" position="Continuous"/>
+    </UI_ELEM_TYPE>
+    <UI_ELEM_TYPE image="input.png" name="t_mic">
+        <OUTPUT name="out0" position="Continuous"/>
+    </UI_ELEM_TYPE>
+    <UI_ELEM_TYPE image="speaker.png" name="t_spk"/>
+    <UI_ELEM_TYPE name="t_ui_0_in_0_out"/>
+    <UI_ELEM_TYPE name="t_ui_0_in_1_out">
+        <OUTPUT name="out0" position="Continuous"/>
+    </UI_ELEM_TYPE>
+    <UI_ELEM_TYPE name="t_ui_1_in_0_out">
+        <INPUT name="in0" position="Continuous"/>
+    </UI_ELEM_TYPE>
+    <UI_ELEM_TYPE name="t_ui_1_in_1_out">
+        <INPUT name="in0" position="Continuous"/>
+        <OUTPUT name="out0" position="Continuous"/>
+    </UI_ELEM_TYPE>
+    <UI_ELEM_TYPE name="t_ui_2_in_2_out">
+        <INPUT name="in0" position="Continuous"/>
+        <INPUT name="in1" position="Continuous"/>
+        <OUTPUT name="out0" position="Continuous"/>
+        <OUTPUT name="out1" position="Continuous"/>
+    </UI_ELEM_TYPE>
+    <MODULE_TYPE image="gain.png" name="t_gain">
+        <INPUT name="in0" position="Continuous"/>
+        <OUTPUT name="out0" position="Continuous"/>
+    </MODULE_TYPE>
+</LAYOUT_TYPES>
diff --git a/common/audio/PCH-ALC283/topology/layout_ui.xml b/common/audio/PCH-ALC283/topology/layout_ui.xml
new file mode 100644
index 000000000..d3781a18e
--- /dev/null
+++ b/common/audio/PCH-ALC283/topology/layout_ui.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<LAYOUT_UI>
+    <MODULE_LAYOUT name="realtek" label="REALTEK ALC283" left="24" top="21" width="28" height="7"/>
+    <MODULE_LAYOUT name="hdmi" label="HDMI" left="11" top="21" width="12" height="7"/>
+    <MODULE_LAYOUT name="hdmi_out_pipe_in" label="HDMI OUT PIPE IN" left="4" top="3" width="15" height="5"/>
+    <MODULE_LAYOUT name="hdmi_out_pipe_out" label="HDMI OUT PIPE OUT" left="24" top="3" width="15" height="5"/>
+    <MODULE_LAYOUT name="inputs" label="INPUTS" left="17" top="8" width="18" height="22"/>
+    <MODULE_LAYOUT name="outputs" label="OUTPUTS" left="36" top="8" width="18" height="22"/>
+    <MODULE_LAYOUT name="input_volume" label="IN VOLUME" left="21" top="14" width="10" height="10"/>
+    <MODULE_LAYOUT name="input_adc" label="ADC" left="38" top="14" width="10" height="10"/>
+    <MODULE_LAYOUT name="output_dac" label="DAC" left="12" top="3" width="10" height="10"/>
+    <MODULE_LAYOUT name="output_volume" label="HEADSET" left="26" top="3" width="11" height="10"/>
+    <MODULE_LAYOUT name="media_pcm" label="Media PCM" left="24" top="17" width="28" height="4"/>
+    <MODULE_LAYOUT name="hdmi_pcm" label=" PCM" left="11" top="17" width="12" height="4"/>
+    <MODULE_LAYOUT name="primary_hal" label="Primary Audio HAL" left="10" top="1" width="43" height="10"/>
+    <MODULE_LAYOUT name="outputs_dac_1_gain" label="DAC 1 GAIN" left="20" top="10" width="10" height="10"/>
+    <MODULE_LAYOUT name="outputs_dac_2_gain" label="DAC 2 GAIN" left="20" top="34" width="10" height="10"/>
+    <MODULE_LAYOUT name="outputs_dac_1_right" label="DAC 1 Right" left="4" top="15" width="10" height="10"/>
+    <MODULE_LAYOUT name="aif1" label="AIF1" left="17" top="31" width="18" height="10"/>
+</LAYOUT_UI>
diff --git a/common/audio/default/policy/audio_policy_configuration.xml b/common/audio/default/policy/audio_policy_configuration.xml
index cceaa04f8..cf9f3fdde 100644
--- a/common/audio/default/policy/audio_policy_configuration.xml
+++ b/common/audio/default/policy/audio_policy_configuration.xml
@@ -15,29 +15,6 @@
 -->
 
 <audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-    <!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
-
-    <!-- Modules section:
-        There is one section per audio HW module present on the platform.
-        Each module section will contains two mandatory tags for audio HAL “halVersion” and “name”.
-        The module names are the same as in current .conf file:
-                “primary”, “A2DP”, “remote_submix”, “USB”
-        Each module will contain the following sections:
-        “devicePorts”: a list of device descriptors for all input and output devices accessible via this
-        module.
-        This contains both permanently attached devices and removable devices.
-        “mixPorts”: listing all output and input streams exposed by the audio HAL
-        “routes”: list of possible connections between input and output devices or between stream and
-        devices.
-            "route": is defined by an attribute:
-                -"type": <mux|mix> means all sources are mutual exclusive (mux) or can be mixed (mix)
-                -"sink": the sink involved in this route
-                -"sources": all the sources than can be connected to the sink via vis route
-        “attachedDevices”: permanently attached devices.
-        The attachedDevices section is a list of devices names. The names correspond to device names
-        defined in <devicePorts> section.
-        “defaultOutputDevice”: device to be used by default when no policy rule applies
-    -->
     <modules>
         <!-- Primary Audio HAL -->
         <module name="primary" halVersion="3.0">
@@ -47,11 +24,20 @@
             </attachedDevices>
             <defaultOutputDevice>Speaker</defaultOutputDevice>
             <mixPorts>
-                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY">
+                <mixPort name="primary_output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY"
+                         card="PCH" device="0"
+                         requirePreEnable="0" requirePostDisable="0" silencePrologMs="0"
+                         periodSize="240" periodCount="2"
+                         startThreshold="239" stopThreshold="480" silenceThreshold="0" availMin="240">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
-                <mixPort name="primary input" role="sink">
+                <mixPort name="primary_input" role="sink"
+                         card="PCH" device="0"
+                         requirePreEnable="0" requirePostDisable="0" silencePrologMs="0"
+                         periodSize="240" periodCount="2"
+                         startThreshold="1" stopThreshold="480" silenceThreshold="0" availMin="240"
+                         supportedUseCases="AUDIO_SOURCE_MIC,AUDIO_SOURCE_VOICE_COMMUNICATION,AUDIO_SOURCE_CAMCORDER,AUDIO_SOURCE_VOICE_RECOGNITION,AUDIO_SOURCE_HOTWORD">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
@@ -87,12 +73,13 @@
             <!-- route declaration, i.e. list all available sources for a given sink -->
             <routes>
                 <route type="mix" sink="Speaker"
-                       sources="primary output"/>
+                       sources="primary_output"/>
                 <route type="mix" sink="Wired Headset"
-                       sources="primary output"/>
+                       sources="primary_output"/>
                 <route type="mix" sink="Wired Headphones"
-                       sources="primary output"/>
-                <route type="mix" sink="primary input"
+                       sources="primary_output"/>
+
+                <route type="mix" sink="primary_input"
                        sources="Built-In Mic,Wired Headset Mic"/>
             </routes>
 
diff --git a/common/audio/default/policy/stub_audio_policy_configuration.xml b/common/audio/default/policy/stub_audio_policy_configuration.xml
deleted file mode 100644
index 2b49fa33f..000000000
--- a/common/audio/default/policy/stub_audio_policy_configuration.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<!-- Stub Audio HAL Audio Policy Configuration file -->
-
-<module name="stub" halVersion="2.0">
-    <attachedDevices>
-        <item>Default Out</item>
-        <item>Default In</item>
-        </attachedDevices>
-    <defaultOutputDevice>Default Out</defaultOutputDevice>
-    <mixPorts>
-        <mixPort name="stub output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY">
-            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                     samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-        </mixPort>
-
-        <mixPort name="stub input" role="sink">
-            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                     samplingRates="44100" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
-        </mixPort>
-    </mixPorts>
-    <devicePorts>
-        <devicePort tagName="Default Out" type="AUDIO_DEVICE_OUT_STUB" role="sink">
-                </devicePort>
-
-        <devicePort tagName="Default In" type="AUDIO_DEVICE_IN_STUB" role="source">
-        </devicePort>
-    </devicePorts>
-    <routes>
-        <route type="mix" sink="Default Out" sources="stub output"/>
-
-        <route type="mix" sink="stub input" sources="Default In"/>
-    </routes>
-</module>
diff --git a/common/audio/default/route/audio_criteria.xml b/common/audio/default/route/audio_criteria.xml
new file mode 100644
index 000000000..0c73d2b2d
--- /dev/null
+++ b/common/audio/default/route/audio_criteria.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 Intel
+
+ 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.
+-->
+<criteria>
+    <criterion name="SelectedOutputDevices" type="OutputDevicesMaskType" default="none" parameter="output_devices"/>
+    <criterion name="InputSources" type="InputSourcesType" default="none" parameter="input_sources"/>
+    <criterion name="MicMuted" type="BooleanType" default="False" parameter="mic_mute" mapping="false:False,true:True"/>
+    <criterion name="TtyDirection" type="TtyDirectionType" default="none" parameter="tty_mode"
+               mapping="tty_off:none,tty_vco:Downlink,tty_hco:Uplink,tty_full:Downlink|Uplink"/>
+    <criterion name="ScreenState" type="BooleanType" default="False" parameter="screen_state" mapping="off:False,on:True"/>
+    <criterion name="BtHeadsetBandType" type="BandType" default="NB" parameter="bt_wbs" mapping="off:NB,on:WB"/>
+    <criterion name="PreProcEnabled" type="PreProcessingType" default="none" parameter="pre_proc_requested"/>
+    <criterion name="ScreenRotation" type="ScreenRotationType" default="0" parameter="rotation"/>
+    <criterion name="HacSelected" type="BooleanType" default="False" parameter="HACSetting"
+               mapping="OFF:False,ON:True"/>
+    <criterion name="A2dpSuspended" type="BooleanType" default="False" parameter="A2dpSuspended"
+               mapping="false:False,true:True"/>
+    <criterion name="HfpClientBandType" type="BandType" default="Unknown" parameter="hfp_set_sampling_rate"
+               mapping="8000:NB,16000:WB"/>
+    <criterion name="SelectedInputDevices" type="InputDevicesMaskType" default="none" parameter="input_devices"/>
+    <criterion name="OutputFlags" type="OutputFlagsType" default="none" parameter="output_flags"/>
+    <criterion name="InputFlags" type="InputFlagsType" default="none" parameter="input_flags"/>
+    <criterion name="Mode" type="AndroidModeType" default="Normal" parameter="android_mode"/>
+    <criterion name="VoIPBandType" type="BandType" default="NB" parameter="voip_band_type"/>
+    <criterion name="FmEnabled" type="BooleanType" default="False" parameter="route-fm"
+               mapping="off:False,speaker:True,headset:True"/>
+    <criterion name="HfpClientEnable" type="BooleanType" default="False" parameter="hfp_enable"
+               mapping="false:False,true:True"/>
+    <criterion name="OutputDeviceAddresses" type="OutputDeviceAddressType" default="none" parameter="output_device_addresses"/>
+    <criterion name="InputDeviceAddresses" type="InputDeviceAddressType" default="none" parameter="input_device_addresses"/>
+    <criterion name="RoutageState" type="RoutingStageType" default="Flow|PostPath|StreamPath|Path|Configure"/>
+    <criterion name="OpenedCaptureRoutes" type="RouteCaptureType" default="none"/>
+    <criterion name="OpenedPlaybackRoutes" type="RoutePlaybackType" default="none"/>
+    <criterion name="BtHeadsetNrEc" type="BooleanType" default="False" parameter="bt_headset_nrec"
+               mapping="off:True,on:False"/>
+</criteria>
diff --git a/common/audio/default/route/audio_criterion_types.xml b/common/audio/default/route/audio_criterion_types.xml
new file mode 100644
index 000000000..2672a4a58
--- /dev/null
+++ b/common/audio/default/route/audio_criterion_types.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 Intel
+
+ 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.
+-->
+<criterion_types>
+    <!-- Mandatory, DO NOT DELETE
+                    A Flow stage on ClosingRoutes leads to Mute.
+                    A Flow stage on OpenedRoutes leads to Unmute.
+                    A StreamPath stage on ClosingRoutes leads to close audio devices managed by Audio PFW
+                    A streamPath stage on OpenedRoutes leads to open audio devices managed by Audio PFW
+                    A Path stage on ClosingRoutes leads to Disable.
+                    A Path stage on OpenedRoutes leads to Enable.
+                    A Configure stage on ClosingRoutes leads to resetting the configuration.
+                    A Configure stage on OpenedRoute lead to setting the configuration.-->
+    <criterion_type name="RoutingStageType" type="inclusive" values="Flow,PostPath,StreamPath,Path,Configure"/>
+    <criterion_type name="RoutePlaybackType" type="inclusive" values=""/>
+    <criterion_type name="RouteCaptureType" type="inclusive" values=""/>
+
+   <!--DO NOT CHANGE ORDER. This definition must be aligned with the definition of
+                            AUDIO_DEVICE_OUT_* within <system/audio.h> file of android.-->
+    <criterion_type name="OutputDevicesMaskType" type="inclusive" values="Earpiece,Ihf,Headset,Headphones,Sco,ScoHeadset,ScoCarkit,A2dp,A2dpHeadphones,A2dpSpeaker,AuxDigital,AnlgDockHeadset,DgtlDockHeadset,UsbAccessory,UsbDevice,RemoteSubmix,TelephonyTx,Line,HdmiArc,Spdif,Fm,AuxLine,SpeakerSafe,Ip,Bus"/>
+
+    <!-- This definition must be aligned with the definition of AUDIO_DEVICE_IN_* within
+         <system/audio.h> file of android. The value of the input source is taken as a bit position
+        For Hotword, the shift is arbitrarily set to AUDIO_SOURCE_MAX
+        (as far as the max is encodable in a mask on 32 bits).-->
+    <criterion_type name="InputSourcesType" type="inclusive" values="Default,Mic,VoiceUplink,VoiceDownlink,VoiceCall,Camcorder,VoiceRecognition,VoiceCommunication,RemoteSubmix,Unprocessed,FmTuner,Hotword"/>
+    <criterion_type name="TtyDirectionType" type="inclusive" values="Downlink,Uplink"/>
+    <criterion_type name="PreProcessingType" type="inclusive" values="Aec,Agc,Ns,Bmf,Wnr"/>
+
+    <!-- DO NOT CHANGE ORDER. This definition must be aligned with the definition of
+                              AUDIO_DEVICE_IN_* within <system/audio.h> file of android.
+                              Note also that direction bit will be decimated by AudioHAL in order to
+                              allow using a mask with the cardinality of 1 between a bit and an
+                              input device. -->
+    <criterion_type name="InputDevicesMaskType" type="inclusive" values="Communication,Ambient,Main,ScoHeadset,Headset,AuxDigital,VoiceCall,Back,RemoteSubmix,AnlgDockHeadset,DgtlDockHeadset,UsbAccessory,UsbDevice,FmTuner,TvTune,Line,Spdif,BluetoothA2dp,Loopback"/>
+    <criterion_type name="OutputFlagsType" type="inclusive" values="Direct,Primary,Fast,Deep,Offload,NonBlocking,HwAvSync,Tts,Raw,Sync,Iec958NonAudio"/>
+    <criterion_type name="InputFlagsType" type="inclusive" values="Fast,HwHotword,Raw,Sync,Primary"/>
+    <!-- Populate these 2 criteria to add your devices refered by their address. -->
+    <criterion_type name="OutputDeviceAddressType" type="inclusive" values=""/>
+    <criterion_type name="InputDeviceAddressType" type="inclusive" values=""/>
+    <criterion_type name="AndroidModeType" type="exclusive" values="Normal,RingTone,InCsvCall,InVoipCall"/>
+
+    <!-- This definition must be aligned with the definition of AUDIO_DEVICE_IN_* within
+         <system/audio.h> file of android.
+         Note also that direction bit is included here.
+         This definition of criterion is intended to serve all parameters that provides a single
+         input device (e.g. LPAL device).-->
+    <criterion_type name="InputDeviceType" type="exclusive" values="0x0:None,0x80000001:Communication,0x80000002:Ambient,0x80000004:Main,0x80000008:ScoHeadset,0x80000010:Headset,0x80000020:AuxDigital,0x80000040:VoiceCall,0x80000080:Back,0x80000100:RemoteSubmix,0x80000200:AnlgDockHeadset,0x80000400:DgtlDockHeadset,0x80000800:UsbAccessory,0x80001000:UsbDevice,0x80002000:FmTuner,0x80004000:TvTuner,0x80008000:Line,0x80010000:Spdif,0x80020000:BluetoothA2dp,0x80040000:Loopback"/>
+    <criterion_type name="BooleanType" type="exclusive" values="False,True"/>
+    <criterion_type name="BandType" type="exclusive" values="Unknown,NB,WB,SuperWB"/>
+    <criterion_type name="ScreenRotationType" type="exclusive" values="0:0,90:90,180:180,270:270"/>
+</criterion_types>

From 785b015afc3a507bbd31cb1b47570795ffb6e1b5 Mon Sep 17 00:00:00 2001
From: tanminger <ming.tan@intel.com>
Date: Wed, 24 May 2017 09:36:38 +0800
Subject: [PATCH 077/427] Add the support of bootloader policy.

JIRA: AIA-406
Test: Device boots to Home screen.
      Device boots to fastboot & recovery mode.
      FDR happens fine.

Signed-off-by: tanminger <ming.tan@intel.com>
---
 androidia_64/mixins.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index 598c865ca..d238b85d9 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -18,7 +18,7 @@ usb-gadget: g_ffs
 adb_net: true
 kernel: android_ia
 bluetooth: btusb
-boot-arch: android_ia
+boot-arch: android_ia(bootloader_policy=0x0,bootloader_len=60)
 audio: android_ia
 wlan: iwlwifi
 cpu-arch: skl

From 1c362c7af251504fc83aaad9b1b9c593d8e1c560 Mon Sep 17 00:00:00 2001
From: Amrita Raju <amrita.raju@intel.com>
Date: Thu, 18 May 2017 14:12:02 +0530
Subject: [PATCH 078/427] Enabling Miracast on AIA

Enabling Miracst option from UI

Jira: https://01.org/jira/browse/AIA-246

Test:
    Under Setting-> Display-> Cast, the checkbox - "Enable wireless display" should be present.
    On selecting the checkbox, list of peers available for wireless display should get listed.

Signed-off-by: <Author/Contributor>
---
 .../base/core/res/res/values/config.xml           | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/common/overlay/frameworks/base/core/res/res/values/config.xml b/common/overlay/frameworks/base/core/res/res/values/config.xml
index cf2bceb94..07f5b20b9 100644
--- a/common/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/common/overlay/frameworks/base/core/res/res/values/config.xml
@@ -67,4 +67,19 @@
     <!-- When true use the linux /dev/input/event subsystem to detect the switch changes
          on the headphone/microphone jack. When false use the older uevent framework. -->
     <bool name="config_useDevInputEventForAudioJack">true</bool>
+
+    <!-- Whether WiFi display is supported by this device.
+         There are many prerequisites for this feature to work correctly.
+         Here are a few of them:
+         * The WiFi radio must support WiFi P2P.
+         * The WiFi radio must support concurrent connections to the WiFi display and
+           to an access point.
+         * The Audio Flinger audio_policy.conf file must specify a rule for the "r_submix"
+           remote submix module.  This module is used to record and stream system
+           audio output to the WiFi display encoder in the media server.
+         * The remote submix module "audio.r_submix.default" must be installed on the device.
+         * The device must be provisioned with HDCP keys (for protected content).
+    -->
+    <bool name="config_enableWifiDisplay">true</bool>
+    
 </resources>

From 31157b266cc7ee833c9755bb661ecea5a3652cff Mon Sep 17 00:00:00 2001
From: "ji, zhenlong z" <zhenlong.z.ji@intel.com>
Date: Thu, 11 May 2017 15:25:51 +0800
Subject: [PATCH 079/427] enable SELinux on android-ia

1. Set SELinux enforcing mode in mixins.spec file.
2. Execute mixin.update to update the configure files.
3. Modify fstab to mount config.img on oem_config dir instead
   of config dir.
4. Add the necessary SELinux rules to make the system boot
   up successfully after enabling the SELinux on android-ia.

JIRA: AIA-85
Tests: The system can boot to UI successfully and there are no obvious regressions observed.

Signed-off-by: ji, zhenlong z <zhenlong.z.ji@intel.com>
---
 androidia_64/AndroidBoard.mk   | 13 +++++++++----
 androidia_64/BoardConfig.mk    | 15 +++++++--------
 androidia_64/device.mk         |  6 ++++++
 androidia_64/fstab             |  2 +-
 androidia_64/init.rc           |  3 +--
 androidia_64/mixins.spec       |  2 +-
 sepolicy/appdomain.te          |  1 +
 sepolicy/bluetooth.te          |  1 +
 sepolicy/cameraserver.te       |  2 ++
 sepolicy/debugfs/file_contexts |  2 +-
 sepolicy/device.te             |  4 ++--
 sepolicy/file.te               |  3 +++
 sepolicy/file_contexts         | 22 ++++++++++++++++++++++
 sepolicy/fsck.te               |  1 +
 sepolicy/init.te               |  4 ++++
 sepolicy/mediaserver.te        |  2 ++
 sepolicy/rfkill.te             | 17 +++++++++++++++++
 sepolicy/surfaceflinger.te     |  5 +++++
 sepolicy/system_server.te      |  1 +
 sepolicy/ueventd.te            |  1 +
 sepolicy/vold.te               |  1 +
 sepolicy/zygote.te             |  1 +
 22 files changed, 90 insertions(+), 19 deletions(-)
 create mode 100644 sepolicy/file_contexts
 create mode 100644 sepolicy/fsck.te
 create mode 100644 sepolicy/rfkill.te

diff --git a/androidia_64/AndroidBoard.mk b/androidia_64/AndroidBoard.mk
index a15820c68..9920704eb 100644
--- a/androidia_64/AndroidBoard.mk
+++ b/androidia_64/AndroidBoard.mk
@@ -248,15 +248,20 @@ include device/intel/android_ia/common/audio/AndroidBoard.mk
 ##############################################################
 INSTALLED_CONFIGIMAGE_TARGET := $(PRODUCT_OUT)/config.img
 
-$(INSTALLED_CONFIGIMAGE_TARGET) : $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK)
+selinux_fc := $(TARGET_ROOT_OUT)/file_contexts.bin
+
+$(INSTALLED_CONFIGIMAGE_TARGET) : PRIVATE_SELINUX_FC := $(selinux_fc)
+$(INSTALLED_CONFIGIMAGE_TARGET) : $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK) $(selinux_fc)
 	$(call pretty,"Target config fs image: $(INSTALLED_CONFIGIMAGE_TARGET)")
 	@mkdir -p $(PRODUCT_OUT)/config
-	$(hide)	$(MKEXTUSERIMG) -s \
+	$(hide) PATH=$(HOST_OUT_EXECUTABLES):$$PATH \
+		$(MKEXTUSERIMG) -s \
 		$(PRODUCT_OUT)/config \
 		$(PRODUCT_OUT)/config.img \
 		ext4 \
-		config \
-		$(BOARD_CONFIGIMAGE_PARTITION_SIZE)
+		oem_config \
+		$(BOARD_CONFIGIMAGE_PARTITION_SIZE) \
+		$(PRIVATE_SELINUX_FC)
 
 INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_CONFIGIMAGE_TARGET)
 ##############################################################
diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index ce9696725..a49d859e6 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -5,13 +5,7 @@
 ##############################################################
 KERNEL_CROSS_COMPILE_WRAPPER := x86_64-linux-android-
 ##############################################################
-# Source: device/intel/mixins/groups/sepolicy/permissive/BoardConfig.mk.1
-##############################################################
-# start kernel in permissive mode, this way we don't
-# need 'setenforce 0' from init.rc files
-BOARD_KERNEL_CMDLINE += enforcing=0 androidboot.selinux=permissive
-##############################################################
-# Source: device/intel/mixins/groups/sepolicy/permissive/BoardConfig.mk
+Source: device/intel/mixins/groups/sepolicy/enforcing/BoardConfig.mk
 ##############################################################
 # SELinux Policy
 BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy
@@ -69,7 +63,7 @@ TARGET_NO_KERNEL ?= false
 
 SERIAL_PARAMETER := console=tty0 console=ttyS2,115200n8
 
-BOARD_KERNEL_CMDLINE += root=/dev/ram0  androidboot.hardware=$(TARGET_PRODUCT) androidboot.selinux=permissive firmware_class.path=/vendor/firmware
+BOARD_KERNEL_CMDLINE += root=/dev/ram0  androidboot.hardware=$(TARGET_PRODUCT) firmware_class.path=/vendor/firmware
 
 ifneq ($(TARGET_BUILD_VARIANT),user)
 ifeq ($(SPARSE_IMG),true)
@@ -234,6 +228,11 @@ else
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := squashfs
 endif
 ##############################################################
+# Source: device/intel/mixins/groups/debug-phonedoctor/true/BoardConfig.mk
+##############################################################
+BOARD_SEPOLICY_M4DEFS += module_debug_phonedoctor=true
+BOARD_SEPOLICY_DIRS += device/intel/sepolicy/debug-phonedoctor
+##############################################################
 # Source: device/intel/mixins/groups/factory-partition/true/BoardConfig.mk
 ##############################################################
 BOARD_FACTORYIMAGE_PARTITION_SIZE := 10485760
diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index dd313db2a..3c4c68145 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -443,6 +443,12 @@ ifeq ($(MIXIN_DEBUG_LOGS),true)
 PRODUCT_PACKAGES += crash_package
 endif
 ##############################################################
+# Source: device/intel/mixins/groups/debug-phonedoctor/true/product.mk
+##############################################################
+ifeq ($(MIXIN_DEBUG_LOGS),true)
+PRODUCT_PACKAGES += crash_package
+endif
+##############################################################
 # Source: device/intel/mixins/groups/debug-tools/true/product.mk
 ##############################################################
 PRODUCT_PACKAGES_DEBUG += \
diff --git a/androidia_64/fstab b/androidia_64/fstab
index 11e245fae..7a2830242 100644
--- a/androidia_64/fstab
+++ b/androidia_64/fstab
@@ -30,7 +30,7 @@
 ##############################################################
 # Source: device/intel/mixins/groups/config-partition/enabled/fstab
 ##############################################################
-/dev/block/mmcblk1p11	/config         ext4    noatime,nosuid,nodev,errors=panic          wait,check
+/dev/block/mmcblk1p11	/oem_config         ext4    noatime,nosuid,nodev,errors=panic          wait,check
 ##############################################################
 # Source: device/intel/mixins/groups/vendor-partition/true/fstab
 ##############################################################
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 2d15feb42..87ba3bff2 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -103,7 +103,6 @@ on fs
 on init
     chown system system /sys/class/backlight/intel_backlight/brightness
     chown system system /sys/class/backlight/acpi_video0/brightness
-    write /sys/fs/selinux/enforce 0
 
 on post-fs
    #setprop debug.sf.nobootanimation 1
@@ -398,7 +397,7 @@ on charger
 ##############################################################
 # Enable SELinux labeling
 on post-fs
-    restorecon_recursive /config
+    restorecon_recursive /oem_config
 ##############################################################
 # Source: device/intel/mixins/groups/factory-partition/true/init.rc
 ##############################################################
diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index d238b85d9..dc22b5a29 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -6,7 +6,7 @@ product.mk: device.mk
 
 [groups]
 android_ia: default
-sepolicy: permissive
+sepolicy: enforcing
 graphics: android_ia(gen9+=true,hwc2=true,vulkan=true,drmhwc=false,minigbm=true)
 media: android_ia
 device-type: tablet
diff --git a/sepolicy/appdomain.te b/sepolicy/appdomain.te
index e4010cf08..5ab909e46 100644
--- a/sepolicy/appdomain.te
+++ b/sepolicy/appdomain.te
@@ -1 +1,2 @@
 allow appdomain surfaceflinger:fifo_file rw_file_perms;
+allow appdomain sysfs_app_readable:file r_file_perms;
diff --git a/sepolicy/bluetooth.te b/sepolicy/bluetooth.te
index f537e45e8..42c1e0ec1 100644
--- a/sepolicy/bluetooth.te
+++ b/sepolicy/bluetooth.te
@@ -4,3 +4,4 @@ allow bluetooth bluetooth_control:chr_file { rw_file_perms };
 allow bluetooth sysfs_bluetooth:dir search;
 allow bluetooth sysfs_bluetooth:file rw_file_perms;
 allow bluetooth storage_stub_file:dir getattr;
+allow bluetooth self:socket create_socket_perms;
diff --git a/sepolicy/cameraserver.te b/sepolicy/cameraserver.te
index 73b54d2b6..c2ff0149d 100644
--- a/sepolicy/cameraserver.te
+++ b/sepolicy/cameraserver.te
@@ -19,3 +19,5 @@ r_dir_file(cameraserver, sysfs)
 
 allow cameraserver system_file:dir r_dir_perms;
 allow cameraserver tmpfs:dir search;
+
+allow cameraserver sysfs_app_readable:file r_file_perms;
diff --git a/sepolicy/debugfs/file_contexts b/sepolicy/debugfs/file_contexts
index 5ab0695dd..971842b24 100644
--- a/sepolicy/debugfs/file_contexts
+++ b/sepolicy/debugfs/file_contexts
@@ -1 +1 @@
-/sys/kernel/debug/sync      u:object_r:debugfs_graphics_sync:s0
+/sys/kernel/debug/sync(/.*)?      u:object_r:debugfs_graphics_sync:s0
diff --git a/sepolicy/device.te b/sepolicy/device.te
index 91789568c..1e08949c8 100644
--- a/sepolicy/device.te
+++ b/sepolicy/device.te
@@ -4,5 +4,5 @@ type rpmb_block_device, dev_type;
 type cros_ec_device, dev_type;
 type hidraw_device, dev_type;
 type host1x_device, dev_type, mlstrustedobject;
-allow device platform_app:chr_file { ioctl };
-allow device system_server:chr_file { getattr read open write };
+type rfkill_device, dev_type;
+type config_block_device, dev_type;
diff --git a/sepolicy/file.te b/sepolicy/file.te
index 3f03cd2d8..7bfa91175 100644
--- a/sepolicy/file.te
+++ b/sepolicy/file.te
@@ -6,3 +6,6 @@ type atvr_device, dev_type;
 type sysfs_coretemp, fs_type, sysfs_type;
 type gpu_pid_stats_file, fs_type, debugfs_type;
 type sysfs_socinfo, sysfs_type, fs_type;
+type config_file, file_type, data_file_type;
+type debugfs_pstate, fs_type, debugfs_type;
+type sysfs_app_readable, fs_type, sysfs_type;
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
new file mode 100644
index 000000000..f0c617c6c
--- /dev/null
+++ b/sepolicy/file_contexts
@@ -0,0 +1,22 @@
+/dev/block/mmcblk1p8        u:object_r:cache_block_device:s0
+/dev/block/mmcblk1p12        u:object_r:userdata_block_device:s0
+/dev/block/mmcblk1p3        u:object_r:boot_block_device:s0
+/dev/block/mmcblk1p4        u:object_r:recovery_block_device:s0
+/dev/block/mmcblk1p9        u:object_r:frp_block_device:s0
+/dev/block/mmcblk1p6        u:object_r:metadata_block_device:s0
+/dev/block/mmcblk1p11       u:object_r:config_block_device:s0
+
+/sys/kernel/debug/pstate_snb/setpoint u:object_r:debugfs_pstate:s0
+/oem_config(/.*)?           u:object_r:config_file:s0
+/system/bin/rfkill-init.sh  u:object_r:rfkill_exec:s0
+/dev/rfkill                 u:object_r:rfkill_device:s0
+
+/dev/dri/card0   u:object_r:gpu_device:s0
+/dev/dri/renderD128   u:object_r:gpu_device:s0
+/sys/devices/pci0000\:00/0000\:00\:02.0/device u:object_r:sysfs_app_readable:s0
+/sys/devices/pci0000\:00/0000\:00\:02.0/vendor u:object_r:sysfs_app_readable:s0
+/sys/devices/pci0000\:00/0000\:00\:02.0/uevent u:object_r:sysfs_app_readable:s0
+/sys/devices/pci0000\:00/0000\:00\:02.0/subsystem_vendor u:object_r:sysfs_app_readable:s0
+/sys/devices/pci0000\:00/0000\:00\:02.0/subsystem_device u:object_r:sysfs_app_readable:s0
+/sys/devices/pci0000\:00/0000\:00\:02.0/config u:object_r:sysfs_app_readable:s0
+/sys/devices/pci0000\:00/0000\:00\:02.0/resource0 u:object_r:sysfs_app_readable:s0
diff --git a/sepolicy/fsck.te b/sepolicy/fsck.te
new file mode 100644
index 000000000..fec18b529
--- /dev/null
+++ b/sepolicy/fsck.te
@@ -0,0 +1 @@
+allow fsck config_block_device:blk_file rw_file_perms;
diff --git a/sepolicy/init.te b/sepolicy/init.te
index 0963c443b..5e4f19943 100644
--- a/sepolicy/init.te
+++ b/sepolicy/init.te
@@ -26,3 +26,7 @@ allow init sysfs:file create;
 allow init devpts:chr_file { ioctl };
 allow init audio_device:chr_file { write ioctl };
 allow init platform_app:unix_stream_socket { read };
+
+allow init debugfs_pstate:file w_file_perms;
+allow init userdata_block_device:blk_file write;
+allow init kernel:key search;
diff --git a/sepolicy/mediaserver.te b/sepolicy/mediaserver.te
index dff69d204..7e1fd4b74 100644
--- a/sepolicy/mediaserver.te
+++ b/sepolicy/mediaserver.te
@@ -8,3 +8,5 @@ allow mediaserver sensorservice_service:service_manager find;
 allow mediaserver host1x_device:chr_file rw_file_perms;
 # needed for widevine classic
 allow mediaserver tee_device:chr_file { ioctl open read write };
+allow mediaserver surfaceflinger_tmpfs:file { read write };
+allow mediaserver sysfs_app_readable:file r_file_perms;
diff --git a/sepolicy/rfkill.te b/sepolicy/rfkill.te
new file mode 100644
index 000000000..cd91a49f0
--- /dev/null
+++ b/sepolicy/rfkill.te
@@ -0,0 +1,17 @@
+#
+# rfkill
+# domain and exec types only. Need to refactor between autodetect and rfkill
+# mixin. Seems to be some weird dependency chanin on this.
+# For not, just handle the fc labels between the mixins and have this type
+# global.
+#
+type rfkill, domain;
+type rfkill_exec, exec_type, file_type;
+init_daemon_domain(rfkill)
+
+# devices
+allow rfkill rfkill_device:chr_file rw_file_perms;
+
+# its a shell script, so in order to run the interpreter
+# it needs access to shell_exec
+allow rfkill shell_exec:file rx_file_perms;
diff --git a/sepolicy/surfaceflinger.te b/sepolicy/surfaceflinger.te
index 0d3b8b8ca..e4bbc5e80 100644
--- a/sepolicy/surfaceflinger.te
+++ b/sepolicy/surfaceflinger.te
@@ -1,6 +1,7 @@
 allow surfaceflinger graphics_device:chr_file ioctl;
 allow surfaceflinger device:chr_file ioctl;
 
+allow surfaceflinger device:dir r_dir_perms;
 allow surfaceflinger gpu_device:dir search;
 allow surfaceflinger gpu_device:chr_file { read ioctl open write };
 allow surfaceflinger gpu_device:file { read ioctl open write };
@@ -46,3 +47,7 @@ allow surfaceflinger bootanim:file { read getattr open };
 # access to dev/sw_sync
 allow surfaceflinger sw_sync_device:chr_file rw_file_perms;
 allow surfaceflinger host1x_device:chr_file rw_file_perms;
+allow surfaceflinger debugfs_graphics_sync:dir r_dir_perms;
+allow surfaceflinger debugfs_graphics_sync:file rw_file_perms;
+
+allow surfaceflinger sysfs_app_readable:file r_file_perms;
diff --git a/sepolicy/system_server.te b/sepolicy/system_server.te
index a65aa01aa..26ce5a630 100644
--- a/sepolicy/system_server.te
+++ b/sepolicy/system_server.te
@@ -18,4 +18,5 @@ allow system_server debugfs:file { open read write };
 allow system_server init:tcp_socket { getopt setopt read write };
 allow system_server init:udp_socket { getopt setopt read write };
 allow system_server init:process { getattr getpgid };
+allow system_server sysfs_app_readable:file r_file_perms;
 get_prop(system_server, wifi_region_prop)
diff --git a/sepolicy/ueventd.te b/sepolicy/ueventd.te
index cdd0957ad..3952bd686 100644
--- a/sepolicy/ueventd.te
+++ b/sepolicy/ueventd.te
@@ -13,3 +13,4 @@ allow ueventd sysfs_bluetooth:file w_file_perms;
 allow ueventd sysfs_socinfo:file w_file_perms;
 allow ueventd system_file:system { module_load };
 allow ueventd hidraw_device:chr_file { relabelfrom relabelto };
+allow ueventd kernel:key search;
diff --git a/sepolicy/vold.te b/sepolicy/vold.te
index 917e3c424..29c7818e1 100644
--- a/sepolicy/vold.te
+++ b/sepolicy/vold.te
@@ -1 +1,2 @@
 allow vold tmpfs:file open;
+allow vold config_file:dir r_dir_perms;
diff --git a/sepolicy/zygote.te b/sepolicy/zygote.te
index 64332ab93..dde68b58d 100644
--- a/sepolicy/zygote.te
+++ b/sepolicy/zygote.te
@@ -4,3 +4,4 @@ allow zygote tmpfs:dir mounton;
 allow zygote tmpfs:file open;
 allow zygote host1x_device:chr_file rw_file_perms;
 allow zygote product_locale_prop:file { read open getattr };
+allow zygote debugfs_tracing:file rw_file_perms;

From 7593622d5e533616b8ed04a2781d1ccc005eaf75 Mon Sep 17 00:00:00 2001
From: "Ai, Ting A" <ting.a.ai@intel.com>
Date: Wed, 10 May 2017 16:42:15 +0800
Subject: [PATCH 080/427] Enable PPTP VPN

Configure some kernel flag used by PPTP connection

Jira: AIA-407
Test: PPTP VPN can be connected successfully.

Signed-off-by: Ai, Ting A <ting.a.ai@intel.com>
---
 kernel_config/kernel_64_defconfig | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 757a9aa56..72b34e0aa 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -768,7 +768,7 @@ CONFIG_INET_ESP=y
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
 CONFIG_INET_TUNNEL=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
 # CONFIG_INET_XFRM_MODE_BEET is not set
 CONFIG_INET_TCP_DIAG=m
@@ -2185,13 +2185,13 @@ CONFIG_MDIO_THUNDER=m
 # CONFIG_MDIO_XGENE is not set
 CONFIG_MICREL_KS8995MA=m
 CONFIG_PLIP=m
-CONFIG_PPP=m
+CONFIG_PPP=y
 CONFIG_PPP_BSDCOMP=m
 CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
+CONFIG_PPP_MPPE=y
 CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOE=m
+CONFIG_PPPOE=y
 CONFIG_PPPOL2TP=m
 CONFIG_PPP_ASYNC=m
 CONFIG_PPP_SYNC_TTY=m
@@ -7012,7 +7012,7 @@ CONFIG_SLUB_DEBUG=y
 # CONFIG_HIBERNATION is not set
 
 # Prior to v4.1, assists heap memory attacks; best to keep interface disabled.
-# CONFIG_INET_DIAG is not set
+CONFIG_INET_DIAG=y
 
 # Easily confused by misconfigured userspace, keep off.
 # CONFIG_BINFMT_MISC is not set

From fe673d967ea8b3cbc2f58986b481e10f575cf9a8 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 1 Jun 2017 00:01:00 +0530
Subject: [PATCH 081/427] Update to latest mixin changes

- Enable PPTP VPN
- Enable SELinux on android-ia
- Enabling Miracast on AIA
- Add the support of bootloader policy.

JIRA : None
Test : Device boots to home screen

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/AndroidBoard.mk  | 16 +++-----
 androidia_64/BoardConfig.mk   | 69 +++++++++++++++++++++++++++++------
 androidia_64/device.mk        | 16 +++-----
 androidia_64/fstab            |  2 +-
 androidia_64/init.rc          | 21 ++++++-----
 androidia_64/init.recovery.rc | 18 ++++-----
 6 files changed, 89 insertions(+), 53 deletions(-)

diff --git a/androidia_64/AndroidBoard.mk b/androidia_64/AndroidBoard.mk
index 9920704eb..79513b2e2 100644
--- a/androidia_64/AndroidBoard.mk
+++ b/androidia_64/AndroidBoard.mk
@@ -234,10 +234,11 @@ TARGET_ODM_KEY_PAIR := device/intel/build/testkeys/odm
 TARGET_OAK_KEY_PAIR := device/intel/build/testkeys/OAK
 
 $(BOOTLOADER_POLICY_OEMVARS): sign-efi-sig-list
-        $(GEN_BLPOLICY_OEMVARS) -K $(TARGET_ODM_KEY_PAIR) \
+	$(GEN_BLPOLICY_OEMVARS) -K $(TARGET_ODM_KEY_PAIR) \
 		-O $(TARGET_OAK_KEY_PAIR).x509.pem -B $(TARGET_BOOTLOADER_POLICY) \
 		$(BOOTLOADER_POLICY_OEMVARS)
 endif
+
 ##############################################################
 # Source: device/intel/mixins/groups/audio/android_ia/AndroidBoard.mk
 ##############################################################
@@ -248,20 +249,15 @@ include device/intel/android_ia/common/audio/AndroidBoard.mk
 ##############################################################
 INSTALLED_CONFIGIMAGE_TARGET := $(PRODUCT_OUT)/config.img
 
-selinux_fc := $(TARGET_ROOT_OUT)/file_contexts.bin
-
-$(INSTALLED_CONFIGIMAGE_TARGET) : PRIVATE_SELINUX_FC := $(selinux_fc)
-$(INSTALLED_CONFIGIMAGE_TARGET) : $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK) $(selinux_fc)
+$(INSTALLED_CONFIGIMAGE_TARGET) : $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK)
 	$(call pretty,"Target config fs image: $(INSTALLED_CONFIGIMAGE_TARGET)")
 	@mkdir -p $(PRODUCT_OUT)/config
-	$(hide) PATH=$(HOST_OUT_EXECUTABLES):$$PATH \
-		$(MKEXTUSERIMG) -s \
+	$(hide)	$(MKEXTUSERIMG) -s \
 		$(PRODUCT_OUT)/config \
 		$(PRODUCT_OUT)/config.img \
 		ext4 \
-		oem_config \
-		$(BOARD_CONFIGIMAGE_PARTITION_SIZE) \
-		$(PRIVATE_SELINUX_FC)
+		config \
+		$(BOARD_CONFIGIMAGE_PARTITION_SIZE)
 
 INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_CONFIGIMAGE_TARGET)
 ##############################################################
diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index a49d859e6..a84190f7e 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -5,7 +5,7 @@
 ##############################################################
 KERNEL_CROSS_COMPILE_WRAPPER := x86_64-linux-android-
 ##############################################################
-Source: device/intel/mixins/groups/sepolicy/enforcing/BoardConfig.mk
+# Source: device/intel/mixins/groups/sepolicy/enforcing/BoardConfig.mk
 ##############################################################
 # SELinux Policy
 BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy
@@ -63,7 +63,7 @@ TARGET_NO_KERNEL ?= false
 
 SERIAL_PARAMETER := console=tty0 console=ttyS2,115200n8
 
-BOARD_KERNEL_CMDLINE += root=/dev/ram0  androidboot.hardware=$(TARGET_PRODUCT) firmware_class.path=/vendor/firmware
+BOARD_KERNEL_CMDLINE += root=/dev/ram0  androidboot.hardware=$(TARGET_PRODUCT) androidboot.selinux=permissive firmware_class.path=/vendor/firmware
 
 ifneq ($(TARGET_BUILD_VARIANT),user)
 ifeq ($(SPARSE_IMG),true)
@@ -78,6 +78,10 @@ BOARD_HAVE_BLUETOOTH_LINUX := true
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/intel/common/bluetooth/bcm43241/
 DEVICE_PACKAGE_OVERLAYS += device/intel/common/bluetooth/overlay-bt-pan
 ##############################################################
+# Source: device/intel/mixins/groups/disk-bus/auto/BoardConfig.mk
+##############################################################
+BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/set_storage
+##############################################################
 # Source: device/intel/mixins/groups/boot-arch/android_ia/BoardConfig.mk
 ##############################################################
 #TARGET_NO_RECOVERY ?= false
@@ -113,7 +117,8 @@ KERNELFLINGER_ALLOW_UNSUPPORTED_ACPI_TABLE := true
 KERNELFLINGER_USE_WATCHDOG := true
 # Tell Kernelflinger to ignore ACPI RSCI table
 KERNELFLINGER_IGNORE_RSCI := true
-KERNELFLINGER_SSL_LIBRARY := boringssl
+#KERNELFLINGER_SSL_LIBRARY := boringssl
+KERNELFLINGER_SSL_LIBRARY := openssl
 # Specify system verity partition
 #PRODUCT_SYSTEM_VERITY_PARTITION := /dev/block/by-name/system
 
@@ -153,6 +158,55 @@ TARGET_RECOVERY_UPDATER_LIBS := libupdater_esp
 TARGET_RECOVERY_UPDATER_EXTRA_LIBS := libcommon_recovery libgpt_static libefivar
 # By default recovery minui expects RGBA framebuffer
 TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
+
+
+ifneq (0x0,static)
+BOOTLOADER_POLICY_OEMVARS = $(PRODUCT_OUT)/bootloader_policy-oemvars.txt
+BOARD_FLASHFILES += $(BOOTLOADER_POLICY_OEMVARS)
+BOARD_OEM_VARS += $(BOOTLOADER_POLICY_OEMVARS)
+endif
+
+# It activates the Bootloader policy and RMA refurbishing
+# features. TARGET_BOOTLOADER_POLICY is the desired bitmask for this
+# device.
+# * bit 0:
+#   - 0: GVB class B.
+#   - 1: GVB class A.  Device unlock is not permitted.  The only way
+#     to unlock is to use the secured force-unlock mechanism.
+# * bit 1 and 2 defines the minimal boot state required to boot the
+#   device:
+#   - 0x0: BOOT_STATE_RED (GVB default behavior)
+#   - 0x1: BOOT_STATE_ORANGE
+#   - 0x2: BOOT_STATE_YELLOW
+#   - 0x3: BOOT_STATE_GREEN
+# If TARGET_BOOTLOADER_POLICY is equal to 'static' the bootloader
+# policy is not built but is provided statically in the repository.
+# If TARGET_BOOTLOADER_POLICY is equal to 'external' the bootloader
+# policy OEMVARS should be installed manually in
+# $(BOOTLOADER_POLICY_OEMVARS).
+TARGET_BOOTLOADER_POLICY := 0x0
+# If the following variable is set to false, the bootloader policy and
+# RMA refurbishing features does not use time-based authenticated EFI
+# variables to store the BPM and OAK values.  The BPM value is defined
+# compilation time by the TARGET_BOOTLOADER_POLICY variable.
+TARGET_BOOTLOADER_POLICY_USE_EFI_VAR := true
+ifeq ($(TARGET_BOOTLOADER_POLICY),$(filter $(TARGET_BOOTLOADER_POLICY),0x0 0x2 0x4 0x6))
+# OEM Unlock reporting 1
+ADDITIONAL_DEFAULT_PROPERTIES += \
+	ro.oem_unlock_supported=1
+endif
+ifeq ($(TARGET_BOOTLOADER_POLICY),$(filter $(TARGET_BOOTLOADER_POLICY),static external))
+# The bootloader policy is not generated build time but is supplied
+# statically in the repository or in $(PRODUCT_OUT)/.  If your
+# bootloader policy allows the device to be unlocked, uncomment the
+# following lines:
+# ADDITIONAL_DEFAULT_PROPERTIES += \
+# 	ro.oem_unlock_supported=1
+endif
+
+
+
+
 ##############################################################
 # Source: device/intel/mixins/groups/audio/android_ia/BoardConfig.mk
 ##############################################################
@@ -208,10 +262,6 @@ BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/rfkill
 WITH_DEXPREOPT := true
 WITH_DEXPREOPT_PIC := true
 ##############################################################
-# Source: device/intel/mixins/groups/disk-bus/auto/BoardConfig.mk
-##############################################################
-BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/set_storage
-##############################################################
 # Source: device/intel/mixins/groups/config-partition/enabled/BoardConfig.mk
 ##############################################################
 BOARD_CONFIGIMAGE_PARTITION_SIZE := 8388608
@@ -228,11 +278,6 @@ else
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := squashfs
 endif
 ##############################################################
-# Source: device/intel/mixins/groups/debug-phonedoctor/true/BoardConfig.mk
-##############################################################
-BOARD_SEPOLICY_M4DEFS += module_debug_phonedoctor=true
-BOARD_SEPOLICY_DIRS += device/intel/sepolicy/debug-phonedoctor
-##############################################################
 # Source: device/intel/mixins/groups/factory-partition/true/BoardConfig.mk
 ##############################################################
 BOARD_FACTORYIMAGE_PARTITION_SIZE := 10485760
diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 3c4c68145..a67f57c52 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -322,6 +322,11 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \
 		frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml
 ##############################################################
+# Source: device/intel/mixins/groups/disk-bus/auto/product.mk
+##############################################################
+# create primary storage symlink dynamically
+PRODUCT_PACKAGES += set_storage
+##############################################################
 # Source: device/intel/mixins/groups/audio/android_ia/product.mk
 ##############################################################
 # Tinyalsa
@@ -368,11 +373,6 @@ BOARD_WLAN_DEVICE := iwlwifi
 ##############################################################
 PRODUCT_COPY_FILES += device/intel/common/rfkill/rfkill-init.sh:system/bin/rfkill-init.sh
 ##############################################################
-# Source: device/intel/mixins/groups/disk-bus/auto/product.mk
-##############################################################
-# create primary storage symlink dynamically
-PRODUCT_PACKAGES += set_storage
-##############################################################
 # Source: device/intel/mixins/groups/usb/host+acc/product.mk
 ##############################################################
 PRODUCT_COPY_FILES += \
@@ -443,12 +443,6 @@ ifeq ($(MIXIN_DEBUG_LOGS),true)
 PRODUCT_PACKAGES += crash_package
 endif
 ##############################################################
-# Source: device/intel/mixins/groups/debug-phonedoctor/true/product.mk
-##############################################################
-ifeq ($(MIXIN_DEBUG_LOGS),true)
-PRODUCT_PACKAGES += crash_package
-endif
-##############################################################
 # Source: device/intel/mixins/groups/debug-tools/true/product.mk
 ##############################################################
 PRODUCT_PACKAGES_DEBUG += \
diff --git a/androidia_64/fstab b/androidia_64/fstab
index 7a2830242..11e245fae 100644
--- a/androidia_64/fstab
+++ b/androidia_64/fstab
@@ -30,7 +30,7 @@
 ##############################################################
 # Source: device/intel/mixins/groups/config-partition/enabled/fstab
 ##############################################################
-/dev/block/mmcblk1p11	/oem_config         ext4    noatime,nosuid,nodev,errors=panic          wait,check
+/dev/block/mmcblk1p11	/config         ext4    noatime,nosuid,nodev,errors=panic          wait,check
 ##############################################################
 # Source: device/intel/mixins/groups/vendor-partition/true/fstab
 ##############################################################
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 87ba3bff2..f9c569113 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -103,6 +103,7 @@ on fs
 on init
     chown system system /sys/class/backlight/intel_backlight/brightness
     chown system system /sys/class/backlight/acpi_video0/brightness
+    write /sys/fs/selinux/enforce 0
 
 on post-fs
    #setprop debug.sf.nobootanimation 1
@@ -314,6 +315,15 @@ service iprenew_bt-pan /system/bin/dhcpcd -n
     disabled
     oneshot
 ##############################################################
+# Source: device/intel/mixins/groups/disk-bus/auto/init.rc
+##############################################################
+on init
+    # Android creates by-name disk links with the disk controller
+    # in the generated path, so that the names pulled out of the GPT
+    # can be associated with the correct disk. Create a shortcut to
+    # /dev/block/by-name so that we can use the same fstabs everywhere.
+    exec u:r:set_storage:s0 root root -- /sbin/set_storage
+##############################################################
 # Source: device/intel/mixins/groups/wlan/iwlwifi/init.rc
 ##############################################################
 on boot
@@ -374,15 +384,6 @@ service rfkill-init /system/bin/rfkill-init.sh
     group system
     oneshot
 ##############################################################
-# Source: device/intel/mixins/groups/disk-bus/auto/init.rc
-##############################################################
-on init
-    # Android creates by-name disk links with the disk controller
-    # in the generated path, so that the names pulled out of the GPT
-    # can be associated with the correct disk. Create a shortcut to
-    # /dev/block/by-name so that we can use the same fstabs everywhere.
-    exec u:r:set_storage:s0 root root -- /sbin/set_storage
-##############################################################
 # Source: device/intel/mixins/groups/usb/host+acc/init.rc
 ##############################################################
 on boot
@@ -397,7 +398,7 @@ on charger
 ##############################################################
 # Enable SELinux labeling
 on post-fs
-    restorecon_recursive /oem_config
+    restorecon_recursive /config
 ##############################################################
 # Source: device/intel/mixins/groups/factory-partition/true/init.rc
 ##############################################################
diff --git a/androidia_64/init.recovery.rc b/androidia_64/init.recovery.rc
index 9572d58c7..5cead3f45 100644
--- a/androidia_64/init.recovery.rc
+++ b/androidia_64/init.recovery.rc
@@ -64,6 +64,15 @@ on property:sys.usb.ffs.ready=1
     setprop persist.sys.usb.config adb
 
 ##############################################################
+# Source: device/intel/mixins/groups/disk-bus/auto/init.recovery.rc
+##############################################################
+on init
+    # Android creates by-name disk links with the disk controller
+    # in the generated path, so that the names pulled out of the GPT
+    # can be associated with the correct disk. Create a shortcut to
+    # /dev/block/by-name so that we can use the same fstabs everywhere.
+    exec u:r:set_storage:s0 root root -- /sbin/set_storage
+##############################################################
 # Source: device/intel/mixins/groups/boot-arch/android_ia/init.recovery.rc
 ##############################################################
 service watchdogd /sbin/watchdogd
@@ -74,13 +83,4 @@ service watchdogd /sbin/watchdogd
 
 on boot
     start watchdogd
-##############################################################
-# Source: device/intel/mixins/groups/disk-bus/auto/init.recovery.rc
-##############################################################
-on init
-    # Android creates by-name disk links with the disk controller
-    # in the generated path, so that the names pulled out of the GPT
-    # can be associated with the correct disk. Create a shortcut to
-    # /dev/block/by-name so that we can use the same fstabs everywhere.
-    exec u:r:set_storage:s0 root root -- /sbin/set_storage
 # ------------------ END MIX-IN DEFINITIONS ------------------

From fd866517180ac18d0c3088450781ebb5b024a22f Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Sun, 4 Jun 2017 17:37:24 -0500
Subject: [PATCH 082/427] Add support for CX20724 with audio_pfw HAL

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 common/audio/PCH-CX20724/AndroidBoard.mk      | 89 +++++++++++++++++++
 .../parameter-framework/AudioCriteria.txt     |  7 ++
 .../AudioParameterFramework.xml               | 13 +++
 .../Audio/AudioConfigurableDomains-Tuning.xml | 69 ++++++++++++++
 .../Settings/Audio/routing_cx20724.pfw        | 60 +++++++++++++
 .../Settings/Audio/routing_hdmi.pfw           | 22 +++++
 .../Structure/Audio/AudioClass.xml            |  6 ++
 .../Audio/ConexantCX20724Subsystem.xml        | 66 ++++++++++++++
 .../Structure/Audio/HdmiSubsystem.xml         | 22 +++++
 .../policy/audio_policy_configuration.xml     | 80 ++++++++++-------
 10 files changed, 403 insertions(+), 31 deletions(-)
 create mode 100644 common/audio/PCH-CX20724/AndroidBoard.mk
 create mode 100644 common/audio/PCH-CX20724/parameter-framework/AudioCriteria.txt
 create mode 100644 common/audio/PCH-CX20724/parameter-framework/AudioParameterFramework.xml
 create mode 100644 common/audio/PCH-CX20724/parameter-framework/Settings/Audio/AudioConfigurableDomains-Tuning.xml
 create mode 100644 common/audio/PCH-CX20724/parameter-framework/Settings/Audio/routing_cx20724.pfw
 create mode 100644 common/audio/PCH-CX20724/parameter-framework/Settings/Audio/routing_hdmi.pfw
 create mode 100644 common/audio/PCH-CX20724/parameter-framework/Structure/Audio/AudioClass.xml
 create mode 100644 common/audio/PCH-CX20724/parameter-framework/Structure/Audio/ConexantCX20724Subsystem.xml
 create mode 100644 common/audio/PCH-CX20724/parameter-framework/Structure/Audio/HdmiSubsystem.xml

diff --git a/common/audio/PCH-CX20724/AndroidBoard.mk b/common/audio/PCH-CX20724/AndroidBoard.mk
new file mode 100644
index 000000000..5464d4a63
--- /dev/null
+++ b/common/audio/PCH-CX20724/AndroidBoard.mk
@@ -0,0 +1,89 @@
+LOCAL_PATH := $(call my-dir)
+PFW_CORE := external/parameter-framework
+BUILD_PFW_SETTINGS := $(PFW_CORE)/support/android/build_pfw_settings.mk
+PFW_DEFAULT_SCHEMAS_DIR := $(PFW_CORE)/upstream/schemas
+PFW_SCHEMAS_DIR := $(PFW_DEFAULT_SCHEMAS_DIR)
+
+###########################################
+# Audio stack Package
+###########################################
+include $(CLEAR_VARS)
+LOCAL_MODULE := audio_parameter_framework
+LOCAL_MODULE_TAGS := optional
+LOCAL_REQUIRED_MODULES := \
+    libremote-processor \
+    remote-process \
+    AudioConfigurableDomains.xml
+
+include $(BUILD_PHONY_PACKAGE)
+
+###########################################
+# Audio PFW Package
+###########################################
+include $(CLEAR_VARS)
+LOCAL_MODULE := AudioConfigurableDomains.xml
+LOCAL_MODULES_TAGS := optional
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+    AudioParameterFramework.xml \
+    AudioClass.xml \
+    ConexantCX20724Subsystem.xml \
+    HdmiSubsystem.xml
+
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Audio
+LOCAL_REQUIRED_MODULES := \
+    libtinyalsa-subsystem
+
+PFW_TOPLEVEL_FILE := $(TARGET_OUT_ETC)/parameter-framework/AudioParameterFramework.xml
+PFW_CRITERIA_FILE := $(LOCAL_PATH)/parameter-framework/AudioCriteria.txt
+PFW_TUNING_FILE   := $(LOCAL_PATH)/$(LOCAL_MODULE_RELATIVE_PATH)/AudioConfigurableDomains-Tuning.xml
+
+PFW_EDD_FILES := \
+    $(LOCAL_PATH)/$(LOCAL_MODULE_RELATIVE_PATH)/routing_cx20724.pfw \
+    $(LOCAL_PATH)/$(LOCAL_MODULE_RELATIVE_PATH)/routing_hdmi.pfw
+
+include $(BUILD_PFW_SETTINGS)
+
+###########################################
+# Audio PFW top file
+###########################################
+include $(CLEAR_VARS)
+LOCAL_MODULE := AudioParameterFramework.xml
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_RELATIVE_PATH := parameter-framework
+LOCAL_SRC_FILES := parameter-framework/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+###########################################
+
+###########################################
+# Audio PFW Structure files
+###########################################
+include $(CLEAR_VARS)
+LOCAL_MODULE := AudioClass.xml
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Structure/Audio
+LOCAL_SRC_FILES := $(LOCAL_MODULE_RELATIVE_PATH)/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := ConexantCX20724Subsystem.xml
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Structure/Audio
+LOCAL_SRC_FILES := $(LOCAL_MODULE_RELATIVE_PATH)/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := HdmiSubsystem.xml
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Structure/Audio
+LOCAL_SRC_FILES := $(LOCAL_MODULE_RELATIVE_PATH)/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+###########################################
diff --git a/common/audio/PCH-CX20724/parameter-framework/AudioCriteria.txt b/common/audio/PCH-CX20724/parameter-framework/AudioCriteria.txt
new file mode 100644
index 000000000..beaac8672
--- /dev/null
+++ b/common/audio/PCH-CX20724/parameter-framework/AudioCriteria.txt
@@ -0,0 +1,7 @@
+ExclusiveCriterion  Mode                   :  Normal
+InclusiveCriterion  RoutageState           :  Configure   Flow          Path
+InclusiveCriterion  OpenedPlaybackRoutes   :  primary_output       hdmi_stereo     hdmi_multi
+InclusiveCriterion  OpenedCaptureRoutes    :  primary_input
+InclusiveCriterion  SelectedInputDevices   :  Headset Main
+InclusiveCriterion  SelectedOutputDevices  :  Headphones  Headset Ihf      AuxDigital 
+ExclusiveCriterion  ScreenState            :  Off         On
diff --git a/common/audio/PCH-CX20724/parameter-framework/AudioParameterFramework.xml b/common/audio/PCH-CX20724/parameter-framework/AudioParameterFramework.xml
new file mode 100644
index 000000000..870a29e52
--- /dev/null
+++ b/common/audio/PCH-CX20724/parameter-framework/AudioParameterFramework.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ParameterFrameworkConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Schemas/ParameterFrameworkConfiguration.xsd"
+    SystemClassName="Audio" ServerPort="5000" TuningAllowed="true">
+    <SubsystemPlugins>
+        <Location Folder="">
+            <Plugin Name="libtinyalsa-subsystem.so"/>
+        </Location>
+    </SubsystemPlugins>
+    <StructureDescriptionFileLocation Path="Structure/Audio/AudioClass.xml"/>
+    <SettingsConfiguration>
+        <ConfigurableDomainsFileLocation Path="Settings/Audio/AudioConfigurableDomains.xml"/>
+    </SettingsConfiguration>
+</ParameterFrameworkConfiguration>
diff --git a/common/audio/PCH-CX20724/parameter-framework/Settings/Audio/AudioConfigurableDomains-Tuning.xml b/common/audio/PCH-CX20724/parameter-framework/Settings/Audio/AudioConfigurableDomains-Tuning.xml
new file mode 100644
index 000000000..5c4e7bd35
--- /dev/null
+++ b/common/audio/PCH-CX20724/parameter-framework/Settings/Audio/AudioConfigurableDomains-Tuning.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ConfigurableDomains xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Schemas/ConfigurableDomains.xsd" SystemClassName="Audio">
+    <ConfigurableDomain Name="OutputDevice.Selected" SequenceAware="false">
+	<Configurations>
+	    <Configuration Name="Multimedia.Master">
+		<CompoundRule Type="Any">
+		    <SelectionCriterionRule SelectionCriterion="SelectedOutputDevices" MatchesWhen="Includes" Value="Headset"/>
+		    <SelectionCriterionRule SelectionCriterion="SelectedOutputDevices" MatchesWhen="Includes" Value="Headphones"/>
+		    <SelectionCriterionRule SelectionCriterion="SelectedOutputDevices" MatchesWhen="Includes" Value="Ihf"/>
+		</CompoundRule>
+	    </Configuration>
+	    <Configuration Name="Multimedia.Headset">
+	    	<CompoundRule Type="Any">
+	    	    <SelectionCriterionRule SelectionCriterion="SelectedOutputDevices" MatchesWhen="Includes" Value="Headset"/>
+	    	    <SelectionCriterionRule SelectionCriterion="SelectedOutputDevices" MatchesWhen="Includes" Value="Headphones"/>
+	    	</CompoundRule>
+	    </Configuration>
+	    <Configuration Name="Multimedia.Speaker">
+		<CompoundRule Type="Any">
+		    <SelectionCriterionRule SelectionCriterion="SelectedOutputDevices" MatchesWhen="Includes" Value="Ihf"/>
+		</CompoundRule>
+	    </Configuration>
+	</Configurations>
+	<ConfigurableElements>
+	    <ConfigurableElement Path="/Audio/cx20724/output/volume"/>
+	    <ConfigurableElement Path="/Audio/cx20724/output/headset/volume"/>
+	    <ConfigurableElement Path="/Audio/cx20724/output/speaker/volume"/>
+	</ConfigurableElements>
+	<Settings>
+	    <Configuration Name="Multimedia.Master">
+		<ConfigurableElement Path="/Audio/cx20724/output/volume">
+		    <IntegerParameter Name="volume">74</IntegerParameter>
+		</ConfigurableElement>
+	    </Configuration>
+	    <Configuration Name="Multimedia.Headset">
+	    	<ConfigurableElement Path="/Audio/cx20724/output/headset/volume">
+	    	    <IntegerParameter Name="volume">74 74</IntegerParameter>
+	    	</ConfigurableElement>
+	    </Configuration>
+	    <Configuration Name="Multimedia.Speaker">
+		<ConfigurableElement Path="/Audio/cx20724/output/speaker/volume">
+		    <IntegerParameter Name="volume">74 74</IntegerParameter>
+		</ConfigurableElement>
+	    </Configuration>
+	</Settings>
+    </ConfigurableDomain>
+
+    <ConfigurableDomain Name="InputDevice.Selected" SequenceAware="false">
+	<Configurations>
+	    <Configuration Name="Multimedia.Master">
+		<CompoundRule Type="Any">
+		    <SelectionCriterionRule SelectionCriterion="SelectedInputDevices" MatchesWhen="Includes" Value="Headset"/>
+		    <SelectionCriterionRule SelectionCriterion="SelectedInputDevices" MatchesWhen="Includes" Value="Main"/>
+		</CompoundRule>
+	    </Configuration>
+	</Configurations>
+	<ConfigurableElements>
+	    <ConfigurableElement Path="/Audio/cx20724/input/mic_headset/volume"/>
+	</ConfigurableElements>
+	<Settings>
+	    <Configuration Name="Multimedia.Master">
+		<ConfigurableElement Path="/Audio/cx20724/input/mic_headset/volume">
+		    <IntegerParameter Name="volume">74 74</IntegerParameter>
+		</ConfigurableElement>
+	    </Configuration>
+	</Settings>
+    </ConfigurableDomain>
+
+</ConfigurableDomains>
diff --git a/common/audio/PCH-CX20724/parameter-framework/Settings/Audio/routing_cx20724.pfw b/common/audio/PCH-CX20724/parameter-framework/Settings/Audio/routing_cx20724.pfw
new file mode 100644
index 000000000..f1642346b
--- /dev/null
+++ b/common/audio/PCH-CX20724/parameter-framework/Settings/Audio/routing_cx20724.pfw
@@ -0,0 +1,60 @@
+domainGroup: Routing.Cx20724
+
+	#########################################
+	############## Mute/unmute ##############
+	#########################################
+
+	domainGroup: flow
+		RoutageState Includes Flow
+
+		domainGroup: Playback
+			domainGroup: Media
+				confType: UnMute
+					ALL
+						OpenedPlaybackRoutes Includes primary_output
+
+				domain: Headset
+					conf: UnMute
+						ANY
+							SelectedOutputDevices Includes Headset
+							SelectedOutputDevices Includes Headphones
+						/Audio/cx20724/output/headset/switch = 1 1
+
+					conf: Mute
+						/Audio/cx20724/output/headset/switch = 0 0
+
+				domain: Speaker
+					conf: UnMute
+						ANY
+							SelectedOutputDevices Includes Ihf
+						/Audio/cx20724/output/speaker/switch = 1 1
+
+					conf: Mute
+						/Audio/cx20724/output/speaker/switch = 0 0
+
+				domain: Master
+					conf: UnMute
+						ANY
+							SelectedOutputDevices Includes Headset
+							SelectedOutputDevices Includes Headphones
+							SelectedOutputDevices Includes Ihf
+						/Audio/cx20724/output/switch = 1
+						
+					conf: Mute
+						/Audio/cx20724/output/switch = 0
+
+		domainGroup: Capture
+			domainGroup: Media
+				confType: UnMute
+					ANY
+						OpenedCaptureRoutes Includes primary_input
+
+				domain: Master
+					conf: UnMute
+						ANY
+							SelectedInputDevices Includes Headset
+							SelectedInputDevices Includes Main
+						/Audio/cx20724/input/mic_headset/switch = 1 1
+					conf: Mute
+						/Audio/cx20724/input/mic_headset/switch = 0 0
+
diff --git a/common/audio/PCH-CX20724/parameter-framework/Settings/Audio/routing_hdmi.pfw b/common/audio/PCH-CX20724/parameter-framework/Settings/Audio/routing_hdmi.pfw
new file mode 100644
index 000000000..23df1e5b1
--- /dev/null
+++ b/common/audio/PCH-CX20724/parameter-framework/Settings/Audio/routing_hdmi.pfw
@@ -0,0 +1,22 @@
+domainGroup: Routing.Hdmi
+
+	#########################################
+	############### Configure ###############
+	#########################################
+
+	domainGroup: Configure
+		RoutageState Includes Configure
+
+		domainGroup: Playack
+			domain: Port0
+				conf: Bind
+					ALL
+						ANY
+							OpenedPlaybackRoutes Includes hdmi_stereo
+							OpenedPlaybackRoutes Includes hdmi_multi
+						SelectedOutputDevices Includes AuxDigital
+					/Audio/hdmi/output/port0/switch = 1
+
+				conf: Unbind
+					/Audio/hdmi/output/port0/switch = 0
+
diff --git a/common/audio/PCH-CX20724/parameter-framework/Structure/Audio/AudioClass.xml b/common/audio/PCH-CX20724/parameter-framework/Structure/Audio/AudioClass.xml
new file mode 100644
index 000000000..7f31284ea
--- /dev/null
+++ b/common/audio/PCH-CX20724/parameter-framework/Structure/Audio/AudioClass.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemClass xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../Schemas/SystemClass.xsd" Name="Audio">
+    <SubsystemInclude Path="ConexantCX20724Subsystem.xml"/>
+    <SubsystemInclude Path="HdmiSubsystem.xml"/>
+</SystemClass>
+
diff --git a/common/audio/PCH-CX20724/parameter-framework/Structure/Audio/ConexantCX20724Subsystem.xml b/common/audio/PCH-CX20724/parameter-framework/Structure/Audio/ConexantCX20724Subsystem.xml
new file mode 100644
index 000000000..0b19ca379
--- /dev/null
+++ b/common/audio/PCH-CX20724/parameter-framework/Structure/Audio/ConexantCX20724Subsystem.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Subsystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xsi:noNamespaceSchemaLocation="../../Schemas/Subsystem.xsd"
+    Name="cx20724" Type="ALSA"
+    Mapping="Card:PCH,Debug">
+
+    <!--
+	The structure of the audio codec is as follows
+    /Audio/cx20724/output/
+                          switch
+                          volume
+                          headset/
+                                  switch
+                                  volume
+                          speaker/
+                                  switch
+                                  volume
+    /Audio/cx20724/input/
+                         switch
+                         volume
+
+    The component names can be arbitrary, they will be mapped in the tuning
+    files
+    
+    The order of the declarations does matter, the types need to be defined
+    before being instanciated and the file is organized from leaf nodes
+    to root. In this example, there are separate volumes for speaker and
+    headset but they use a common master volume. For the time being the
+    "Internal Mic Boost Volume" and "Mic Boost Volume" are not used
+    
+    The syntax Amend:string along with the %n notation is a replace operation
+    to avoid duplication
+    The ArrayLength is linked to the number of elements of the control,
+    it can be omitted when there is a single value. The Size is an internal
+    parameter framework representation but needs to be able to store the
+    largest control value.
+    -->
+    
+    <ComponentLibrary>
+        <!-- Outputs -->
+        <ComponentType Name="StereoOutputNode">
+            <BooleanParameter Name="switch" ArrayLength="2" Mapping="Control:'%1 Playback Switch'"/>
+            <IntegerParameter Name="volume" Size="8" Signed="false" Min="0" Max="74" ArrayLength="2" Mapping="Control:'%1 Playback Volume'"/>
+        </ComponentType>
+        <ComponentType Name="OutputNodes">
+            <Component Name="headset" Type="StereoOutputNode" Mapping="Amend1:Headphone"/>
+	    <Component Name="speaker" Type="StereoOutputNode" Mapping="Amend1:Speaker"/>
+            <BooleanParameter Name="switch" Mapping="Control:'Master Playback Switch'"/>
+            <IntegerParameter Name="volume" Size="8" Signed="false" Min="0" Max="74" Mapping="Control:'Master Playback Volume'"/>
+        </ComponentType>
+        <!-- Inputs -->
+        <ComponentType Name="CaptureNode">
+            <BooleanParameter Name="switch" ArrayLength="2" Mapping="Control:'Capture Switch'"/>
+            <IntegerParameter Name="volume" Size="8" Signed="false" Min="0" Max="80" ArrayLength="2" Mapping="Control:'Capture Volume'"/>
+        </ComponentType>
+        <ComponentType Name="InputNodes">
+            <Component Name="mic_headset" Type="CaptureNode"/>
+        </ComponentType>
+    </ComponentLibrary>
+
+    <InstanceDefinition>
+        <Component Name="output" Type="OutputNodes"/>
+        <Component Name="input" Type="InputNodes"/>
+    </InstanceDefinition>
+</Subsystem>
diff --git a/common/audio/PCH-CX20724/parameter-framework/Structure/Audio/HdmiSubsystem.xml b/common/audio/PCH-CX20724/parameter-framework/Structure/Audio/HdmiSubsystem.xml
new file mode 100644
index 000000000..92b9fcd1a
--- /dev/null
+++ b/common/audio/PCH-CX20724/parameter-framework/Structure/Audio/HdmiSubsystem.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Subsystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xsi:noNamespaceSchemaLocation="../../Schemas/Subsystem.xsd"
+    Name="hdmi" Type="ALSA"
+    Mapping="Card:PCH,Debug">
+
+   <ComponentLibrary>
+        <!-- Outputs -->
+        <ComponentType Name="HdmiNode">
+            <BooleanParameter Name="switch" Mapping="Control:'IEC958 Playback Switch'"/>
+        </ComponentType>
+
+        <ComponentType Name="OutputNode">
+            <Component Name="port0" Type="HdmiNode"/>
+        </ComponentType>
+   </ComponentLibrary>
+
+    <InstanceDefinition>
+        <Component Name="output" Type="OutputNode"/>
+    </InstanceDefinition>
+</Subsystem>
diff --git a/common/audio/PCH-CX20724/policy/audio_policy_configuration.xml b/common/audio/PCH-CX20724/policy/audio_policy_configuration.xml
index cceaa04f8..84192b0c9 100644
--- a/common/audio/PCH-CX20724/policy/audio_policy_configuration.xml
+++ b/common/audio/PCH-CX20724/policy/audio_policy_configuration.xml
@@ -15,29 +15,6 @@
 -->
 
 <audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-    <!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
-
-    <!-- Modules section:
-        There is one section per audio HW module present on the platform.
-        Each module section will contains two mandatory tags for audio HAL “halVersion” and “name”.
-        The module names are the same as in current .conf file:
-                “primary”, “A2DP”, “remote_submix”, “USB”
-        Each module will contain the following sections:
-        “devicePorts”: a list of device descriptors for all input and output devices accessible via this
-        module.
-        This contains both permanently attached devices and removable devices.
-        “mixPorts”: listing all output and input streams exposed by the audio HAL
-        “routes”: list of possible connections between input and output devices or between stream and
-        devices.
-            "route": is defined by an attribute:
-                -"type": <mux|mix> means all sources are mutual exclusive (mux) or can be mixed (mix)
-                -"sink": the sink involved in this route
-                -"sources": all the sources than can be connected to the sink via vis route
-        “attachedDevices”: permanently attached devices.
-        The attachedDevices section is a list of devices names. The names correspond to device names
-        defined in <devicePorts> section.
-        “defaultOutputDevice”: device to be used by default when no policy rule applies
-    -->
     <modules>
         <!-- Primary Audio HAL -->
         <module name="primary" halVersion="3.0">
@@ -47,16 +24,42 @@
             </attachedDevices>
             <defaultOutputDevice>Speaker</defaultOutputDevice>
             <mixPorts>
-                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY">
+                <mixPort name="primary_output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY"
+                         card="PCH" device="0"
+                         requirePreEnable="0" requirePostDisable="0" silencePrologMs="0"
+                         periodSize="240" periodCount="2"
+                         startThreshold="239" stopThreshold="480" silenceThreshold="0" availMin="240">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
-                <mixPort name="primary input" role="sink">
+                <mixPort name="hdmi_stereo" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY"
+                         card="PCH" device="3"
+                         requirePreEnable="0" requirePostDisable="0" silencePrologMs="0"
+                         periodSize="240" periodCount="2"
+                         startThreshold="239" stopThreshold="480" silenceThreshold="0" availMin="240">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
+                <mixPort name="hdmi_multi" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT"
+                         card="PCH" device="3"
+                         requirePreEnable="0" requirePostDisable="0" silencePrologMs="0"
+                         periodSize="240" periodCount="4"
+                         startThreshold="239" stopThreshold="960" silenceThreshold="0" availMin="240">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000"/>
+                </mixPort>
+                <mixPort name="primary_input" role="sink" flags="AUDIO_INPUT_FLAG_PRIMARY"
+                         card="PCH" device="0"
+                         requirePreEnable="0" requirePostDisable="0" silencePrologMs="0"
+                         periodSize="240" periodCount="2"
+                         startThreshold="1" stopThreshold="480" silenceThreshold="0" availMin="240"
+                         supportedUseCases="AUDIO_SOURCE_MIC,AUDIO_SOURCE_VOICE_COMMUNICATION,AUDIO_SOURCE_CAMCORDER,AUDIO_SOURCE_VOICE_RECOGNITION,AUDIO_SOURCE_HOTWORD">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
             </mixPorts>
+
             <devicePorts>
                 <!-- Output devices declaration, i.e. Sink DEVICE PORT -->
                 <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink">
@@ -83,17 +86,27 @@
                              channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
                 </devicePort>
 
+                <devicePort tagName="HDMI" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="32000,44100,48000"/>
+                </devicePort>
             </devicePorts>
             <!-- route declaration, i.e. list all available sources for a given sink -->
             <routes>
-                <route type="mix" sink="Speaker"
-                       sources="primary output"/>
                 <route type="mix" sink="Wired Headset"
-                       sources="primary output"/>
+                       sources="primary_output"/>
                 <route type="mix" sink="Wired Headphones"
-                       sources="primary output"/>
-                <route type="mix" sink="primary input"
-                       sources="Built-In Mic,Wired Headset Mic"/>
+                       sources="primary_output"/>
+		<route type="mix" sink="Speaker"
+                       sources="primary_output"/>
+		
+                 <route type="mix" sink="HDMI"
+			sources="hdmi_stereo,hdmi_multi"/>
+		 
+		 <route type="mix" sink="primary_input"
+                       sources="Wired Headset Mic,Built-In Mic"/>
             </routes>
 
         </module>
@@ -117,4 +130,9 @@
 
     <!-- End of Volume section -->
 
+    <!--Audio HAL Custom section -->
+    <xi:include href="audio_criteria.xml"/>
+    <xi:include href="audio_criterion_types.xml"/>
+    <!--End of Audio HAL Custom section -->
+
 </audioPolicyConfiguration>

From a7099cc637c765587a53a8134d931daea872b4f0 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Mon, 5 Jun 2017 07:47:37 -0500
Subject: [PATCH 083/427] Add support for default HDA config

Use default volume for headset and playback, only set Master Playback/Capture
volume and switch

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 common/audio/default/AndroidBoard.mk          | 88 +++++++++++++++++++
 .../parameter-framework/AudioCriteria.txt     |  7 ++
 .../AudioParameterFramework.xml               | 13 +++
 .../Settings/Audio/routing_defaulthda.pfw     | 43 +++++++++
 .../Settings/Audio/routing_hdmi.pfw           | 22 +++++
 .../Structure/Audio/AudioClass.xml            |  6 ++
 .../Audio/DefaultHDaudioSubsystem.xml         | 54 ++++++++++++
 .../Structure/Audio/HdmiSubsystem.xml         | 22 +++++
 .../policy/audio_policy_configuration.xml     | 43 +++++++--
 9 files changed, 292 insertions(+), 6 deletions(-)
 create mode 100644 common/audio/default/AndroidBoard.mk
 create mode 100644 common/audio/default/parameter-framework/AudioCriteria.txt
 create mode 100644 common/audio/default/parameter-framework/AudioParameterFramework.xml
 create mode 100644 common/audio/default/parameter-framework/Settings/Audio/routing_defaulthda.pfw
 create mode 100644 common/audio/default/parameter-framework/Settings/Audio/routing_hdmi.pfw
 create mode 100644 common/audio/default/parameter-framework/Structure/Audio/AudioClass.xml
 create mode 100644 common/audio/default/parameter-framework/Structure/Audio/DefaultHDaudioSubsystem.xml
 create mode 100644 common/audio/default/parameter-framework/Structure/Audio/HdmiSubsystem.xml

diff --git a/common/audio/default/AndroidBoard.mk b/common/audio/default/AndroidBoard.mk
new file mode 100644
index 000000000..c3b601438
--- /dev/null
+++ b/common/audio/default/AndroidBoard.mk
@@ -0,0 +1,88 @@
+LOCAL_PATH := $(call my-dir)
+PFW_CORE := external/parameter-framework
+BUILD_PFW_SETTINGS := $(PFW_CORE)/support/android/build_pfw_settings.mk
+PFW_DEFAULT_SCHEMAS_DIR := $(PFW_CORE)/upstream/schemas
+PFW_SCHEMAS_DIR := $(PFW_DEFAULT_SCHEMAS_DIR)
+
+###########################################
+# Audio stack Package
+###########################################
+include $(CLEAR_VARS)
+LOCAL_MODULE := audio_parameter_framework
+LOCAL_MODULE_TAGS := optional
+LOCAL_REQUIRED_MODULES := \
+    libremote-processor \
+    remote-process \
+    AudioConfigurableDomains.xml
+
+include $(BUILD_PHONY_PACKAGE)
+
+###########################################
+# Audio PFW Package
+###########################################
+include $(CLEAR_VARS)
+LOCAL_MODULE := AudioConfigurableDomains.xml
+LOCAL_MODULES_TAGS := optional
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+    AudioParameterFramework.xml \
+    AudioClass.xml \
+    DefaultHDaudioSubsystem.xml \
+    HdmiSubsystem.xml
+
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Audio
+LOCAL_REQUIRED_MODULES := \
+    libtinyalsa-subsystem
+
+PFW_TOPLEVEL_FILE := $(TARGET_OUT_ETC)/parameter-framework/AudioParameterFramework.xml
+PFW_CRITERIA_FILE := $(LOCAL_PATH)/parameter-framework/AudioCriteria.txt
+
+PFW_EDD_FILES := \
+    $(LOCAL_PATH)/$(LOCAL_MODULE_RELATIVE_PATH)/routing_defaulthda.pfw \
+    $(LOCAL_PATH)/$(LOCAL_MODULE_RELATIVE_PATH)/routing_hdmi.pfw
+
+include $(BUILD_PFW_SETTINGS)
+
+###########################################
+# Audio PFW top file
+###########################################
+include $(CLEAR_VARS)
+LOCAL_MODULE := AudioParameterFramework.xml
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_RELATIVE_PATH := parameter-framework
+LOCAL_SRC_FILES := parameter-framework/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+###########################################
+
+###########################################
+# Audio PFW Structure files
+###########################################
+include $(CLEAR_VARS)
+LOCAL_MODULE := AudioClass.xml
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Structure/Audio
+LOCAL_SRC_FILES := $(LOCAL_MODULE_RELATIVE_PATH)/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := DefaultHDaudioSubsystem.xml
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Structure/Audio
+LOCAL_SRC_FILES := $(LOCAL_MODULE_RELATIVE_PATH)/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := HdmiSubsystem.xml
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Structure/Audio
+LOCAL_SRC_FILES := $(LOCAL_MODULE_RELATIVE_PATH)/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+###########################################
diff --git a/common/audio/default/parameter-framework/AudioCriteria.txt b/common/audio/default/parameter-framework/AudioCriteria.txt
new file mode 100644
index 000000000..beaac8672
--- /dev/null
+++ b/common/audio/default/parameter-framework/AudioCriteria.txt
@@ -0,0 +1,7 @@
+ExclusiveCriterion  Mode                   :  Normal
+InclusiveCriterion  RoutageState           :  Configure   Flow          Path
+InclusiveCriterion  OpenedPlaybackRoutes   :  primary_output       hdmi_stereo     hdmi_multi
+InclusiveCriterion  OpenedCaptureRoutes    :  primary_input
+InclusiveCriterion  SelectedInputDevices   :  Headset Main
+InclusiveCriterion  SelectedOutputDevices  :  Headphones  Headset Ihf      AuxDigital 
+ExclusiveCriterion  ScreenState            :  Off         On
diff --git a/common/audio/default/parameter-framework/AudioParameterFramework.xml b/common/audio/default/parameter-framework/AudioParameterFramework.xml
new file mode 100644
index 000000000..870a29e52
--- /dev/null
+++ b/common/audio/default/parameter-framework/AudioParameterFramework.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ParameterFrameworkConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Schemas/ParameterFrameworkConfiguration.xsd"
+    SystemClassName="Audio" ServerPort="5000" TuningAllowed="true">
+    <SubsystemPlugins>
+        <Location Folder="">
+            <Plugin Name="libtinyalsa-subsystem.so"/>
+        </Location>
+    </SubsystemPlugins>
+    <StructureDescriptionFileLocation Path="Structure/Audio/AudioClass.xml"/>
+    <SettingsConfiguration>
+        <ConfigurableDomainsFileLocation Path="Settings/Audio/AudioConfigurableDomains.xml"/>
+    </SettingsConfiguration>
+</ParameterFrameworkConfiguration>
diff --git a/common/audio/default/parameter-framework/Settings/Audio/routing_defaulthda.pfw b/common/audio/default/parameter-framework/Settings/Audio/routing_defaulthda.pfw
new file mode 100644
index 000000000..9485859a3
--- /dev/null
+++ b/common/audio/default/parameter-framework/Settings/Audio/routing_defaulthda.pfw
@@ -0,0 +1,43 @@
+domainGroup: Routing.Defaulthda
+
+	#########################################
+	############## Mute/unmute ##############
+	#########################################
+
+	domainGroup: flow
+		RoutageState Includes Flow
+
+		domainGroup: Playback
+			domainGroup: Media
+				confType: UnMute
+					ALL
+						OpenedPlaybackRoutes Includes primary_output
+
+				domain: Master
+					conf: UnMute
+						ANY
+							SelectedOutputDevices Includes Headset
+							SelectedOutputDevices Includes Headphones
+							SelectedOutputDevices Includes Ihf
+						/Audio/defaulthda/output/switch = 1
+						/Audio/defaulthda/output/volume = 63
+						
+					conf: Mute
+						/Audio/defaulthda/output/switch = 0
+						/Audio/defaulthda/output/volume = 0
+
+		domainGroup: Capture
+			domainGroup: Media
+				confType: UnMute
+					ANY
+						OpenedCaptureRoutes Includes primary_input
+
+				domain: Master
+					conf: UnMute
+						ANY
+							SelectedInputDevices Includes Headset
+							SelectedInputDevices Includes Main
+						/Audio/defaulthda/input/mic_headset/switch = 1 1
+					conf: Mute
+						/Audio/defaulthda/input/mic_headset/switch = 0 0
+
diff --git a/common/audio/default/parameter-framework/Settings/Audio/routing_hdmi.pfw b/common/audio/default/parameter-framework/Settings/Audio/routing_hdmi.pfw
new file mode 100644
index 000000000..23df1e5b1
--- /dev/null
+++ b/common/audio/default/parameter-framework/Settings/Audio/routing_hdmi.pfw
@@ -0,0 +1,22 @@
+domainGroup: Routing.Hdmi
+
+	#########################################
+	############### Configure ###############
+	#########################################
+
+	domainGroup: Configure
+		RoutageState Includes Configure
+
+		domainGroup: Playack
+			domain: Port0
+				conf: Bind
+					ALL
+						ANY
+							OpenedPlaybackRoutes Includes hdmi_stereo
+							OpenedPlaybackRoutes Includes hdmi_multi
+						SelectedOutputDevices Includes AuxDigital
+					/Audio/hdmi/output/port0/switch = 1
+
+				conf: Unbind
+					/Audio/hdmi/output/port0/switch = 0
+
diff --git a/common/audio/default/parameter-framework/Structure/Audio/AudioClass.xml b/common/audio/default/parameter-framework/Structure/Audio/AudioClass.xml
new file mode 100644
index 000000000..a1212c1ea
--- /dev/null
+++ b/common/audio/default/parameter-framework/Structure/Audio/AudioClass.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemClass xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../Schemas/SystemClass.xsd" Name="Audio">
+    <SubsystemInclude Path="DefaultHDaudioSubsystem.xml"/>
+    <SubsystemInclude Path="HdmiSubsystem.xml"/>
+</SystemClass>
+
diff --git a/common/audio/default/parameter-framework/Structure/Audio/DefaultHDaudioSubsystem.xml b/common/audio/default/parameter-framework/Structure/Audio/DefaultHDaudioSubsystem.xml
new file mode 100644
index 000000000..4cfecd6cf
--- /dev/null
+++ b/common/audio/default/parameter-framework/Structure/Audio/DefaultHDaudioSubsystem.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Subsystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xsi:noNamespaceSchemaLocation="../../Schemas/Subsystem.xsd"
+    Name="defaulthda" Type="ALSA"
+    Mapping="Card:PCH,Debug">
+
+    <!--
+	The structure of the audio codec is as follows
+    /Audio/defaulthda/output/
+                          switch
+                          volume
+    /Audio/defaulthda/input/
+                         switch
+                         volume
+
+    The component names can be arbitrary, they will be mapped in the tuning
+    files
+    
+    The order of the declarations does matter, the types need to be defined
+    before being instanciated and the file is organized from leaf nodes
+    to root. In this example, there are separate volumes for speaker and
+    headset but they use a common master volume. For the time being the
+    "Internal Mic Boost Volume" and "Mic Boost Volume" are not used
+    
+    The syntax Amend:string along with the %n notation is a replace operation
+    to avoid duplication
+    The ArrayLength is linked to the number of elements of the control,
+    it can be omitted when there is a single value. The Size is an internal
+    parameter framework representation but needs to be able to store the
+    largest control value.
+    -->
+    
+    <ComponentLibrary>
+        <!-- Outputs -->
+        <ComponentType Name="OutputNodes">
+            <BooleanParameter Name="switch" Mapping="Control:'Master Playback Switch'"/>
+            <IntegerParameter Name="volume" Size="8" Signed="false" Min="0" Max="63" Mapping="Control:'Master Playback Volume'"/>
+        </ComponentType>
+        <!-- Inputs -->
+        <ComponentType Name="CaptureNode">
+            <BooleanParameter Name="switch" ArrayLength="2" Mapping="Control:'Capture Switch'"/>
+            <IntegerParameter Name="volume" Size="8" Signed="false" Min="0" Max="63" ArrayLength="2" Mapping="Control:'Capture Volume'"/>
+        </ComponentType>
+        <ComponentType Name="InputNodes">
+            <Component Name="mic_headset" Type="CaptureNode"/>
+        </ComponentType>
+    </ComponentLibrary>
+
+    <InstanceDefinition>
+        <Component Name="output" Type="OutputNodes"/>
+        <Component Name="input" Type="InputNodes"/>
+    </InstanceDefinition>
+</Subsystem>
diff --git a/common/audio/default/parameter-framework/Structure/Audio/HdmiSubsystem.xml b/common/audio/default/parameter-framework/Structure/Audio/HdmiSubsystem.xml
new file mode 100644
index 000000000..92b9fcd1a
--- /dev/null
+++ b/common/audio/default/parameter-framework/Structure/Audio/HdmiSubsystem.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Subsystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xsi:noNamespaceSchemaLocation="../../Schemas/Subsystem.xsd"
+    Name="hdmi" Type="ALSA"
+    Mapping="Card:PCH,Debug">
+
+   <ComponentLibrary>
+        <!-- Outputs -->
+        <ComponentType Name="HdmiNode">
+            <BooleanParameter Name="switch" Mapping="Control:'IEC958 Playback Switch'"/>
+        </ComponentType>
+
+        <ComponentType Name="OutputNode">
+            <Component Name="port0" Type="HdmiNode"/>
+        </ComponentType>
+   </ComponentLibrary>
+
+    <InstanceDefinition>
+        <Component Name="output" Type="OutputNode"/>
+    </InstanceDefinition>
+</Subsystem>
diff --git a/common/audio/default/policy/audio_policy_configuration.xml b/common/audio/default/policy/audio_policy_configuration.xml
index cf9f3fdde..84192b0c9 100644
--- a/common/audio/default/policy/audio_policy_configuration.xml
+++ b/common/audio/default/policy/audio_policy_configuration.xml
@@ -32,7 +32,23 @@
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
-                <mixPort name="primary_input" role="sink"
+                <mixPort name="hdmi_stereo" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY"
+                         card="PCH" device="3"
+                         requirePreEnable="0" requirePostDisable="0" silencePrologMs="0"
+                         periodSize="240" periodCount="2"
+                         startThreshold="239" stopThreshold="480" silenceThreshold="0" availMin="240">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
+                <mixPort name="hdmi_multi" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT"
+                         card="PCH" device="3"
+                         requirePreEnable="0" requirePostDisable="0" silencePrologMs="0"
+                         periodSize="240" periodCount="4"
+                         startThreshold="239" stopThreshold="960" silenceThreshold="0" availMin="240">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000"/>
+                </mixPort>
+                <mixPort name="primary_input" role="sink" flags="AUDIO_INPUT_FLAG_PRIMARY"
                          card="PCH" device="0"
                          requirePreEnable="0" requirePostDisable="0" silencePrologMs="0"
                          periodSize="240" periodCount="2"
@@ -43,6 +59,7 @@
                              channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
             </mixPorts>
+
             <devicePorts>
                 <!-- Output devices declaration, i.e. Sink DEVICE PORT -->
                 <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink">
@@ -69,18 +86,27 @@
                              channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
                 </devicePort>
 
+                <devicePort tagName="HDMI" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="32000,44100,48000"/>
+                </devicePort>
             </devicePorts>
             <!-- route declaration, i.e. list all available sources for a given sink -->
             <routes>
-                <route type="mix" sink="Speaker"
-                       sources="primary_output"/>
                 <route type="mix" sink="Wired Headset"
                        sources="primary_output"/>
                 <route type="mix" sink="Wired Headphones"
                        sources="primary_output"/>
-
-                <route type="mix" sink="primary_input"
-                       sources="Built-In Mic,Wired Headset Mic"/>
+		<route type="mix" sink="Speaker"
+                       sources="primary_output"/>
+		
+                 <route type="mix" sink="HDMI"
+			sources="hdmi_stereo,hdmi_multi"/>
+		 
+		 <route type="mix" sink="primary_input"
+                       sources="Wired Headset Mic,Built-In Mic"/>
             </routes>
 
         </module>
@@ -104,4 +130,9 @@
 
     <!-- End of Volume section -->
 
+    <!--Audio HAL Custom section -->
+    <xi:include href="audio_criteria.xml"/>
+    <xi:include href="audio_criterion_types.xml"/>
+    <!--End of Audio HAL Custom section -->
+
 </audioPolicyConfiguration>

From df6b4042df2f1f429b294caa5237a52289b34c44 Mon Sep 17 00:00:00 2001
From: Chen Qi <qix.chen@intel.com>
Date: Fri, 2 Jun 2017 15:12:25 +0800
Subject: [PATCH 084/427] [Android-IA] Enable iTCO watchdog

Enable watchdog driver

Jira: AIA-408
Test: Watchdogd start normally. Kill watchdogd can trigger reboot.

Signed-off-by: Chen Qi <qix.chen@intel.com>
---
 kernel_config/kernel_64_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 72b34e0aa..af00e5dc7 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -3361,7 +3361,7 @@ CONFIG_WATCHDOG=y
 # CONFIG_WAFER_WDT is not set
 # CONFIG_I6300ESB_WDT is not set
 # CONFIG_IE6XX_WDT is not set
-# CONFIG_ITCO_WDT is not set
+CONFIG_ITCO_WDT=y
 # CONFIG_IT8712F_WDT is not set
 # CONFIG_IT87_WDT is not set
 # CONFIG_HP_WATCHDOG is not set

From 18ecc098e8f5ac0d8464e6c5235be4619df84e81 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Tue, 6 Jun 2017 01:11:32 +0530
Subject: [PATCH 085/427] Update to latest mixin changes

- Show the "OEM unlocking" option in
  Android "Developer options"

JIRA : None
Test : Device boots to home screen

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/BoardConfig.mk   | 3 +++
 androidia_64/init.rc          | 2 ++
 androidia_64/init.recovery.rc | 1 +
 androidia_64/ueventd.rc       | 4 ++++
 4 files changed, 10 insertions(+)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index a84190f7e..bfe4154eb 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -125,6 +125,9 @@ KERNELFLINGER_SSL_LIBRARY := openssl
 # Avoid Watchdog truggered reboot
 BOARD_KERNEL_CMDLINE += iTCO_wdt.force_no_reboot=1
 
+# Show the "OEM unlocking" option in Android "Developer options"
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.frp.pst=/dev/block/by-name/android_persistent
+
 # Specify file for creating final flashfiles
 BOARD_GPT_INI ?= $(TARGET_DEVICE_DIR)/gpt.ini
 BOARD_GPT_BIN = $(PRODUCT_OUT)/gpt.bin
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index f9c569113..342c5c70a 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -323,6 +323,8 @@ on init
     # can be associated with the correct disk. Create a shortcut to
     # /dev/block/by-name so that we can use the same fstabs everywhere.
     exec u:r:set_storage:s0 root root -- /sbin/set_storage
+    mkdir /dev/block 0755 root root
+    symlink /dev/block/pci/pci0000:00/0000:00:1c.0/by-name /dev/block/by-name
 ##############################################################
 # Source: device/intel/mixins/groups/wlan/iwlwifi/init.rc
 ##############################################################
diff --git a/androidia_64/init.recovery.rc b/androidia_64/init.recovery.rc
index 5cead3f45..9b877e1de 100644
--- a/androidia_64/init.recovery.rc
+++ b/androidia_64/init.recovery.rc
@@ -72,6 +72,7 @@ on init
     # can be associated with the correct disk. Create a shortcut to
     # /dev/block/by-name so that we can use the same fstabs everywhere.
     exec u:r:set_storage:s0 root root -- /sbin/set_storage
+    symlink /dev/block/pci/pci0000:00/0000:00:1c.0/by-name /dev/block/by-name
 ##############################################################
 # Source: device/intel/mixins/groups/boot-arch/android_ia/init.recovery.rc
 ##############################################################
diff --git a/androidia_64/ueventd.rc b/androidia_64/ueventd.rc
index 0ea5b10dc..2aafd8e33 100644
--- a/androidia_64/ueventd.rc
+++ b/androidia_64/ueventd.rc
@@ -59,6 +59,10 @@
 /sys/devices/pci*/0000:00:*/usb*/*/*/*/bluetooth/hci0/rfkill* type   0440 bluetooth bluetooth
 /dev/rfkill                   0660   root       bluetooth
 ##############################################################
+# Source: device/intel/mixins/groups/disk-bus/auto/ueventd.rc
+##############################################################
+/dev/block/pci/pci0000:00/0000:00:1c.0/by-name/android_persistent   0660 system system
+##############################################################
 # Source: device/intel/mixins/groups/rfkill/true/ueventd.rc
 ##############################################################
 # rfkill node

From 3a0de5f4554f2ba446c8b7f1ad3baf5123a4c4f4 Mon Sep 17 00:00:00 2001
From: Sun Xinx <xinx.sun@intel.com>
Date: Mon, 10 Apr 2017 16:35:29 +0800
Subject: [PATCH 086/427] [Android-IA] Create an SEPolicy for DPTF

DPTF is a thermal management solution for Android_IA.

Jira: AIA-412
Test: Make sure that esif_ufd (the service) to run

Signed-off-by: Sun Xinx <xinx.sun@intel.com>
---
 sepolicy/thermal/device.te             |  1 +
 sepolicy/thermal/dptf/dptf.te          | 53 ++++++++++++++++++++++++++
 sepolicy/thermal/dptf/file.te          |  2 +
 sepolicy/thermal/dptf/file_contexts    |  3 ++
 sepolicy/thermal/dptf/init.te          |  7 ++++
 sepolicy/thermal/dptf/service.te       |  1 +
 sepolicy/thermal/dptf/service_contexts |  3 ++
 sepolicy/thermal/dptf/system_app.te    |  2 +
 sepolicy/thermal/dptf/system_server.te |  3 ++
 sepolicy/thermal/dptf/thermal_lite.te  | 14 +++++++
 sepolicy/thermal/file.te               |  3 ++
 sepolicy/thermal/file_contexts         | 12 ++++++
 sepolicy/thermal/system_app.te         | 14 +++++++
 sepolicy/thermal/ueventd.te            |  6 +++
 14 files changed, 124 insertions(+)
 create mode 100644 sepolicy/thermal/device.te
 create mode 100644 sepolicy/thermal/dptf/dptf.te
 create mode 100644 sepolicy/thermal/dptf/file.te
 create mode 100644 sepolicy/thermal/dptf/file_contexts
 create mode 100644 sepolicy/thermal/dptf/init.te
 create mode 100644 sepolicy/thermal/dptf/service.te
 create mode 100644 sepolicy/thermal/dptf/service_contexts
 create mode 100644 sepolicy/thermal/dptf/system_app.te
 create mode 100644 sepolicy/thermal/dptf/system_server.te
 create mode 100644 sepolicy/thermal/dptf/thermal_lite.te
 create mode 100644 sepolicy/thermal/file.te
 create mode 100644 sepolicy/thermal/file_contexts
 create mode 100644 sepolicy/thermal/system_app.te
 create mode 100644 sepolicy/thermal/ueventd.te

diff --git a/sepolicy/thermal/device.te b/sepolicy/thermal/device.te
new file mode 100644
index 000000000..d58ba6c54
--- /dev/null
+++ b/sepolicy/thermal/device.te
@@ -0,0 +1 @@
+type thermal_device, dev_type;
diff --git a/sepolicy/thermal/dptf/dptf.te b/sepolicy/thermal/dptf/dptf.te
new file mode 100644
index 000000000..2ca1b5cb5
--- /dev/null
+++ b/sepolicy/thermal/dptf/dptf.te
@@ -0,0 +1,53 @@
+# Rules for esif_ufd
+type dptf, domain;
+type dptf_exec, exec_type, file_type;
+init_daemon_domain(dptf);
+
+# Communicate with JHS
+binder_use(dptf)
+binder_service(dptf)
+binder_call(dptf, system_app)
+
+# Allow raw socket
+# Also requires DAC changes in device/intel/common/filesystem_config/android_filesystem_config.h
+allow dptf self:capability { net_raw };
+
+# Allow network access for DPTF UI
+net_domain(dptf)
+
+# Allow create and listen to uevent socket
+allow dptf self:netlink_kobject_uevent_socket create_socket_perms;
+
+# Add service to service_manager
+allow dptf dptf_service:service_manager add;
+
+# Find java_helper_service
+# DPTF calls java_helper_service for things that are best done using Android
+# Java API, such as graceful system shutdown, modem turning on/off, etc.
+allow dptf system_app_service:service_manager find;
+
+# System directory
+allow dptf system_file:file rx_file_perms;
+
+# Data directory
+allow dptf dptf_data_file:dir create_dir_perms;
+allow dptf dptf_data_file:file create_file_perms;
+
+#
+# Sysfs files
+#
+allow dptf sysfs_devices_system_cpu:file rw_file_perms;
+allow dptf sysfs_powercap:{ file lnk_file } rw_file_perms;
+allow dptf sysfs_powercap:dir { read open search};
+allow dptf sysfs_powercap:dir r_dir_perms;
+allow dptf sysfs_dptf_file:dir r_dir_perms;
+allow dptf sysfs_dptf_file:file rw_file_perms;
+allow dptf sysfs_thermal_management:dir r_dir_perms;
+allow dptf sysfs_thermal_management:file rw_file_perms;
+
+# /sys/class/backlight/intel_backlight/brigthness
+# /sys/class/power_supply/bq*/max_charge_current
+allow dptf sysfs:file rw_file_perms;
+
+# Set properties
+set_prop(dptf, powerctl_prop)
diff --git a/sepolicy/thermal/dptf/file.te b/sepolicy/thermal/dptf/file.te
new file mode 100644
index 000000000..08c3e1f08
--- /dev/null
+++ b/sepolicy/thermal/dptf/file.te
@@ -0,0 +1,2 @@
+type dptf_data_file, file_type, data_file_type;
+type sysfs_dptf_file, fs_type, sysfs_type;
diff --git a/sepolicy/thermal/dptf/file_contexts b/sepolicy/thermal/dptf/file_contexts
new file mode 100644
index 000000000..24a3bec10
--- /dev/null
+++ b/sepolicy/thermal/dptf/file_contexts
@@ -0,0 +1,3 @@
+/data/misc/dptf(/.*)?           u:object_r:dptf_data_file:s0
+/etc/dptf(/.*)?                 u:object_r:dptf_data_file:s0
+(/system)?/vendor/bin/esif_ufd  u:object_r:dptf_exec:s0
diff --git a/sepolicy/thermal/dptf/init.te b/sepolicy/thermal/dptf/init.te
new file mode 100644
index 000000000..f315d90df
--- /dev/null
+++ b/sepolicy/thermal/dptf/init.te
@@ -0,0 +1,7 @@
+#
+# init
+#
+
+# allow init to start thermal lite from ramfs
+# thermal lite gets its label from seclabel
+domain_trans(init, rootfs, thermal_lite)
diff --git a/sepolicy/thermal/dptf/service.te b/sepolicy/thermal/dptf/service.te
new file mode 100644
index 000000000..57b336c49
--- /dev/null
+++ b/sepolicy/thermal/dptf/service.te
@@ -0,0 +1 @@
+type dptf_service,             service_manager_type;
diff --git a/sepolicy/thermal/dptf/service_contexts b/sepolicy/thermal/dptf/service_contexts
new file mode 100644
index 000000000..508fb84d1
--- /dev/null
+++ b/sepolicy/thermal/dptf/service_contexts
@@ -0,0 +1,3 @@
+esif_ufd                                  u:object_r:dptf_service:s0
+java_helper_client_service                u:object_r:dptf_service:s0
+java_helper_service                       u:object_r:system_app_service:s0
diff --git a/sepolicy/thermal/dptf/system_app.te b/sepolicy/thermal/dptf/system_app.te
new file mode 100644
index 000000000..40a3b4b34
--- /dev/null
+++ b/sepolicy/thermal/dptf/system_app.te
@@ -0,0 +1,2 @@
+# JHS service
+allow system_app system_app_service:service_manager add;
diff --git a/sepolicy/thermal/dptf/system_server.te b/sepolicy/thermal/dptf/system_server.te
new file mode 100644
index 000000000..2ab183022
--- /dev/null
+++ b/sepolicy/thermal/dptf/system_server.te
@@ -0,0 +1,3 @@
+# permission needed for sensor service to access thermal sensors
+allow system_server sysfs_thermal_management:dir rw_dir_perms;
+allow system_server sysfs_thermal_management:file rw_file_perms;
diff --git a/sepolicy/thermal/dptf/thermal_lite.te b/sepolicy/thermal/dptf/thermal_lite.te
new file mode 100644
index 000000000..00d43c6f0
--- /dev/null
+++ b/sepolicy/thermal/dptf/thermal_lite.te
@@ -0,0 +1,14 @@
+#
+# thermal_lite
+#
+
+type thermal_lite, domain;
+# File is in rootfs; label set in rc
+
+allow thermal_lite sysfs_thermal_management:dir r_dir_perms;
+allow thermal_lite sysfs_thermal_management:file r_file_perms;
+allow thermal_lite sysfs_powercap:dir r_dir_perms;
+allow thermal_lite sysfs_powercap:file rw_file_perms;
+
+# properties
+set_prop(thermal_lite, powerctl_prop)
diff --git a/sepolicy/thermal/file.te b/sepolicy/thermal/file.te
new file mode 100644
index 000000000..86747511b
--- /dev/null
+++ b/sepolicy/thermal/file.te
@@ -0,0 +1,3 @@
+type sysfs_thermal_management, fs_type, sysfs_type;
+type sysfs_thermal_file, fs_type, sysfs_type;
+type sysfs_powercap, fs_type, sysfs_type;
diff --git a/sepolicy/thermal/file_contexts b/sepolicy/thermal/file_contexts
new file mode 100644
index 000000000..815cedb6d
--- /dev/null
+++ b/sepolicy/thermal/file_contexts
@@ -0,0 +1,12 @@
+/sys/devices/virtual/thermal/thermal_zone[0-9]/trip_point_[0-9]_temp u:object_r:sysfs_thermal_file:s0
+/sys/devices/virtual/thermal/cooling_device[0-9]/cur_state u:object_r:sysfs_thermal_file:s0
+/sys/devices/virtual/thermal/thermal_zone[0-9]/policy u:object_r:sysfs_thermal_file:s0
+/sys/devices/virtual/thermal/thermal_zone[0-9]/temp u:object_r:sysfs_thermal_file:s0
+/sys/devices/system/cpu/cpu[0-4]/cpufreq/thermal_scaling_max_freq u:object_r:sysfs_thermal_file:s0
+
+/dev/acpi_thermal_rel       u:object_r:thermal_device:s0
+
+# thermal management
+/sys/devices/platform/coretemp.0(/.*)? u:object_r:sysfs_thermal_management:s0
+/sys/devices/virtual/thermal(/.*)?     u:object_r:sysfs_thermal_management:s0
+/sys/devices/virtual/powercap(/.*)?  u:object_r:sysfs_powercap:s0
diff --git a/sepolicy/thermal/system_app.te b/sepolicy/thermal/system_app.te
new file mode 100644
index 000000000..953bdec65
--- /dev/null
+++ b/sepolicy/thermal/system_app.te
@@ -0,0 +1,14 @@
+#
+# system_app.te
+#
+
+# XXX Not sure which app this is for, so common for now
+allow system_app sysfs_thermal_file:file rw_file_perms;
+allow system_app thermal_device:chr_file rw_file_perms;
+allow system_app sysfs_thermal_management:{ file lnk_file } rw_file_perms;
+allow system_app sysfs_thermal_management:dir {read open search };
+allow system_app sysfs_devices_system_cpu:file rw_file_perms;
+allow system_app kernel:capability net_admin;
+
+allow system_app sysfs_powercap:{ file lnk_file } rw_file_perms;
+allow system_app sysfs_powercap:dir r_dir_perms;
diff --git a/sepolicy/thermal/ueventd.te b/sepolicy/thermal/ueventd.te
new file mode 100644
index 000000000..8074fec75
--- /dev/null
+++ b/sepolicy/thermal/ueventd.te
@@ -0,0 +1,6 @@
+#
+# ueventd
+#
+
+allow ueventd sysfs_thermal_management:file rw_file_perms;
+allow ueventd sysfs_powercap:file w_file_perms;

From 9da91c3213f8b159c50d193a7a5653de6af18b85 Mon Sep 17 00:00:00 2001
From: Sun Xinx <xinx.sun@intel.com>
Date: Mon, 10 Apr 2017 16:58:54 +0800
Subject: [PATCH 087/427] [Android-IA] Update mixins.spec for DPTF

Update mixins.spec to add DPTF for Android_IA.

Jira: AIA-412
Test: Make sure that esif_ufd (the service) to run

Signed-off-by: Sun Xinx <xinx.sun@intel.com>
---
 androidia_64/mixins.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index dc22b5a29..8e28a8f69 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -28,6 +28,7 @@ dexpreopt: enabled
 disk-bus: auto
 usb: host+acc
 lights: true
+thermal: dptf(intel_modem=true)
 config-partition: enabled
 vendor-partition: true(partition_size=1500,partition_name=android_vendor)
 factory-partition: true

From 5458e252e2fe661aed1ff6dde8713e57fbbc19dd Mon Sep 17 00:00:00 2001
From: Sun Xinx <xinx.sun@intel.com>
Date: Mon, 24 Apr 2017 11:15:04 +0800
Subject: [PATCH 088/427] [Android-IA] Add platform specific thermal
 configuration file

dptf.dv includes the all the DPTF settings(policies, participants)
and tuning datas. Adding the dptf.dv to platfrom directory,
so that DPTF will support platform specific configuration.

Currently, the dptf.dv contains:
(1)Active policy
(2)Critical policy: 90C -> shutdown
(3)Passive policy: 65C -> 3W

Test: Make sure that esif_ufd (the service) to run

Tracked-On: AIA-412
Signed-off-by: Sun Xinx <xinx.sun@intel.com>
---
 androidia_64/dptf.dv | Bin 0 -> 2721 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 androidia_64/dptf.dv

diff --git a/androidia_64/dptf.dv b/androidia_64/dptf.dv
new file mode 100644
index 0000000000000000000000000000000000000000..c973bb3478408a7f08d035765e2fa33b8efc33e9
GIT binary patch
literal 2721
zcmaDV-@yO`Odukqpd<}M;{q-LA#Mr*`8k=%l?u-Jd1;yHrA3J)nfZCRG@yywFr86R
z368z%zVYl+@h!g|NX9QLl;mPy@OF(1zOjH2s9G9`^$QY<N-~o(3lj56iuFBRLwxmI
z4D{oHf(-0H>3u-V0>mKYAix2{++Y?1Lri?IQ@mb?o1Y;z;b3n+u+9{yYLF?&>;NQj
z8zi;{5?cg`{T~QGT#z}WunBs#1nSi?put$Y=Nu4<OBmftz`z9qkT?tw!zSd!%#`8+
zaBPGCO$Eh@0Mzv7UB{;X5}o6@<7Dg#*@QeUWVz16Q>}J9(R5p?c2uV$DSI8V+%?A~
zPFd@;-Bx&e^*o=TewmO13X01h$zc=FVvvu(2^dI|9$v771TqCVyv%rk0zd!~=LEAL
zY*^9*i7()XNPyTUkklZXgPdfbN*Hi?F9aC3pwymTQk=oS22>3)_yEu}hz2zv4>fzh
zG~^@}m&B)*=O)G%<d>%wF-Sr61_BKsN-tPjd}(oN3S6%l(AR_<T2PRj3{C)Zpcca7
z0pxHP0I_#K^C&o^j36=~_61NX00IzOKpo5kvynp+Ife?vk<=iW^98C1-AtG{5Ra$=
zHDeFJlA_Flg8a<95@1P_Yyb~?P`)Nft0DPXjmXz(OukkV^0k_huhoovt>)xwwIE-s
zCAnIYi^z_gWMDl2D+CPqV40DqG@Ox-&`M$&1{SSwTR~+Y&LRL<pW-R2us9Q{0Y_G2
zf!jr-Rzz02!~=6Cky;U1Z2_rT5wV#^s#Zi+vmsS0ky#B}2ossruxTYSt6|ehWLCqb
I6*a2?0P?|j9{>OV

literal 0
HcmV?d00001


From fa19c9472235bdae2393a56f2e6630e7f8ebbb40 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Wed, 7 Jun 2017 12:21:31 +0530
Subject: [PATCH 089/427] Update to latest mixin changes

- Enable DPTF on AIA

JIRA : None
Test : Device boots to home screen

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/BoardConfig.mk |  6 ++++++
 androidia_64/device.mk      | 20 ++++++++++++++++++++
 androidia_64/init.rc        | 22 ++++++++++++++++++++++
 3 files changed, 48 insertions(+)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index bfe4154eb..c1b3bfbd6 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -265,6 +265,12 @@ BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/rfkill
 WITH_DEXPREOPT := true
 WITH_DEXPREOPT_PIC := true
 ##############################################################
+# Source: device/intel/mixins/groups/thermal/dptf/BoardConfig.mk
+##############################################################
+BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/thermal
+BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/thermal/dptf
+BOARD_KERNEL_CMDLINE += thermal.off=1
+##############################################################
 # Source: device/intel/mixins/groups/config-partition/enabled/BoardConfig.mk
 ##############################################################
 BOARD_CONFIGIMAGE_PARTITION_SIZE := 8388608
diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index a67f57c52..47d741ed1 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -387,6 +387,26 @@ PRODUCT_PACKAGES += \
 ##############################################################
 PRODUCT_PACKAGES += lights.android_ia
 ##############################################################
+# Source: device/intel/mixins/groups/thermal/dptf/product.mk
+##############################################################
+# DPTF
+INTEL_MODEM_CTL := true
+PRODUCT_PACKAGES += esif_ufd \
+    dsp.dv \
+    dptf.dv \
+    libc++_shared.so \
+    Dptf \
+    DptfPolicyActive \
+    DptfPolicyAdaptivePerformance \
+    DptfPolicyConditionalLogicLib \
+    DptfPolicyCritical \
+    DptfPolicyEmergencyCallMode \
+    DptfPolicyPassive \
+    DptfPolicyVirtualSensor \
+    upe_java \
+    jhs
+PRODUCT_COPY_FILES += $(LOCAL_PATH)/dptf.dv:/system/etc/dptf/dv/dptf.dv
+##############################################################
 # Source: device/intel/mixins/groups/vendor-partition/true/product.mk
 ##############################################################
 PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/mmcblk1p10
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 342c5c70a..55c693850 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -396,6 +396,28 @@ on boot
 on charger
     write /sys/devices/pci0000\:00/0000\:00\:14.0/power/control auto
 ##############################################################
+# Source: device/intel/mixins/groups/thermal/dptf/init.rc
+##############################################################
+on post-fs
+    setprop persist.thermal.mode dptf
+
+service esif_ufd /system/vendor/bin/esif_ufd -n
+    user system
+    group system
+    class main
+
+on post-fs-data
+    mkdir /data/misc/dptf 0770 system system
+    mkdir /data/misc/dptf/lock 0770 system system
+
+on boot
+    chown system system /sys/devices/system/cpu/intel_pstate/max_perf_pct
+    chown system system /sys/devices/system/cpu/intel_pstate/min_perf_pct
+    chown system system /sys/devices/system/cpu/intel_pstate/no_turbo
+    chown system system /sys/class/powercap/intel-rapl:0/enabled
+    chown system system /sys/class/powercap/intel-rapl:0/constraint_0_power_limit_uw
+    restorecon_recursive /sys/class/powercap
+##############################################################
 # Source: device/intel/mixins/groups/config-partition/enabled/init.rc
 ##############################################################
 # Enable SELinux labeling

From 31cbbad021aa9a1966837699c220b8e557cd3b5d Mon Sep 17 00:00:00 2001
From: Fuwei Tang <fuweix.tang@intel.com>
Date: Wed, 7 Jun 2017 15:16:51 +0800
Subject: [PATCH 090/427] Fix support for stub HAL

This patch adds xml config file for stub HAL and
fix the bug of lack of 'endif' in
common/audio/AndroidBoard.mk

Also the android.primary.android_ia or android.stub.primary
are handled are required dependencies as needed

Signed-off-by: Fuwei Tang <fuweix.tang@intel.com>
Signed-off-by: Libin Yang <libin.yang@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 common/audio/AndroidBoard.mk                  | 21 +++++++++
 .../stub_audio_policy_configuration.xml       | 47 +++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 common/audio/default/policy/stub_audio_policy_configuration.xml

diff --git a/common/audio/AndroidBoard.mk b/common/audio/AndroidBoard.mk
index 316d50d3a..0da940533 100644
--- a/common/audio/AndroidBoard.mk
+++ b/common/audio/AndroidBoard.mk
@@ -15,6 +15,7 @@ AUDIO_HARDWARE := default
 # Next configuration is used for Intel NUC6i5SYH
 #AUDIO_HARDWARE := PCH-ALC283
 #AUDIO_HARDWARE := nuc-skull-canyon
+endif
 
 ###########################################
 # Audio stack Packages
@@ -26,10 +27,17 @@ LOCAL_REQUIRED_MODULES := \
     audio_policy_configuration_files \
     audio_settings_configuration_files
 
+ifeq ($(INTEL_AUDIO_HAL), stub)
+LOCAL_REQUIRED_MODULES += audio.stub.default
+else
+LOCAL_REQUIRED_MODULES += audio.primary.android_ia
+
 ifeq ($(INTEL_AUDIO_HAL),audio_pfw)
 LOCAL_REQUIRED_MODULES += audio_hal_configuration_files
 endif
 
+endif
+
 include $(BUILD_PHONY_PACKAGE)
 
 ###########################################
@@ -46,6 +54,10 @@ LOCAL_REQUIRED_MODULES := \
     default_volume_tables.xml \
     audio_policy_configuration.xml
 
+ifeq ($(INTEL_AUDIO_HAL), stub)
+LOCAL_REQUIRED_MODULES += stub_audio_policy_configuration.xml
+endif
+
 include $(BUILD_PHONY_PACKAGE)
 
 include $(CLEAR_VARS)
@@ -93,6 +105,15 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
 LOCAL_SRC_FILES := default/policy/$(LOCAL_MODULE)
 include $(BUILD_PREBUILT)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := stub_audio_policy_configuration.xml
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
+LOCAL_SRC_FILES := default/policy/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := audio_policy_configuration.xml
 LOCAL_MODULE_OWNER := intel
diff --git a/common/audio/default/policy/stub_audio_policy_configuration.xml b/common/audio/default/policy/stub_audio_policy_configuration.xml
new file mode 100644
index 000000000..2b49fa33f
--- /dev/null
+++ b/common/audio/default/policy/stub_audio_policy_configuration.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2017 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.
+-->
+<!-- Stub Audio HAL Audio Policy Configuration file -->
+
+<module name="stub" halVersion="2.0">
+    <attachedDevices>
+        <item>Default Out</item>
+        <item>Default In</item>
+        </attachedDevices>
+    <defaultOutputDevice>Default Out</defaultOutputDevice>
+    <mixPorts>
+        <mixPort name="stub output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY">
+            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                     samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+        </mixPort>
+
+        <mixPort name="stub input" role="sink">
+            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                     samplingRates="44100" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
+        </mixPort>
+    </mixPorts>
+    <devicePorts>
+        <devicePort tagName="Default Out" type="AUDIO_DEVICE_OUT_STUB" role="sink">
+                </devicePort>
+
+        <devicePort tagName="Default In" type="AUDIO_DEVICE_IN_STUB" role="source">
+        </devicePort>
+    </devicePorts>
+    <routes>
+        <route type="mix" sink="Default Out" sources="stub output"/>
+
+        <route type="mix" sink="stub input" sources="Default In"/>
+    </routes>
+</module>

From e4966ca8127ddc451178b8433d824c46ae29f3fb Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 8 Jun 2017 05:03:04 +0530
Subject: [PATCH 091/427] Update to latest mixin changes

- Add MemHAL Module

JIRA : None
Test : Device boots to home screen

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/device.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 47d741ed1..5ea6ff3b4 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -193,6 +193,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     device/intel/android_ia/common/graphics/drirc:system/etc/drirc
 
+# Memtrack HAL
+PRODUCT_PACKAGES += \
+    memtrack.android_ia
+
 
 # HWComposer IA
 PRODUCT_PACKAGES += \

From 7ae322b43b704ddcb906f3ba5b2f3f5713ffb77b Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Wed, 7 Jun 2017 16:14:38 +0530
Subject: [PATCH 092/427] Update mixins for enabling MIDI host & peripheral

JIRA: AIA-267
Tests: MIDI host & peripheral modes should work as specified
here: https://source.android.com/devices/audio/midi_test

Signed-off-by: Aiswarya Cyriac <aiswarya.cyriac@intel.com>
Signed-off-by: Abhilash K V <abhilash.k.v@intel.com>
---
 androidia_64/device.mk   |  6 ++++++
 androidia_64/init.rc     | 30 ++++++++++++++++++++++++++++++
 androidia_64/mixins.spec |  1 +
 3 files changed, 37 insertions(+)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 5ea6ff3b4..247a42c70 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -476,6 +476,12 @@ PRODUCT_PACKAGES_DEBUG += \
     pytimechart-record \
     lspci
 ##############################################################
+# Source: device/intel/mixins/groups/midi/true/product.mk
+##############################################################
+# MIDI support
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.software.midi.xml:system/etc/permissions/android.software.midi.xml
+##############################################################
 # Source: device/intel/mixins/groups/debug-kernel/default/product.mk
 ##############################################################
 ifneq ($(TARGET_BUILD_VARIANT),user)
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 55c693850..9e64aed6d 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -180,6 +180,8 @@ on boot
     mkdir /config/usb_gadget/g1/functions/ffs.adb
     mkdir /config/usb_gadget/g1/functions/mtp.gs0
     mkdir /config/usb_gadget/g1/functions/ptp.gs1
+    mkdir /config/usb_gadget/g1/functions/midi.gs5
+
     mkdir /config/usb_gadget/g1/configs/b.1
     mkdir /config/usb_gadget/g1/configs/b.1/strings/0x409
     symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f1
@@ -233,6 +235,15 @@ on property:sys.usb.config=ptp,adb && property:sys.usb.configfs=1
     # write /config/usb_gadget/g1/os_desc/use 1
     write /config/usb_gadget/g1/idVendor 0x8087
     write /config/usb_gadget/g1/idProduct 0x0a61
+
+on property:sys.usb.config=midi && property:sys.usb.configfs=1
+    write /config/usb_gadget/g1/idVendor 0x8087
+    write /config/usb_gadget/g1/idProduct 0x0a65
+
+on property:sys.usb.config=midi,adb && property:sys.usb.configfs=1
+    write /config/usb_gadget/g1/idVendor 0x8087
+    write /config/usb_gadget/g1/idProduct 0x0a67
+
 ##############################################################
 # Source: device/intel/mixins/groups/adb_net/true/init.rc
 ##############################################################
@@ -445,6 +456,25 @@ import /init.logs.rc
 ##############################################################
 import /init.crashlogd.rc
 ##############################################################
+# Source: device/intel/mixins/groups/midi/true/init.rc
+##############################################################
+on property:sys.usb.config=midi
+    write /sys/class/android_usb/android0/enable 0
+    write /sys/class/android_usb/android0/idVendor 8087
+    write /sys/class/android_usb/android0/idProduct 0a67
+    write /sys/class/android_usb/android0/functions ${sys.usb.config}
+    write /sys/class/android_usb/android0/enable 1
+    setprop sys.usb.state ${sys.usb.config}
+
+on property:sys.usb.config=midi,adb
+    write /sys/class/android_usb/android0/enable 0
+    write /sys/class/android_usb/android0/idVendor 8087
+    write /sys/class/android_usb/android0/idProduct 0a65
+    write /sys/class/android_usb/android0/functions ${sys.usb.config}
+    write /sys/class/android_usb/android0/enable 1
+    start adbd
+    setprop sys.usb.state ${sys.usb.config}
+##############################################################
 # Source: device/intel/mixins/groups/debug-kernel/default/init.rc
 ##############################################################
 import /init.kernel.rc
diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index 8e28a8f69..32c3b7197 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -37,3 +37,4 @@ debug-logs: true
 debug-phonedoctor: true
 debug-tools: true
 flashfiles: ini(oemvars=false,version=3.0,fastboot_min_battery_level=3500,installer=true)
+midi: true

From 4f891a8690084686f40e16f3e7828b346f77ca1d Mon Sep 17 00:00:00 2001
From: tanminger <ming.tan@intel.com>
Date: Tue, 6 Jun 2017 10:23:28 +0800
Subject: [PATCH 093/427] [Android-IA] Add the support of 2ndstage for
 bootloader.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This code is copied from Cherry Trail used.
2ndstage currently is used for store oemvar.

JIRA: AIA-415
Test: 1) Flash BIOS. It will clear the efi var.
      2) At the first time bootloader startup (userdebug build),
         check for “Setting oemvar: MagicKeyTimeout” in serial logs

Signed-off-by: tanminger <ming.tan@intel.com>
---
 androidia_64/mixins.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index 32c3b7197..5d677a4cf 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -5,6 +5,7 @@ mixinsdir: device/intel/mixins/groups
 product.mk: device.mk
 
 [groups]
+2ndstage: oemvars
 android_ia: default
 sepolicy: enforcing
 graphics: android_ia(gen9+=true,hwc2=true,vulkan=true,drmhwc=false,minigbm=true)
@@ -18,7 +19,7 @@ usb-gadget: g_ffs
 adb_net: true
 kernel: android_ia
 bluetooth: btusb
-boot-arch: android_ia(bootloader_policy=0x0,bootloader_len=60)
+boot-arch: android_ia(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80)
 audio: android_ia
 wlan: iwlwifi
 cpu-arch: skl

From 2fb36f29dc14daa3916dbef86999399906bb02cf Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 8 Jun 2017 06:14:13 +0530
Subject: [PATCH 094/427] Update to latest mixin changes

- Add support of 2ndstage for bootloader

JIRA : None
Test : Device boots to home screen

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/BoardConfig.mk |  5 +++++
 androidia_64/oemvars.txt    | 14 ++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 androidia_64/oemvars.txt

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index c1b3bfbd6..d4e3a6e99 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -1,6 +1,11 @@
 # ----------------- BEGIN MIX-IN DEFINITIONS -----------------
 # Mix-In definitions are auto-generated by mixin-update
 ##############################################################
+# Source: device/intel/mixins/groups/2ndstage/oemvars/BoardConfig.mk
+##############################################################
+TARGET_BOOTLOADER_IS_2ND := true
+BOARD_OEM_VARS += $(TARGET_DEVICE_DIR)/oemvars.txt
+##############################################################
 # Source: device/intel/mixins/groups/android_ia/default/BoardConfig.mk
 ##############################################################
 KERNEL_CROSS_COMPILE_WRAPPER := x86_64-linux-android-
diff --git a/androidia_64/oemvars.txt b/androidia_64/oemvars.txt
new file mode 100644
index 000000000..66a5632af
--- /dev/null
+++ b/androidia_64/oemvars.txt
@@ -0,0 +1,14 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/boot-arch/android_ia/oemvars.txt
+##############################################################
+# This section may appear empty if magic_key_timeout is false
+
+##########################
+GUID = 4a67b082-0a4c-41cf-b6c7-440b29bb8c4f
+
+# Maximum timeout to check for magic key at boot; loader GUID
+MagicKeyTimeout     80
+
+# ------------------ END MIX-IN DEFINITIONS ------------------

From 13ba96205690ea665d324e5e762af1d515269f1d Mon Sep 17 00:00:00 2001
From: boyangX <box.a.yang@intel.com>
Date: Thu, 8 Jun 2017 06:49:20 +0530
Subject: [PATCH 095/427] hange kernel console log level from 7 to 3

Port from Android M.
The Kernel log level was reduced for boot time optimization.

JIRA:  AIA-413
Tests: Joule's EB test shows kernel boot time was reduced

Signed-off-by: boyangX <box.a.yang@intel.com>
---
 androidia_64/mixins.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index 5d677a4cf..4327ed3a6 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -17,7 +17,7 @@ storage: sdcard-mmc0-usb-sd(adoptablesd=true,adoptableusb=false)
 display-density: default
 usb-gadget: g_ffs
 adb_net: true
-kernel: android_ia
+kernel: android_ia(loglevel=3)
 bluetooth: btusb
 boot-arch: android_ia(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80)
 audio: android_ia

From 0526cfa14e4387650e8390f525311e4498292808 Mon Sep 17 00:00:00 2001
From: boyangX <box.a.yang@intel.com>
Date: Thu, 8 Jun 2017 06:51:26 +0530
Subject: [PATCH 096/427] Diable cpuidle when system boot up

Port from Android M
After cpuidle governor is started, CPU has some chance to enter idle.
To disable cpuidle could decrease system cold boot up latency with ~380 ms.
After system boot completed, the cpuidle is recovered.

JIRA:  AIA-413
Tests: Joule's EB test shows kernel boot time was reduced

Signed-off-by: boyangX <box.a.yang@intel.com>
---
 androidia_64/mixins.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index 4327ed3a6..25801dd97 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -17,7 +17,7 @@ storage: sdcard-mmc0-usb-sd(adoptablesd=true,adoptableusb=false)
 display-density: default
 usb-gadget: g_ffs
 adb_net: true
-kernel: android_ia(loglevel=3)
+kernel: android_ia(loglevel=3, disable_cpuidle_on_boot=true)
 bluetooth: btusb
 boot-arch: android_ia(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80)
 audio: android_ia

From 5d3862530e4849d4146b07f3ab2686ead45ff9e7 Mon Sep 17 00:00:00 2001
From: boyangX <box.a.yang@intel.com>
Date: Fri, 19 May 2017 19:15:44 +0800
Subject: [PATCH 097/427] Disable ata and fbdev

Port from Android M
ata and fbdev initialize cost too much time, and they are not required
by Android. so disable them to save boot up time.

JIRA:  AIA-413
Tests: Joule's EB test shows kernel boot time was reduced

Signed-off-by: boyangX <box.a.yang@intel.com>
---
 kernel_config/kernel_64_defconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index af00e5dc7..5efa0aaba 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -1724,7 +1724,7 @@ CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_SYM53C500=m
 # CONFIG_SCSI_DH is not set
 # CONFIG_SCSI_OSD_INITIATOR is not set
-CONFIG_ATA=y
+# CONFIG_ATA is not set
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_ATA_ACPI=y
@@ -4280,7 +4280,7 @@ CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_KMS_FB_HELPER=y
-CONFIG_DRM_FBDEV_EMULATION=y
+# CONFIG_DRM_FBDEV_EMULATION is not set
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 CONFIG_DRM_TTM=m
 

From 371c61905712a1d09cdde33c4ea49e1e2c0f9556 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 8 Jun 2017 07:08:02 +0530
Subject: [PATCH 098/427] Update to latest mixin changes

- AIA PnP KPI optimization patch merging

JIRA : None
Test : Device boots to home screen

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/AndroidBoard.mk |  2 +-
 androidia_64/BoardConfig.mk  |  3 +-
 androidia_64/fstab           |  2 +-
 androidia_64/init.rc         | 61 ++++++++++++++++++++++++++++++++++++
 4 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/androidia_64/AndroidBoard.mk b/androidia_64/AndroidBoard.mk
index 79513b2e2..c8da4d748 100644
--- a/androidia_64/AndroidBoard.mk
+++ b/androidia_64/AndroidBoard.mk
@@ -256,7 +256,7 @@ $(INSTALLED_CONFIGIMAGE_TARGET) : $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK)
 		$(PRODUCT_OUT)/config \
 		$(PRODUCT_OUT)/config.img \
 		ext4 \
-		config \
+		oem_config \
 		$(BOARD_CONFIGIMAGE_PARTITION_SIZE)
 
 INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_CONFIGIMAGE_TARGET)
diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index d4e3a6e99..f93b40ec5 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -66,9 +66,10 @@ TARGET_SUPPORTS_64_BIT_APPS := true
 TARGET_PRELINK_MODULE := false
 TARGET_NO_KERNEL ?= false
 
+KERNEL_LOGLEVEL ?= 3
 SERIAL_PARAMETER := console=tty0 console=ttyS2,115200n8
 
-BOARD_KERNEL_CMDLINE += root=/dev/ram0  androidboot.hardware=$(TARGET_PRODUCT) androidboot.selinux=permissive firmware_class.path=/vendor/firmware
+BOARD_KERNEL_CMDLINE += root=/dev/ram0  androidboot.hardware=$(TARGET_PRODUCT) androidboot.selinux=permissive firmware_class.path=/vendor/firmware loglevel=$(KERNEL_LOGLEVEL)
 
 ifneq ($(TARGET_BUILD_VARIANT),user)
 ifeq ($(SPARSE_IMG),true)
diff --git a/androidia_64/fstab b/androidia_64/fstab
index 11e245fae..7a2830242 100644
--- a/androidia_64/fstab
+++ b/androidia_64/fstab
@@ -30,7 +30,7 @@
 ##############################################################
 # Source: device/intel/mixins/groups/config-partition/enabled/fstab
 ##############################################################
-/dev/block/mmcblk1p11	/config         ext4    noatime,nosuid,nodev,errors=panic          wait,check
+/dev/block/mmcblk1p11	/oem_config         ext4    noatime,nosuid,nodev,errors=panic          wait,check
 ##############################################################
 # Source: device/intel/mixins/groups/vendor-partition/true/fstab
 ##############################################################
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 9e64aed6d..915881449 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -304,6 +304,67 @@ on boot
 on property:sys.boot_completed=1
 	write /sys/devices/system/cpu/cpufreq/interactive/boost 0
 	write /sys/devices/system/cpu/cpufreq/interactive/irq_load_threshold 2
+
+on early-init
+	write /sys/devices/system/cpu/cpu0/cpuidle/state1/disable 1
+	write /sys/devices/system/cpu/cpu0/cpuidle/state2/disable 1
+	write /sys/devices/system/cpu/cpu0/cpuidle/state3/disable 1
+	write /sys/devices/system/cpu/cpu0/cpuidle/state4/disable 1
+	write /sys/devices/system/cpu/cpu0/cpuidle/state5/disable 1
+	write /sys/devices/system/cpu/cpu0/cpuidle/state6/disable 1
+	write /sys/devices/system/cpu/cpu0/cpuidle/state7/disable 1
+	write /sys/devices/system/cpu/cpu1/cpuidle/state1/disable 1
+	write /sys/devices/system/cpu/cpu1/cpuidle/state2/disable 1
+	write /sys/devices/system/cpu/cpu1/cpuidle/state3/disable 1
+	write /sys/devices/system/cpu/cpu1/cpuidle/state4/disable 1
+	write /sys/devices/system/cpu/cpu1/cpuidle/state5/disable 1
+	write /sys/devices/system/cpu/cpu1/cpuidle/state6/disable 1
+	write /sys/devices/system/cpu/cpu1/cpuidle/state7/disable 1
+	write /sys/devices/system/cpu/cpu2/cpuidle/state1/disable 1
+	write /sys/devices/system/cpu/cpu2/cpuidle/state2/disable 1
+	write /sys/devices/system/cpu/cpu2/cpuidle/state3/disable 1
+	write /sys/devices/system/cpu/cpu2/cpuidle/state4/disable 1
+	write /sys/devices/system/cpu/cpu2/cpuidle/state5/disable 1
+	write /sys/devices/system/cpu/cpu2/cpuidle/state6/disable 1
+	write /sys/devices/system/cpu/cpu2/cpuidle/state7/disable 1
+	write /sys/devices/system/cpu/cpu3/cpuidle/state1/disable 1
+	write /sys/devices/system/cpu/cpu3/cpuidle/state2/disable 1
+	write /sys/devices/system/cpu/cpu3/cpuidle/state3/disable 1
+	write /sys/devices/system/cpu/cpu3/cpuidle/state4/disable 1
+	write /sys/devices/system/cpu/cpu3/cpuidle/state5/disable 1
+	write /sys/devices/system/cpu/cpu3/cpuidle/state6/disable 1
+	write /sys/devices/system/cpu/cpu3/cpuidle/state7/disable 1
+
+on property:sys.boot_completed=1
+	write /sys/devices/system/cpu/cpu0/cpuidle/state1/disable 0
+	write /sys/devices/system/cpu/cpu0/cpuidle/state2/disable 0
+	write /sys/devices/system/cpu/cpu0/cpuidle/state3/disable 0
+	write /sys/devices/system/cpu/cpu0/cpuidle/state4/disable 0
+	write /sys/devices/system/cpu/cpu0/cpuidle/state5/disable 0
+	write /sys/devices/system/cpu/cpu0/cpuidle/state6/disable 0
+	write /sys/devices/system/cpu/cpu0/cpuidle/state7/disable 0
+	write /sys/devices/system/cpu/cpu1/cpuidle/state1/disable 0
+	write /sys/devices/system/cpu/cpu1/cpuidle/state2/disable 0
+	write /sys/devices/system/cpu/cpu1/cpuidle/state3/disable 0
+	write /sys/devices/system/cpu/cpu1/cpuidle/state4/disable 0
+	write /sys/devices/system/cpu/cpu1/cpuidle/state5/disable 0
+	write /sys/devices/system/cpu/cpu1/cpuidle/state6/disable 0
+	write /sys/devices/system/cpu/cpu1/cpuidle/state7/disable 0
+	write /sys/devices/system/cpu/cpu2/cpuidle/state1/disable 0
+	write /sys/devices/system/cpu/cpu2/cpuidle/state2/disable 0
+	write /sys/devices/system/cpu/cpu2/cpuidle/state3/disable 0
+	write /sys/devices/system/cpu/cpu2/cpuidle/state4/disable 0
+	write /sys/devices/system/cpu/cpu2/cpuidle/state5/disable 0
+	write /sys/devices/system/cpu/cpu2/cpuidle/state6/disable 0
+	write /sys/devices/system/cpu/cpu2/cpuidle/state7/disable 0
+	write /sys/devices/system/cpu/cpu3/cpuidle/state1/disable 0
+	write /sys/devices/system/cpu/cpu3/cpuidle/state2/disable 0
+	write /sys/devices/system/cpu/cpu3/cpuidle/state3/disable 0
+	write /sys/devices/system/cpu/cpu3/cpuidle/state4/disable 0
+	write /sys/devices/system/cpu/cpu3/cpuidle/state5/disable 0
+	write /sys/devices/system/cpu/cpu3/cpuidle/state6/disable 0
+	write /sys/devices/system/cpu/cpu3/cpuidle/state7/disable 0
+
 ##############################################################
 # Source: device/intel/mixins/groups/bluetooth/btusb/init.rc
 ##############################################################

From 19a5c8735aa421cf9a7c7685b62b7a8da90693d5 Mon Sep 17 00:00:00 2001
From: Kishore Kadiyala <kishore.kadiyala@intel.com>
Date: Thu, 8 Jun 2017 21:59:41 +0530
Subject: [PATCH 099/427] Enable circular icons

Enable circular icons in config.xml

JIRA : None
Test : Device booted to Home screen should have circular icons

Signed-off-by: Kishore Kadiyala <kishore.kadiyala@intel.com>
---
 .../overlay/frameworks/base/core/res/res/values/config.xml   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/overlay/frameworks/base/core/res/res/values/config.xml b/common/overlay/frameworks/base/core/res/res/values/config.xml
index 07f5b20b9..11e17ed6f 100644
--- a/common/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/common/overlay/frameworks/base/core/res/res/values/config.xml
@@ -81,5 +81,8 @@
          * The device must be provisioned with HDCP keys (for protected content).
     -->
     <bool name="config_enableWifiDisplay">true</bool>
-    
+
+    <!-- Flag indicating whether round icons should be parsed from the application manifest. -->
+    <bool name="config_useRoundIcon">true</bool>
+
 </resources>

From 29679ffb4054886b42339efc415a4fe8e03fa35a Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Fri, 9 Jun 2017 17:03:53 -0700
Subject: [PATCH 100/427] Add option to enable/disable Gralloc1 support via
 Mixins.

This is disabled by default for now.

Jira: None.
Test: Mixin update and build passes.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
---
 androidia_64/BoardConfig.mk | 3 +++
 androidia_64/mixins.spec    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index f93b40ec5..670481576 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -47,6 +47,9 @@ BOARD_USES_MINIGBM := true
 BOARD_ENABLE_EXPLICIT_SYNC := true
 INTEL_MINIGBM := external/minigbm
 
+
+
+BOARD_USES_GRALLOC1 := false
 ##############################################################
 # Source: device/intel/mixins/groups/device-type/tablet/BoardConfig.mk
 ##############################################################
diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index 25801dd97..0b1eeec21 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -8,7 +8,7 @@ product.mk: device.mk
 2ndstage: oemvars
 android_ia: default
 sepolicy: enforcing
-graphics: android_ia(gen9+=true,hwc2=true,vulkan=true,drmhwc=false,minigbm=true)
+graphics: android_ia(gen9+=true,hwc2=true,vulkan=true,drmhwc=false,minigbm=true,gralloc1=false)
 media: android_ia
 device-type: tablet
 ethernet: dhcp

From 0c0d86158e43c774a184f0ce168cd2b457779c8b Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Fri, 9 Jun 2017 17:30:56 -0700
Subject: [PATCH 101/427] Revert "Disable ata and fbdev"

Broke Grub builds.

This reverts commit 5d3862530e4849d4146b07f3ab2686ead45ff9e7.
---
 kernel_config/kernel_64_defconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 5efa0aaba..af00e5dc7 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -1724,7 +1724,7 @@ CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_SYM53C500=m
 # CONFIG_SCSI_DH is not set
 # CONFIG_SCSI_OSD_INITIATOR is not set
-# CONFIG_ATA is not set
+CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_ATA_ACPI=y
@@ -4280,7 +4280,7 @@ CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_KMS_FB_HELPER=y
-# CONFIG_DRM_FBDEV_EMULATION is not set
+CONFIG_DRM_FBDEV_EMULATION=y
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 CONFIG_DRM_TTM=m
 

From e0a87ba099fa574324a9befcf7b1f3be94773f8e Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Tue, 13 Jun 2017 07:55:21 +0530
Subject: [PATCH 102/427] Revert "Enable default full disk encryption(FDE)" to
 fix warm/cold reboot issue.

Jira: AIA-417
Test: cold/warm reboot should happen seamlessly without any issues
---
 androidia_64/fstab                |  2 +-
 androidia_64/init.rc              | 12 +-----------
 kernel_config/kernel_64_defconfig | 12 ++++++------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/androidia_64/fstab b/androidia_64/fstab
index 7a2830242..072e9888b 100644
--- a/androidia_64/fstab
+++ b/androidia_64/fstab
@@ -19,7 +19,7 @@
 
 /dev/block/mmcblk1p7	/system         ext4    ro															wait
 /dev/block/mmcblk1p8	/cache          ext4    noatime,nosuid,nodev,errors=panic                           wait,check
-/dev/block/mmcblk1p13	/data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,forceencrypt=/dev/block/mmcblk1p6
+/dev/block/mmcblk1p13	/data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable
 /dev/block/mmcblk1p3	/boot           emmc    defaults                                                    defaults
 /dev/block/mmcblk1p4	/recovery       emmc    defaults                                                    defaults
 /dev/block/mmcblk1p5	/misc           emmc    defaults                                                    defaults
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 915881449..b29c7f067 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -3,7 +3,7 @@
 ##############################################################
 # Source: device/intel/mixins/groups/android_ia/default/init.rc
 ##############################################################
-on fs
+on early-init
     mount_all /fstab.${ro.hardware}
 
 on init
@@ -539,16 +539,6 @@ on property:sys.usb.config=midi,adb
 # Source: device/intel/mixins/groups/debug-kernel/default/init.rc
 ##############################################################
 import /init.kernel.rc
-##############################################################
-# Source: device/intel/mixins/groups/disk-encryption/default/init.rc
-##############################################################
-# This _should_ be the very last thing that happens in
-# the device's 'on post-fs-data' sections.  Since we compose
-# init scripts from various snippets with mixins, we need to
-# ensure this is included last in the mixin-update by listing
-# disk-encryption as LAST in the mixin spec file.
-on post-fs-data
-    setprop vold.post_fs_data_done 1
 # ------------------ END MIX-IN DEFINITIONS ------------------
 # Enable native bridge for target executables
 on early-init
diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index af00e5dc7..48d26a1ea 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -6679,9 +6679,9 @@ CONFIG_X86_DEBUG_FPU=y
 #
 # Security options
 #
-CONFIG_KEYS=y
+# CONFIG_KEYS is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
-CONFIG_SECURITYFS=y
+# CONFIG_SECURITYFS is not set
 CONFIG_SECURITY_NETWORK=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
 CONFIG_LSM_MMAP_MIN_ADDR=65536
@@ -6766,8 +6766,8 @@ CONFIG_CRYPTO_XCBC=m
 # Digest
 #
 CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRC32C_INTEL=y
-CONFIG_CRYPTO_CRC32=y
+# CONFIG_CRYPTO_CRC32C_INTEL is not set
+# CONFIG_CRYPTO_CRC32 is not set
 # CONFIG_CRYPTO_CRC32_PCLMUL is not set
 # CONFIG_CRYPTO_CRCT10DIF is not set
 CONFIG_CRYPTO_GHASH=m
@@ -6798,8 +6798,8 @@ CONFIG_CRYPTO_WP512=m
 # Ciphers
 #
 CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_AES_X86_64=y
-CONFIG_CRYPTO_AES_NI_INTEL=y
+CONFIG_CRYPTO_AES_X86_64=m
+CONFIG_CRYPTO_AES_NI_INTEL=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=y
 CONFIG_CRYPTO_BLOWFISH=m

From bed9428bbd00964a63b25ceaaa7a6cf391e7b8ff Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Tue, 13 Jun 2017 08:44:36 +0530
Subject: [PATCH 103/427] [Android-IA] Update mixins

- clean-up PRODUCT_PACKAGES for audio

Jira: None
Test: Device boots to home screen
---
 androidia_64/device.mk | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 247a42c70..5f6752466 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -339,14 +339,6 @@ PRODUCT_PACKAGES_DEBUG += \
          tinyplay \
          tinycap
 
-ifneq ($(BOARD_USES_GENERIC_AUDIO), true)
-PRODUCT_PACKAGES += \
-    audio.primary.android_ia
-else
-PRODUCT_PACKAGES += \
-    audio.primary.default
-endif
-
 # Extended Audio HALs
 PRODUCT_PACKAGES += \
     audio.r_submix.default \

From 57c6149a3aa38554fe7801cc6513d9680a0989d1 Mon Sep 17 00:00:00 2001
From: tanminger <ming.tan@intel.com>
Date: Thu, 8 Jun 2017 13:33:43 +0800
Subject: [PATCH 104/427] Set assume_bios_secure_boot=true for platforms which
 BIOS not support secure boot.

After use this patch and new kernelflinger, kernelflinger will
assume secure boot already enabled, and maybe set verify boot state to
green.

JIRA: AIA-418
Test: Verify boot state set to green.

Signed-off-by: tanminger <ming.tan@intel.com>
---
 androidia_64/mixins.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index 0b1eeec21..4e1506255 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -19,7 +19,7 @@ usb-gadget: g_ffs
 adb_net: true
 kernel: android_ia(loglevel=3, disable_cpuidle_on_boot=true)
 bluetooth: btusb
-boot-arch: android_ia(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80)
+boot-arch: android_ia(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true)
 audio: android_ia
 wlan: iwlwifi
 cpu-arch: skl

From 0fd078e77034ebb7d479fe5acf33626c4ce9c0d0 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Wed, 14 Jun 2017 06:50:46 +0530
Subject: [PATCH 105/427] [Android-IA] Update mixins

- BIOS Secure boot

Jira: None
Test: Device boots to home screen
---
 androidia_64/BoardConfig.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 670481576..8c8220772 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -218,6 +218,9 @@ endif
 
 
 
+# Kernelfligner will assume the BIOS support secure boot. Not check the EFI variable SecureBoot
+# It is useful when the BIOS does not support secure boot.
+KERNELFLINGER_ASSUME_BIOS_SECURE_BOOT := true
 
 ##############################################################
 # Source: device/intel/mixins/groups/audio/android_ia/BoardConfig.mk

From 1402e8e5ca418554d67c8d31f96a31a6112437e2 Mon Sep 17 00:00:00 2001
From: XXinSun <xinx.sun@intel.com>
Date: Wed, 14 Jun 2017 16:28:19 +0800
Subject: [PATCH 106/427] KERNEL: Add the intel_rapl into kernel by default

The init.rc will try to change the owner of the sysfs node which
relative to powercap, the sysfs node should get ready before init do
the actions.
So compile intel_rapl driver into the kernel instead of a module.

Jira: AIA-421
Test: During boot-up, run "dmesg | egrep 'init|intel_rapl'",
      intel_rapl should be loaded earlier than init.

Signed-off-by: Sun Xinx xinx.sun@intel.com
---
 kernel_config/kernel_64_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 48d26a1ea..b8c03f32c 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -6152,7 +6152,7 @@ CONFIG_PHY_SAMSUNG_USB2=m
 # CONFIG_PHY_EXYNOS4X12_USB2 is not set
 # CONFIG_PHY_EXYNOS5250_USB2 is not set
 CONFIG_POWERCAP=y
-CONFIG_INTEL_RAPL=m
+CONFIG_INTEL_RAPL=y
 # CONFIG_MCB is not set
 
 #

From ec89dea6b363a42f03f1005e568a390e213f6bb7 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Fri, 16 Jun 2017 01:26:40 +0530
Subject: [PATCH 107/427] [Android-IA] Update mixin changes

- Update Wallpaper picker changes

Jira : None
Test : Device boots to home screen
---
 androidia_64/device.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 5f6752466..e0767c4ef 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -152,6 +152,7 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     LiveWallpapers \
     LiveWallpapersPicker \
+    WallpaperPicker \
     NotePad \
     Provision \
     camera.android_ia \

From 0a71538e78c6ca18bf2f520fbefe94d688cfa255 Mon Sep 17 00:00:00 2001
From: Libin Yang <libin.yang@intel.com>
Date: Thu, 15 Jun 2017 05:02:10 +0800
Subject: [PATCH 108/427] Audio: Add support for configurable audio policy of
 stub

Add the configurable audio policy support for stub.

When other devices are disconnected, stub hal will be used.

Signed-off-by: Libin Yang <libin.yang@intel.com>
---
 common/audio/AndroidBoard.mk                  |     2 +-
 common/audio/stub/audiopolicy.mk              |     3 +
 .../stub/parameter-framework/AndroidBoard.mk  |   170 +
 ...rameterFrameworkConfigurationPolicy.xml.in |    14 +
 .../audio/stub/parameter-framework/README.md  |    11 +
 .../Settings/PolicyConfigurableDomains.xml    | 10228 ++++++++++++++++
 .../Settings/device_for_input_source.pfw      |   578 +
 .../device_for_strategy_accessibility.pfw     |   610 +
 .../Settings/device_for_strategy_dtmf.pfw     |   640 +
 .../device_for_strategy_enforced_audible.pfw  |   368 +
 .../Settings/device_for_strategy_media.pfw    |   352 +
 .../Settings/device_for_strategy_phone.pfw    |   497 +
 .../device_for_strategy_rerouting.pfw         |   313 +
 .../device_for_strategy_sonification.pfw      |   504 +
 ...e_for_strategy_sonification_respectful.pfw |   549 +
 ...r_strategy_transmitted_through_speaker.pfw |    42 +
 .../Settings/strategy_for_stream.pfw          |    19 +
 .../Settings/strategy_for_usage.pfw           |    38 +
 .../parameter-framework/Settings/volumes.pfw  |    26 +
 .../device_for_input_source.pfw               |   283 +
 .../device_for_strategies.pfw                 |   254 +
 .../Structure/PolicyClass.xml                 |     5 +
 .../Structure/PolicySubsystem-CommonTypes.xml |   198 +
 .../Structure/PolicySubsystem.xml             |   139 +
 .../parameter-framework/policy_criteria.txt   |    10 +
 25 files changed, 15852 insertions(+), 1 deletion(-)
 create mode 100644 common/audio/stub/audiopolicy.mk
 create mode 100644 common/audio/stub/parameter-framework/AndroidBoard.mk
 create mode 100644 common/audio/stub/parameter-framework/ParameterFrameworkConfigurationPolicy.xml.in
 create mode 100644 common/audio/stub/parameter-framework/README.md
 create mode 100644 common/audio/stub/parameter-framework/Settings/PolicyConfigurableDomains.xml
 create mode 100644 common/audio/stub/parameter-framework/Settings/device_for_input_source.pfw
 create mode 100644 common/audio/stub/parameter-framework/Settings/device_for_strategy_accessibility.pfw
 create mode 100644 common/audio/stub/parameter-framework/Settings/device_for_strategy_dtmf.pfw
 create mode 100644 common/audio/stub/parameter-framework/Settings/device_for_strategy_enforced_audible.pfw
 create mode 100644 common/audio/stub/parameter-framework/Settings/device_for_strategy_media.pfw
 create mode 100644 common/audio/stub/parameter-framework/Settings/device_for_strategy_phone.pfw
 create mode 100644 common/audio/stub/parameter-framework/Settings/device_for_strategy_rerouting.pfw
 create mode 100644 common/audio/stub/parameter-framework/Settings/device_for_strategy_sonification.pfw
 create mode 100644 common/audio/stub/parameter-framework/Settings/device_for_strategy_sonification_respectful.pfw
 create mode 100644 common/audio/stub/parameter-framework/Settings/device_for_strategy_transmitted_through_speaker.pfw
 create mode 100644 common/audio/stub/parameter-framework/Settings/strategy_for_stream.pfw
 create mode 100644 common/audio/stub/parameter-framework/Settings/strategy_for_usage.pfw
 create mode 100644 common/audio/stub/parameter-framework/Settings/volumes.pfw
 create mode 100644 common/audio/stub/parameter-framework/SettingsNoInput/device_for_input_source.pfw
 create mode 100644 common/audio/stub/parameter-framework/SettingsNoOutput/device_for_strategies.pfw
 create mode 100644 common/audio/stub/parameter-framework/Structure/PolicyClass.xml
 create mode 100644 common/audio/stub/parameter-framework/Structure/PolicySubsystem-CommonTypes.xml
 create mode 100644 common/audio/stub/parameter-framework/Structure/PolicySubsystem.xml
 create mode 100644 common/audio/stub/parameter-framework/policy_criteria.txt

diff --git a/common/audio/AndroidBoard.mk b/common/audio/AndroidBoard.mk
index 0da940533..65adf092b 100644
--- a/common/audio/AndroidBoard.mk
+++ b/common/audio/AndroidBoard.mk
@@ -185,5 +185,5 @@ endif
 ###########################################
 
 ifeq ($(USE_CONFIGURABLE_AUDIO_POLICY), 1)
-include device/intel/android_ia/common/audio/reference_configurable_audio_policy/AndroidBoard.mk
+include device/intel/android_ia/common/audio/$(AUDIO_HARDWARE)/audiopolicy.mk
 endif
diff --git a/common/audio/stub/audiopolicy.mk b/common/audio/stub/audiopolicy.mk
new file mode 100644
index 000000000..6da16622a
--- /dev/null
+++ b/common/audio/stub/audiopolicy.mk
@@ -0,0 +1,3 @@
+LOCAL_PATH := $(call my-dir)
+pfw_rebuild_settings ?= true
+include $(LOCAL_PATH)/parameter-framework/AndroidBoard.mk
diff --git a/common/audio/stub/parameter-framework/AndroidBoard.mk b/common/audio/stub/parameter-framework/AndroidBoard.mk
new file mode 100644
index 000000000..4d598b9f9
--- /dev/null
+++ b/common/audio/stub/parameter-framework/AndroidBoard.mk
@@ -0,0 +1,170 @@
+LOCAL_PATH := $(call my-dir)
+
+ifeq ($(USE_CONFIGURABLE_AUDIO_POLICY), 1)
+
+POLICY_NO_INPUT  := 0
+POLICY_NO_OUTPUT := 0
+
+PFW_CORE := external/parameter-framework
+BUILD_PFW_SETTINGS := $(PFW_CORE)/support/android/build_pfw_settings.mk
+PFW_DEFAULT_SCHEMAS_DIR := $(PFW_CORE)/upstream/schemas
+PFW_SCHEMAS_DIR := $(PFW_DEFAULT_SCHEMAS_DIR)
+
+##################################################################
+# CONFIGURATION FILES
+##################################################################
+######### Policy PFW top level file #########
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := ParameterFrameworkConfigurationPolicy.xml
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/parameter-framework
+LOCAL_SRC_FILES := $(LOCAL_MODULE).in
+
+AUDIO_PATTERN = @TUNING_ALLOWED@
+ifeq ($(TARGET_BUILD_VARIANT),user)
+AUDIO_VALUE = false
+else
+AUDIO_VALUE = true
+
+LOCAL_REQUIRED_MODULES := \
+     libremote-processor \
+     remote-process \
+
+endif
+
+LOCAL_POST_INSTALL_CMD := $(hide) sed -i -e 's|$(AUDIO_PATTERN)|$(AUDIO_VALUE)|g' $(LOCAL_MODULE_PATH)/$(LOCAL_MODULE)
+
+include $(BUILD_PREBUILT)
+
+
+########## Policy PFW Structures #########
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := PolicyClass.xml
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/parameter-framework/Structure/Policy
+LOCAL_SRC_FILES := Structure/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := PolicySubsystem.xml
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_REQUIRED_MODULES := \
+    PolicySubsystem-CommonTypes.xml \
+    PolicySubsystem-Volume.xml \
+    libpolicy-subsystem \
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/parameter-framework/Structure/Policy
+LOCAL_SRC_FILES := Structure/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := PolicySubsystem-CommonTypes.xml
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/parameter-framework/Structure/Policy
+LOCAL_SRC_FILES := Structure/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
+ifneq ($(POLICY_NO_INPUT),1)
+ifneq ($(POLICY_NO_OUTPUT),1)
+######### Policy PFW Settings #########
+include $(CLEAR_VARS)
+LOCAL_MODULE := parameter-framework.policy
+LOCAL_MODULE_STEM := PolicyConfigurableDomains.xml
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+        PolicyClass.xml \
+        PolicySubsystem.xml \
+        ParameterFrameworkConfigurationPolicy.xml
+
+ifeq ($(pfw_rebuild_settings),true)
+PFW_TOPLEVEL_FILE := $(TARGET_OUT_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml
+PFW_CRITERIA_FILE := $(LOCAL_PATH)/policy_criteria.txt
+PFW_EDD_FILES := \
+        $(LOCAL_PATH)/Settings/device_for_strategy_media.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_phone.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_sonification.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_sonification_respectful.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_dtmf.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_enforced_audible.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_transmitted_through_speaker.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_accessibility.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_rerouting.pfw \
+        $(LOCAL_PATH)/Settings/strategy_for_stream.pfw \
+        $(LOCAL_PATH)/Settings/strategy_for_usage.pfw \
+        $(LOCAL_PATH)/Settings/device_for_input_source.pfw \
+        $(LOCAL_PATH)/Settings/volumes.pfw
+
+include $(BUILD_PFW_SETTINGS)
+else
+# Use the existing file
+LOCAL_SRC_FILES := Settings/$(LOCAL_MODULE_STEM)
+include $(BUILD_PREBUILT)
+endif # pfw_rebuild_settings
+
+endif # NO_INPUT
+endif # NO_OUPUT
+
+######### Policy PFW Settings - No Output #########
+ifeq ($(POLICY_NO_OUTPUT),1)
+include $(CLEAR_VARS)
+LOCAL_MODULE := parameter-framework.policy.no-output
+LOCAL_MODULE_STEM := PolicyConfigurableDomains-NoOutputDevice.xml
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+        PolicyClass.xml \
+        PolicySubsystem.xml \
+        ParameterFrameworkConfigurationPolicy.xml
+
+PFW_TOPLEVEL_FILE := $(TARGET_OUT_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml
+PFW_CRITERIA_FILE := $(LOCAL_PATH)/policy_criteria.txt
+PFW_EDD_FILES := \
+        $(LOCAL_PATH)/SettingsNoOutput/device_for_strategies.pfw \
+        $(LOCAL_PATH)/Settings/strategy_for_stream.pfw \
+        $(LOCAL_PATH)/Settings/strategy_for_usage.pfw \
+        $(LOCAL_PATH)/Settings/device_for_input_source.pfw \
+        $(LOCAL_PATH)/Settings/volumes.pfw
+
+include $(BUILD_PFW_SETTINGS)
+endif # NO_OUTPUT
+
+######### Policy PFW Settings - No Input #########
+ifeq ($(POLICY_NO_INPUT),1)
+include $(CLEAR_VARS)
+LOCAL_MODULE := parameter-framework.policy.no-input
+LOCAL_MODULE_STEM := PolicyConfigurableDomains-NoInputDevice.xml
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+        PolicyClass.xml \
+        PolicySubsystem.xml \
+        ParameterFrameworkConfigurationPolicy.xml
+
+PFW_TOPLEVEL_FILE := $(TARGET_OUT_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml
+PFW_CRITERIA_FILE := $(LOCAL_PATH)/policy_criteria.txt
+PFW_EDD_FILES := \
+        $(LOCAL_PATH)/Settings/device_for_strategy_media.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_phone.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_sonification.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_sonification_respectful.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_dtmf.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_enforced_audible.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_transmitted_through_speaker.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_accessibility.pfw \
+        $(LOCAL_PATH)/Settings/device_for_strategy_rerouting.pfw \
+        $(LOCAL_PATH)/Settings/strategy_for_stream.pfw \
+        $(LOCAL_PATH)/Settings/strategy_for_usage.pfw \
+        $(LOCAL_PATH)/SettingsNoInput/device_for_input_source.pfw \
+        $(LOCAL_PATH)/Settings/volumes.pfw
+
+include $(BUILD_PFW_SETTINGS)
+endif # NO_INPUT
+
+endif # USE_CONFIGURABLE_AUDIO_POLICY
diff --git a/common/audio/stub/parameter-framework/ParameterFrameworkConfigurationPolicy.xml.in b/common/audio/stub/parameter-framework/ParameterFrameworkConfigurationPolicy.xml.in
new file mode 100644
index 000000000..f5615cd52
--- /dev/null
+++ b/common/audio/stub/parameter-framework/ParameterFrameworkConfigurationPolicy.xml.in
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ParameterFrameworkConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    SystemClassName="Policy" ServerPort="5019" TuningAllowed="@TUNING_ALLOWED@">
+
+    <SubsystemPlugins>
+        <Location Folder="">
+            <Plugin Name="libpolicy-subsystem.so"/>
+        </Location>
+    </SubsystemPlugins>
+    <StructureDescriptionFileLocation Path="Structure/Policy/PolicyClass.xml"/>
+    <SettingsConfiguration>
+        <ConfigurableDomainsFileLocation Path="Settings/Policy/PolicyConfigurableDomains.xml"/>
+    </SettingsConfiguration>
+</ParameterFrameworkConfiguration>
diff --git a/common/audio/stub/parameter-framework/README.md b/common/audio/stub/parameter-framework/README.md
new file mode 100644
index 000000000..92668e1ec
--- /dev/null
+++ b/common/audio/stub/parameter-framework/README.md
@@ -0,0 +1,11 @@
+Configurable Policy Engine Example
+================================
+
+This folder exposes a generic functional configurable policy engine configuration files
+to provide to have a product following the nexus experience.
+
+A vendor wishing to customize the behavior shall provides its own set of configuration files
+within the device folder for the product to customize.
+
+For any question about the parameter framework and configuration files,
+See [the wiki on github](https://github.com/01org/parameter-framework/wiki).
diff --git a/common/audio/stub/parameter-framework/Settings/PolicyConfigurableDomains.xml b/common/audio/stub/parameter-framework/Settings/PolicyConfigurableDomains.xml
new file mode 100644
index 000000000..aa2af0ff2
--- /dev/null
+++ b/common/audio/stub/parameter-framework/Settings/PolicyConfigurableDomains.xml
@@ -0,0 +1,10228 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- #### DO NOT EDIT THIS FILE #### -->
+<ConfigurableDomains SystemClassName="Policy">
+  <ConfigurableDomain Name="DeviceForStrategy.Media.UnreachableDevices" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/fm"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker_safe"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/earpiece"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_sco"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_sco_carkit"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/telephony_tx"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/stub"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/fm">
+          <BitParameter Name="fm">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker_safe">
+          <BitParameter Name="speaker_safe">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Media.Device2" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="RemoteSubmix">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="RemoteSubmix"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dp">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceBtSco"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphone">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceBtSco"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceBtSco"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="ForceSpeaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForHdmiSystemAudio" MatchesWhen="IsNot" Value="ForceHdmiSystemEnforced"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Line">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbAccessory"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="DgtlDockHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="AuxDigital">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Hdmi"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AnlgDockHeadset"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForDock" MatchesWhen="Is" Value="ForceAnalogDock"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Speaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForHdmiSystemAudio" MatchesWhen="IsNot" Value="ForceHdmiSystemEnforced"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceBtSco"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Default">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="RemoteSubmix">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dp">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphone">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="ForceSpeaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Line">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="AuxDigital">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Speaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Default">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Media.Arc" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Selected">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="HdmiArc"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi_arc"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Selected">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi_arc">
+          <BitParameter Name="hdmi_arc">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi_arc">
+          <BitParameter Name="hdmi_arc">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Media.Spdif" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Selected">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Spdif"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/spdif"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Selected">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/spdif">
+          <BitParameter Name="spdif">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Media.AuxLine" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Selected">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AuxLine"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/aux_line"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Selected">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/aux_line">
+          <BitParameter Name="aux_line">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/aux_line">
+          <BitParameter Name="aux_line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Phone.UnreachableDevices" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi_arc"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/aux_line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/fm"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker_safe"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/stub"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi_arc">
+          <BitParameter Name="hdmi_arc">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/aux_line">
+          <BitParameter Name="aux_line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/fm">
+          <BitParameter Name="fm">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker_safe">
+          <BitParameter Name="speaker_safe">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Phone.Device" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="ScoCarkit">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoCarkit"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothScoHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoHeadset"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothSco">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothSco"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dp">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceNone"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphones">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceNone"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Line">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+            <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceNone"/>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="UsbAccessory"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+            </CompoundRule>
+          </CompoundRule>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbAccessory"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="DgtlDockHeadset"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Hdmi">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Hdmi"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AnlgDockHeadset"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Earpiece">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Earpiece"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Speaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Default">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="ScoCarkit">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothScoHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothSco">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dp">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphones">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Line">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Hdmi">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Earpiece">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Speaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Default">
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Sonification.UnreachableDevices" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/hdmi_arc"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/fm"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/speaker_safe"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/aux_line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/stub"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/hdmi_arc">
+          <BitParameter Name="hdmi_arc">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/fm">
+          <BitParameter Name="fm">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/speaker_safe">
+          <BitParameter Name="speaker_safe">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/aux_line">
+          <BitParameter Name="aux_line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Sonification.Speaker" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Selected">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="Line"/>
+            </CompoundRule>
+          </CompoundRule>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/speaker"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Selected">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Sonification.Device2" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="BluetoothA2dp">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphones">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="ScoCarkit">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoCarkit"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="ScoHeadset">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Sco">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothSco"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+          </CompoundRule>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Line">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="WiredHeadset"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+          </CompoundRule>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+          </CompoundRule>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="UsbAccessory"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+          </CompoundRule>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbAccessory"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="DgtlDockHeadset"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AnlgDockHeadset"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForDock" MatchesWhen="Is" Value="ForceAnalogDock"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Earpiece">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Earpiece"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="None">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="BluetoothA2dp">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphones">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="ScoCarkit">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="ScoHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Sco">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Line">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Earpiece">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="None">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.SonificationRespectful.UnreachableDevices" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi_arc"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/aux_line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/fm"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/telephony_tx"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/stub"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi_arc">
+          <BitParameter Name="hdmi_arc">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/aux_line">
+          <BitParameter Name="aux_line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/fm">
+          <BitParameter Name="fm">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.SonificationRespectful.Speakers" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="SpeakerSafe">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="SpeakerSafe"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Speaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="Line"/>
+            </CompoundRule>
+          </CompoundRule>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="None">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/speaker_safe"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/speaker"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="SpeakerSafe">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/speaker_safe">
+          <BitParameter Name="speaker_safe">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Speaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/speaker_safe">
+          <BitParameter Name="speaker_safe">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="None">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/speaker_safe">
+          <BitParameter Name="speaker_safe">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.SonificationRespectful.Device2" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="BluetoothA2dp">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphones">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothScoCarkit">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoCarkit"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothScoHeadset">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothSco">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothSco"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Line">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="WiredHeadset"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="UsbAccessory"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbAccessory"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="DgtlDockHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="AuxDigital">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Hdmi"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForDock" MatchesWhen="Is" Value="ForceAnalogDock"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AnlgDockHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Earpiece">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Earpiece"/>
+        </CompoundRule>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="BluetoothA2dp">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphones">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothScoCarkit">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothScoHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothSco">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Line">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="AuxDigital">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Earpiece">
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Dtmf.UnreachableDevices" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/fm"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker_safe"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_carkit"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/stub"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/fm">
+          <BitParameter Name="fm">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker_safe">
+          <BitParameter Name="speaker_safe">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Dtmf.Device2" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="RemoteSubmix">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="RemoteSubmix"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dp">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphones">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="ForceSpeakerWhenNotInCall">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForHdmiSystemAudio" MatchesWhen="IsNot" Value="ForceHdmiSystemEnforced"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothScoHeadset">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoHeadset"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothSco">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothSco"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Line">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="WiredHeadset"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="UsbAccessory"/>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbAccessory"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="DgtlDockHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Hdmi">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Hdmi"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForDock" MatchesWhen="Is" Value="ForceAnalogDock"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AnlgDockHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Earpiece">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Earpiece"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Speaker">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForHdmiSystemAudio" MatchesWhen="IsNot" Value="ForceHdmiSystemEnforced"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Default">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="RemoteSubmix">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dp">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphones">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="ForceSpeakerWhenNotInCall">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothScoHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothSco">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Line">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Hdmi">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Earpiece">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Speaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Default">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Dtmf.Arc" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Selected">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="HdmiArc"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi_arc"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Selected">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi_arc">
+          <BitParameter Name="hdmi_arc">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi_arc">
+          <BitParameter Name="hdmi_arc">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Dtmf.Spdif" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Selected">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Spdif"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/spdif"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Selected">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/spdif">
+          <BitParameter Name="spdif">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Dtmf.AuxLine" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Selected">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AuxLine"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/aux_line"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Selected">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/aux_line">
+          <BitParameter Name="aux_line">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/aux_line">
+          <BitParameter Name="aux_line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.EnforcedAudible.UnreachableDevices" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi_arc"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/aux_line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker_safe"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/fm"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/stub"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi_arc">
+          <BitParameter Name="hdmi_arc">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/aux_line">
+          <BitParameter Name="aux_line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker_safe">
+          <BitParameter Name="speaker_safe">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/fm">
+          <BitParameter Name="fm">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.EnforcedAudible.Speaker" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Selected">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="ForceUseForSystem" MatchesWhen="Is" Value="ForceSystemEnforced"/>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceSpeaker"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="RemoteSubmix"/>
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+                <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="BluetoothA2dp"/>
+                <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="BluetoothA2dpHeadphones"/>
+                <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="BluetoothA2dpSpeaker"/>
+              </CompoundRule>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="RemoteSubmix"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="WiredHeadphone"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="Line"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="WiredHeadset"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="UsbAccessory"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="UsbDevice"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="DgtlDockHeadset"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="Hdmi"/>
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="AnlgDockHeadset"/>
+                <SelectionCriterionRule SelectionCriterion="ForceUseForDock" MatchesWhen="IsNot" Value="ForceAnalogDock"/>
+              </CompoundRule>
+            </CompoundRule>
+          </CompoundRule>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Selected">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.EnforcedAudible.Device2" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="RemoteSubmix">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="RemoteSubmix"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dp">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphones">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Line">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbAccessory"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="DgtlDockHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Hdmi">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Hdmi"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForDock" MatchesWhen="Is" Value="ForceAnalogDock"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AnlgDockHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="NoDevice">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="RemoteSubmix">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dp">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphones">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Line">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Hdmi">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="NoDevice">
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.TransmittedThroughSpeaker.UnreacheableDevices" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/hdmi_arc"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/aux_line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/fm"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/speaker_safe"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/earpiece"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/wired_headphone"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_sco"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_sco_carkit"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/angl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/telephony_tx"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/stub"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/hdmi_arc">
+          <BitParameter Name="hdmi_arc">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/aux_line">
+          <BitParameter Name="aux_line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/fm">
+          <BitParameter Name="fm">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/speaker_safe">
+          <BitParameter Name="speaker_safe">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.TransmittedThroughSpeaker.Speaker" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Selected">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/speaker"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Selected">
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="NotSelected">
+        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Accessibility.UnreachableDevices" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi_arc"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/aux_line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/fm"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker_safe"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/telephony_tx"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/stub"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi_arc">
+          <BitParameter Name="hdmi_arc">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/aux_line">
+          <BitParameter Name="aux_line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/fm">
+          <BitParameter Name="fm">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker_safe">
+          <BitParameter Name="speaker_safe">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Accessibility.Device" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="RemoteSubmix">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="RemoteSubmix"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dp">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphone">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="ForceSpeakerWhenNotInCall">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothScoCarkit">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoCarkit"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothScoHeadset">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoHeadset"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothSco">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothSco"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Line">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="WiredHeadset"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <CompoundRule Type="All">
+              <CompoundRule Type="Any">
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+              </CompoundRule>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+            </CompoundRule>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="UsbAccessory"/>
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
+            </CompoundRule>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbAccessory"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="DgtlDockHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="AuxDigital">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Hdmi"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AnlgDockHeadset"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForDock" MatchesWhen="Is" Value="ForceAnalogDock"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Earpiece">
+        <CompoundRule Type="All">
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+          </CompoundRule>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Earpiece"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Speaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Default">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="RemoteSubmix">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dp">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphone">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="ForceSpeakerWhenNotInCall">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothScoCarkit">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothScoHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothSco">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Line">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="AuxDigital">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Earpiece">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Speaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Default">
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Rerouting.UnreachableDevices" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi_arc"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/aux_line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/fm"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker_safe"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/earpiece"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_sco"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_sco_carkit"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/telephony_tx"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/stub"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi_arc">
+          <BitParameter Name="hdmi_arc">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/aux_line">
+          <BitParameter Name="aux_line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/fm">
+          <BitParameter Name="fm">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker_safe">
+          <BitParameter Name="speaker_safe">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/earpiece">
+          <BitParameter Name="earpiece">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_sco">
+          <BitParameter Name="bluetooth_sco">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_sco_carkit">
+          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/telephony_tx">
+          <BitParameter Name="telephony_tx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForStrategy.Rerouting.Device2" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="RemoteSubmix">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="RemoteSubmix"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dp">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphone">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="ForceSpeaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Line">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbAccessory"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="DgtlDockHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="AuxDigital">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Hdmi"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AnlgDockHeadset"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForDock" MatchesWhen="Is" Value="ForceAnalogDock"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Speaker">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Default">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="RemoteSubmix">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dp">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpHeadphone">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BluetoothA2dpSpeaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="ForceSpeaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadphone">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Line">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbAccessory">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="DgtlDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="AuxDigital">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="AnlgDockHeadset">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Speaker">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Default">
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
+          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
+          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
+          <BitParameter Name="speaker">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
+          <BitParameter Name="wired_headphone">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
+          <BitParameter Name="angl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="StrategyForStream" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/streams/voice_call/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/streams/system/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/streams/ring/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/streams/music/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/streams/alarm/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/streams/notification/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/streams/bluetooth_sco/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/streams/enforced_audible/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/streams/dtmf/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/streams/tts/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/streams/accessibility/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/streams/rerouting/applicable_strategy/strategy"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/streams/voice_call/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">phone</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/system/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">media</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/ring/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">sonification</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/music/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">media</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/alarm/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">sonification</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/notification/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">sonification_respectful</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/bluetooth_sco/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">phone</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/enforced_audible/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">enforced_audible</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/dtmf/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">dtmf</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/tts/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">transmitted_through_speaker</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/accessibility/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">accessibility</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/rerouting/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">rerouting</EnumParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="SelectedStrategyForUsages.Calibration" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/usages/unknown/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/media/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/voice_communication/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/voice_communication_signalling/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/alarm/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/notification/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/notification_telephony_ringtone/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/notification_communication_request/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/notification_communication_instant/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/notification_communication_delayed/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/notification_event/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/assistance_navigation_guidance/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/assistance_sonification/applicable_strategy/strategy"/>
+      <ConfigurableElement Path="/Policy/policy/usages/game/applicable_strategy/strategy"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/usages/unknown/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">media</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/media/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">media</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/voice_communication/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">phone</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/voice_communication_signalling/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">dtmf</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/alarm/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">sonification</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/notification/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">sonification_respectful</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/notification_telephony_ringtone/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">sonification</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/notification_communication_request/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">sonification_respectful</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/notification_communication_instant/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">sonification_respectful</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/notification_communication_delayed/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">sonification_respectful</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/notification_event/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">sonification_respectful</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/assistance_navigation_guidance/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">media</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/assistance_sonification/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">media</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/usages/game/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">media</EnumParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="SelectedStrategyForUsages.AssistanceAccessibility" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Sonification">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="RingTone"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Phone">
+        <CompoundRule Type="Any">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Accessibility">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/usages/assistance_accessibility/applicable_strategy/strategy"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Sonification">
+        <ConfigurableElement Path="/Policy/policy/usages/assistance_accessibility/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">sonification</EnumParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Phone">
+        <ConfigurableElement Path="/Policy/policy/usages/assistance_accessibility/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">phone</EnumParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Accessibility">
+        <ConfigurableElement Path="/Policy/policy/usages/assistance_accessibility/applicable_strategy/strategy">
+          <EnumParameter Name="strategy">accessibility</EnumParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForInputSource.Calibration" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/communication"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/ambient"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/telephony_rx"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/back_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/anlg_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/fm_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/tv_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/loopback"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/stub"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/communication"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/ambient"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/telephony_rx"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/back_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/anlg_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/fm_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/tv_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/loopback"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/stub"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/communication"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/ambient"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/builtin_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/back_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/anlg_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/fm_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/tv_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/loopback"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/stub"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/communication"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/ambient"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/builtin_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/back_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/anlg_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/fm_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/tv_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/loopback"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/stub"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/communication"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/ambient"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/builtin_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/back_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/anlg_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/fm_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/tv_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/loopback"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/stub"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/communication"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/ambient"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/telephony_rx"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/anlg_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/fm_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/tv_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/loopback"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/stub"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/communication"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/ambient"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/telephony_rx"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/back_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/anlg_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/fm_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/tv_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/loopback"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/stub"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/communication"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/ambient"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/telephony_rx"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/anlg_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/fm_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/tv_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/loopback"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/stub"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/communication"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/ambient"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/builtin_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/telephony_rx"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/back_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/anlg_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/fm_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/tv_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/loopback"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/stub"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/communication"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/ambient"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/telephony_rx"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/back_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/anlg_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/fm_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/tv_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/loopback"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/stub"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/communication"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/ambient"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/telephony_rx"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/back_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/anlg_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/fm_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/tv_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/loopback"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/bus"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/stub"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/communication"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/ambient"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/hdmi"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/telephony_rx"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/builtin_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/back_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/remote_submix"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/anlg_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/dgtl_dock_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/usb_accessory"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/tv_tuner"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/line"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/spdif"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/loopback"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/ip"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/bus"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/communication">
+          <BitParameter Name="communication">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/ambient">
+          <BitParameter Name="ambient">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/anlg_dock_headset">
+          <BitParameter Name="anlg_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/tv_tuner">
+          <BitParameter Name="tv_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/loopback">
+          <BitParameter Name="loopback">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/communication">
+          <BitParameter Name="communication">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/ambient">
+          <BitParameter Name="ambient">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/anlg_dock_headset">
+          <BitParameter Name="anlg_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/tv_tuner">
+          <BitParameter Name="tv_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/loopback">
+          <BitParameter Name="loopback">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/communication">
+          <BitParameter Name="communication">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/ambient">
+          <BitParameter Name="ambient">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/anlg_dock_headset">
+          <BitParameter Name="anlg_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/tv_tuner">
+          <BitParameter Name="tv_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/loopback">
+          <BitParameter Name="loopback">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/communication">
+          <BitParameter Name="communication">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/ambient">
+          <BitParameter Name="ambient">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/anlg_dock_headset">
+          <BitParameter Name="anlg_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/tv_tuner">
+          <BitParameter Name="tv_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/loopback">
+          <BitParameter Name="loopback">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/communication">
+          <BitParameter Name="communication">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/ambient">
+          <BitParameter Name="ambient">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/anlg_dock_headset">
+          <BitParameter Name="anlg_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/tv_tuner">
+          <BitParameter Name="tv_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/loopback">
+          <BitParameter Name="loopback">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/communication">
+          <BitParameter Name="communication">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/ambient">
+          <BitParameter Name="ambient">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/anlg_dock_headset">
+          <BitParameter Name="anlg_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/tv_tuner">
+          <BitParameter Name="tv_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/loopback">
+          <BitParameter Name="loopback">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/communication">
+          <BitParameter Name="communication">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/ambient">
+          <BitParameter Name="ambient">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/anlg_dock_headset">
+          <BitParameter Name="anlg_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/tv_tuner">
+          <BitParameter Name="tv_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/loopback">
+          <BitParameter Name="loopback">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/communication">
+          <BitParameter Name="communication">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/ambient">
+          <BitParameter Name="ambient">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/anlg_dock_headset">
+          <BitParameter Name="anlg_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/tv_tuner">
+          <BitParameter Name="tv_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/loopback">
+          <BitParameter Name="loopback">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/communication">
+          <BitParameter Name="communication">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/ambient">
+          <BitParameter Name="ambient">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/anlg_dock_headset">
+          <BitParameter Name="anlg_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/tv_tuner">
+          <BitParameter Name="tv_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/loopback">
+          <BitParameter Name="loopback">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/communication">
+          <BitParameter Name="communication">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/ambient">
+          <BitParameter Name="ambient">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/anlg_dock_headset">
+          <BitParameter Name="anlg_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/tv_tuner">
+          <BitParameter Name="tv_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/loopback">
+          <BitParameter Name="loopback">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/communication">
+          <BitParameter Name="communication">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/ambient">
+          <BitParameter Name="ambient">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/anlg_dock_headset">
+          <BitParameter Name="anlg_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/tv_tuner">
+          <BitParameter Name="tv_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/loopback">
+          <BitParameter Name="loopback">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/stub">
+          <BitParameter Name="stub">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/communication">
+          <BitParameter Name="communication">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/ambient">
+          <BitParameter Name="ambient">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/hdmi">
+          <BitParameter Name="hdmi">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/anlg_dock_headset">
+          <BitParameter Name="anlg_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/dgtl_dock_headset">
+          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/usb_accessory">
+          <BitParameter Name="usb_accessory">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/tv_tuner">
+          <BitParameter Name="tv_tuner">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/line">
+          <BitParameter Name="line">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/spdif">
+          <BitParameter Name="spdif">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/loopback">
+          <BitParameter Name="loopback">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/ip">
+          <BitParameter Name="ip">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/bus">
+          <BitParameter Name="bus">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForInputSource.DefaultAndMic" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="A2dp">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Sco">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BluetoothScoHeadset"/>
+          <SelectionCriterionRule SelectionCriterion="ForceUseForRecord" MatchesWhen="Is" Value="ForceBtSco"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BuiltinMic">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BuiltinMic"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Default">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/builtin_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_a2dp"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/builtin_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_sco_headset"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="A2dp">
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Sco">
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BuiltinMic">
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Default">
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_a2dp">
+          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForInputSource.VoiceUplinkAndVoiceDownlinkAndVoiceCall" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="VoiceCall">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="TelephonyRx"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Default">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/telephony_rx"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/telephony_rx"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/telephony_rx"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="VoiceCall">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Default">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/telephony_rx">
+          <BitParameter Name="telephony_rx">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForInputSource.Camcorder" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="BackMic">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BackMic"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BuiltinMic">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BuiltinMic"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Default">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/back_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/builtin_mic"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="BackMic">
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BuiltinMic">
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Default">
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForInputSource.VoiceRecognitionAndHotword" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="ScoHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForRecord" MatchesWhen="Is" Value="ForceBtSco"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BluetoothScoHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BuiltinMic">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BuiltinMic"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Default">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/builtin_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/builtin_mic"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="ScoHeadset">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BuiltinMic">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Default">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForInputSource.VoiceCommunication" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="ScoHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BluetoothScoHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceNone"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceNone"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BuiltinMic">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BuiltinMic"/>
+          <CompoundRule Type="Any">
+            <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceNone"/>
+            <CompoundRule Type="All">
+              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
+              <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Excludes" Value="BackMic"/>
+            </CompoundRule>
+          </CompoundRule>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="BackMic">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BackMic"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Default">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_sco_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/wired_headset"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_device"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/builtin_mic"/>
+      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/back_mic"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="ScoHeadset">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="WiredHeadset">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="UsbDevice">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BuiltinMic">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="BackMic">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Default">
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_sco_headset">
+          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/wired_headset">
+          <BitParameter Name="wired_headset">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_device">
+          <BitParameter Name="usb_device">0</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/builtin_mic">
+          <BitParameter Name="builtin_mic">1</BitParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/back_mic">
+          <BitParameter Name="back_mic">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForInputSource.RemoteSubmix" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="RemoteSubmix">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="RemoteSubmix"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Default">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/remote_submix"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="RemoteSubmix">
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Default">
+        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/remote_submix">
+          <BitParameter Name="remote_submix">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="DeviceForInputSource.FmTuner" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="FmTuner">
+        <CompoundRule Type="All">
+          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="FmTuner"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="Default">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/fm_tuner"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="FmTuner">
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">1</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="Default">
+        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/fm_tuner">
+          <BitParameter Name="fm_tuner">0</BitParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="VolumeProfilesForStream.Calibration" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="Calibration">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/streams/voice_call/applicable_volume_profile/volume_profile"/>
+      <ConfigurableElement Path="/Policy/policy/streams/system/applicable_volume_profile/volume_profile"/>
+      <ConfigurableElement Path="/Policy/policy/streams/ring/applicable_volume_profile/volume_profile"/>
+      <ConfigurableElement Path="/Policy/policy/streams/music/applicable_volume_profile/volume_profile"/>
+      <ConfigurableElement Path="/Policy/policy/streams/alarm/applicable_volume_profile/volume_profile"/>
+      <ConfigurableElement Path="/Policy/policy/streams/notification/applicable_volume_profile/volume_profile"/>
+      <ConfigurableElement Path="/Policy/policy/streams/bluetooth_sco/applicable_volume_profile/volume_profile"/>
+      <ConfigurableElement Path="/Policy/policy/streams/enforced_audible/applicable_volume_profile/volume_profile"/>
+      <ConfigurableElement Path="/Policy/policy/streams/tts/applicable_volume_profile/volume_profile"/>
+      <ConfigurableElement Path="/Policy/policy/streams/accessibility/applicable_volume_profile/volume_profile"/>
+      <ConfigurableElement Path="/Policy/policy/streams/rerouting/applicable_volume_profile/volume_profile"/>
+      <ConfigurableElement Path="/Policy/policy/streams/patch/applicable_volume_profile/volume_profile"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="Calibration">
+        <ConfigurableElement Path="/Policy/policy/streams/voice_call/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">voice_call</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/system/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">system</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/ring/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">ring</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/music/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">music</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/alarm/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">alarm</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/notification/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">notification</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/bluetooth_sco/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">bluetooth_sco</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/enforced_audible/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">enforced_audible</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/tts/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">tts</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/accessibility/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">accessibility</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/rerouting/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">rerouting</EnumParameter>
+        </ConfigurableElement>
+        <ConfigurableElement Path="/Policy/policy/streams/patch/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">patch</EnumParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+  <ConfigurableDomain Name="VolumeProfilesForStream.Dtmf" SequenceAware="false">
+    <Configurations>
+      <Configuration Name="InCall">
+        <CompoundRule Type="Any">
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
+          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
+        </CompoundRule>
+      </Configuration>
+      <Configuration Name="OutOfCall">
+        <CompoundRule Type="All"/>
+      </Configuration>
+    </Configurations>
+    <ConfigurableElements>
+      <ConfigurableElement Path="/Policy/policy/streams/dtmf/applicable_volume_profile/volume_profile"/>
+    </ConfigurableElements>
+    <Settings>
+      <Configuration Name="InCall">
+        <ConfigurableElement Path="/Policy/policy/streams/dtmf/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">voice_call</EnumParameter>
+        </ConfigurableElement>
+      </Configuration>
+      <Configuration Name="OutOfCall">
+        <ConfigurableElement Path="/Policy/policy/streams/dtmf/applicable_volume_profile/volume_profile">
+          <EnumParameter Name="volume_profile">dtmf</EnumParameter>
+        </ConfigurableElement>
+      </Configuration>
+    </Settings>
+  </ConfigurableDomain>
+</ConfigurableDomains>
diff --git a/common/audio/stub/parameter-framework/Settings/device_for_input_source.pfw b/common/audio/stub/parameter-framework/Settings/device_for_input_source.pfw
new file mode 100644
index 000000000..66d657ac7
--- /dev/null
+++ b/common/audio/stub/parameter-framework/Settings/device_for_input_source.pfw
@@ -0,0 +1,578 @@
+supDomain: DeviceForInputSource
+	domain: Calibration
+		conf: Calibration
+			component: /Policy/policy/input_sources/default/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 0
+			component: /Policy/policy/input_sources/mic/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 0
+			component: /Policy/policy/input_sources/voice_downlink/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 0
+			component: /Policy/policy/input_sources/voice_call/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 0
+			component: /Policy/policy/input_sources/voice_uplink/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 0
+			component: /Policy/policy/input_sources/camcorder/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 0
+			component: /Policy/policy/input_sources/voice_recognition/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 0
+			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				hdmi = 0
+				telephony_rx = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 0
+			component: /Policy/policy/input_sources/remote_submix/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 0
+			component: /Policy/policy/input_sources/hotword/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 0
+			component: /Policy/policy/input_sources/unprocessed/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 0
+			component: /Policy/policy/input_sources/fm_tuner/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				bluetooth_sco_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				builtin_mic = 0
+				wired_headset = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 0
+
+	domain: DefaultAndMic
+		conf: A2dp
+			AvailableInputDevices Includes BluetoothA2dp
+
+			component: /Policy/policy/input_sources
+				component: default/applicable_input_device/mask/
+					bluetooth_a2dp = 1
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 0
+					bluetooth_sco_headset = 0
+				component: mic/applicable_input_device/mask/
+					bluetooth_a2dp = 1
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 0
+					bluetooth_sco_headset = 0
+
+		conf: Sco
+			AvailableInputDevices Includes BluetoothScoHeadset
+			ForceUseForRecord Is ForceBtSco
+
+			component: /Policy/policy/input_sources
+				component: default/applicable_input_device/mask/
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 0
+					bluetooth_sco_headset = 1
+				component: mic/applicable_input_device/mask/
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 0
+					bluetooth_sco_headset = 1
+
+		conf: WiredHeadset
+			AvailableInputDevices Includes WiredHeadset
+
+			component: /Policy/policy/input_sources
+				component: default/applicable_input_device/mask/
+					bluetooth_a2dp = 0
+					wired_headset = 1
+					usb_device = 0
+					builtin_mic = 0
+					bluetooth_sco_headset = 0
+				component: mic/applicable_input_device/mask/
+					bluetooth_a2dp = 0
+					wired_headset = 1
+					usb_device = 0
+					builtin_mic = 0
+					bluetooth_sco_headset = 0
+
+		conf: UsbDevice
+			AvailableInputDevices Includes UsbDevice
+
+			component: /Policy/policy/input_sources
+				component: default/applicable_input_device/mask/
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					usb_device = 1
+					builtin_mic = 0
+					bluetooth_sco_headset = 0
+				component: mic/applicable_input_device/mask/
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					usb_device = 1
+					builtin_mic = 0
+					bluetooth_sco_headset = 0
+
+		conf: BuiltinMic
+			AvailableInputDevices Includes BuiltinMic
+
+			component: /Policy/policy/input_sources
+				component: default/applicable_input_device/mask/
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 1
+					bluetooth_sco_headset = 0
+				component: mic/applicable_input_device/mask/
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 1
+					bluetooth_sco_headset = 0
+
+		conf: Default
+			component: /Policy/policy/input_sources
+				component: default/applicable_input_device/mask/
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 0
+					bluetooth_sco_headset = 0
+				component: mic/applicable_input_device/mask/
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 0
+					bluetooth_sco_headset = 0
+
+	domain: VoiceUplinkAndVoiceDownlinkAndVoiceCall
+		conf: VoiceCall
+			AvailableInputDevices Includes TelephonyRx
+
+			component: /Policy/policy/input_sources
+				voice_downlink/applicable_input_device/mask/telephony_rx = 1
+				voice_call/applicable_input_device/mask/telephony_rx = 1
+				voice_uplink/applicable_input_device/mask/telephony_rx = 1
+
+		conf: Default
+			component: /Policy/policy/input_sources
+				voice_downlink/applicable_input_device/mask/telephony_rx = 0
+				voice_call/applicable_input_device/mask/telephony_rx = 0
+				voice_uplink/applicable_input_device/mask/telephony_rx = 0
+
+	domain: Camcorder
+		conf: BackMic
+			AvailableInputDevices Includes BackMic
+
+			component: /Policy/policy/input_sources/camcorder/applicable_input_device/mask
+				back_mic = 1
+				builtin_mic = 0
+
+		conf: BuiltinMic
+			AvailableInputDevices Includes BuiltinMic
+
+			component: /Policy/policy/input_sources/camcorder/applicable_input_device/mask
+				back_mic = 0
+				builtin_mic = 1
+
+		conf: Default
+			component: /Policy/policy/input_sources/camcorder/applicable_input_device/mask
+				back_mic = 0
+				builtin_mic = 0
+
+	domain: VoiceRecognitionAndUnprocessedAndHotword
+		conf: ScoHeadset
+			ForceUseForRecord Is ForceBtSco
+			AvailableInputDevices Includes BluetoothScoHeadset
+
+			component: /Policy/policy/input_sources
+				component: voice_recognition/applicable_input_device/mask
+					bluetooth_sco_headset = 1
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 0
+				component: unprocessed/applicable_input_device/mask
+					bluetooth_sco_headset = 1
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 0
+				component: hotword/applicable_input_device/mask
+					bluetooth_sco_headset = 1
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 0
+
+		conf: WiredHeadset
+			AvailableInputDevices Includes WiredHeadset
+
+			component: /Policy/policy/input_sources
+				component: voice_recognition/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 1
+					usb_device = 0
+					builtin_mic = 0
+				component: unprocessed/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 1
+					usb_device = 0
+					builtin_mic = 0
+				component: hotword/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 1
+					usb_device = 0
+					builtin_mic = 0
+
+		conf: UsbDevice
+			AvailableInputDevices Includes UsbDevice
+
+			component: /Policy/policy/input_sources
+				component: voice_recognition/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 0
+					usb_device = 1
+					builtin_mic = 0
+				component: unprocessed/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 0
+					usb_device = 1
+					builtin_mic = 0
+				component: hotword/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 0
+					usb_device = 1
+					builtin_mic = 0
+
+		conf: BuiltinMic
+			AvailableInputDevices Includes BuiltinMic
+
+			component: /Policy/policy/input_sources
+				component: voice_recognition/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 1
+				component: unprocessed/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 1
+				component: hotword/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 1
+
+		conf: Default
+			component: /Policy/policy/input_sources
+				component: voice_recognition/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 0
+				component: unprocessed/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 0
+				component: hotword/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 0
+					usb_device = 0
+					builtin_mic = 0
+
+	domain: VoiceCommunication
+		conf: ScoHeadset
+			#
+			# SCO device may be requested but no SCO device is available
+			#
+			ForceUseForCommunication Is ForceBtSco
+			AvailableInputDevices Includes BluetoothScoHeadset
+
+			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
+				bluetooth_sco_headset = 1
+				wired_headset = 0
+				usb_device = 0
+				builtin_mic = 0
+				back_mic = 0
+
+		conf: WiredHeadset
+			ForceUseForCommunication Is ForceNone
+			AvailableInputDevices Includes WiredHeadset
+
+			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
+				bluetooth_sco_headset = 0
+				wired_headset = 1
+				usb_device = 0
+				builtin_mic = 0
+				back_mic = 0
+
+		conf: UsbDevice
+			ForceUseForCommunication Is ForceNone
+			AvailableInputDevices Includes UsbDevice
+
+			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				usb_device = 1
+				builtin_mic = 0
+				back_mic = 0
+
+		conf: BuiltinMic
+			AvailableInputDevices Includes BuiltinMic
+			ANY
+				ForceUseForCommunication Is ForceNone
+				ALL
+					ForceUseForCommunication Is ForceSpeaker
+					AvailableInputDevices Excludes BackMic
+
+			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				usb_device = 0
+				builtin_mic = 1
+				back_mic = 0
+
+		conf: BackMic
+			ForceUseForCommunication Is ForceSpeaker
+			AvailableInputDevices Includes BackMic
+
+			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				usb_device = 0
+				builtin_mic = 0
+				back_mic = 1
+
+		conf: Default
+			#
+			# Fallback on the default input device which can be builtin mic for example
+			#
+			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				usb_device = 0
+				builtin_mic = 1
+				back_mic = 0
+
+	domain: RemoteSubmix
+		conf: RemoteSubmix
+			AvailableInputDevices Includes RemoteSubmix
+
+			component: /Policy/policy/input_sources/remote_submix/applicable_input_device/mask
+				remote_submix = 1
+
+		conf: Default
+			component: /Policy/policy/input_sources/remote_submix/applicable_input_device/mask
+				remote_submix = 0
+
+	domain: FmTuner
+		conf: FmTuner
+			AvailableInputDevices Includes FmTuner
+
+			component: /Policy/policy/input_sources/fm_tuner/applicable_input_device/mask
+				fm_tuner = 1
+
+		conf: Default
+			component: /Policy/policy/input_sources/fm_tuner/applicable_input_device/mask
+				fm_tuner = 0
diff --git a/common/audio/stub/parameter-framework/Settings/device_for_strategy_accessibility.pfw b/common/audio/stub/parameter-framework/Settings/device_for_strategy_accessibility.pfw
new file mode 100644
index 000000000..163baea78
--- /dev/null
+++ b/common/audio/stub/parameter-framework/Settings/device_for_strategy_accessibility.pfw
@@ -0,0 +1,610 @@
+supDomain: DeviceForStrategy
+
+	supDomain: Accessibility
+		#
+		# STRATEGY_ACCESSIBILITY follows STRATEGY_PHONE if in call widely speaking
+		# STRATEGY_ACCESSIBILITY follows STRATEGY_MEDIA otherwise
+		#
+		# Other case are handled programmatically has involving activity of streams.
+		#
+		domain: UnreachableDevices
+			conf: Calibration
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					hdmi_arc = 0
+					spdif = 0
+					aux_line = 0
+					fm = 0
+					speaker_safe = 0
+					telephony_tx = 0
+					ip = 0
+					bus = 0
+
+		domain: Device
+			conf: RemoteSubmix
+				#
+				# Accessibility follows Media strategy if not in call
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes RemoteSubmix
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 1
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: BluetoothA2dp
+				#
+				# Accessibility falls through media strategy if not in call (widely speaking)
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				AvailableOutputDevices Includes BluetoothA2dp
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 1
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: BluetoothA2dpHeadphone
+				#
+				# Accessibility falls through media strategy if not in call (widely speaking)
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				AvailableOutputDevices Includes BluetoothA2dpHeadphones
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 1
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: BluetoothA2dpSpeaker
+				#
+				# Accessibility falls through media strategy if not in call (widely speaking)
+				#
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes BluetoothA2dpSpeaker
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 1
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: ForceSpeakerWhenNotInCall
+				#
+				# Accessibility follows Media strategy if not in call
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia Is ForceSpeaker
+				AvailableOutputDevices Includes Speaker
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 1
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: BluetoothScoCarkit
+				#
+				# accessibility falls through Phone strategy if in call
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				AvailableOutputDevices Includes BluetoothScoCarkit
+				ForceUseForCommunication Is ForceBtSco
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 1
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: BluetoothScoHeadset
+				#
+				# accessibility falls through Phone strategy if in call
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				AvailableOutputDevices Includes BluetoothScoHeadset
+				ForceUseForCommunication Is ForceBtSco
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 1
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: BluetoothSco
+				#
+				# accessibility falls through Phone strategy if in call
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				AvailableOutputDevices Includes BluetoothSco
+				ForceUseForCommunication Is ForceBtSco
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 1
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: WiredHeadphone
+				ANY
+					#
+					# accessibility falls through Phone strategy if in call
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+					#
+					# accessibility follows Media strategy if not in call
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes WiredHeadphone
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 1
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: Line
+				ANY
+					#
+					# accessibility falls through Phone strategy if in call
+					# but Line has a lower priority than WiredHeadset in this case.
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+						AvailableOutputDevices Excludes WiredHeadset
+					#
+					# accessibility follows Media strategy if not in call
+					#
+				AvailableOutputDevices Includes Line
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 1
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: WiredHeadset
+				ANY
+					#
+					# accessibility falls through Phone strategy if in call
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+					#
+					# accessibility follows Media strategy if not in call
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes WiredHeadset
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 1
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: UsbDevice
+				ANY
+					#
+					# accessibility falls through Phone strategy if in call (widely speaking)
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+					#
+					# accessibility follows Media strategy if not in call
+					# Media strategy inverts the priority of USB device vs accessory
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						AvailableOutputDevices Excludes UsbAccessory
+						ForceUseForCommunication Is ForceSpeaker
+				AvailableOutputDevices Includes UsbDevice
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 1
+					hdmi = 0
+					stub = 0
+
+			conf: UsbAccessory
+				#
+				# accessibility falls through Phone strategy if in call (widely speaking)
+				# but USB accessory not reachable in call
+				#
+				# accessibility follows Media strategy if not in call
+				# Media strategy inverts the priority of USB device vs accessory
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes UsbAccessory
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 1
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: DgtlDockHeadset
+				#
+				# accessibility falls through Phone strategy if in call (widely speaking)
+				# but DgtlDockHeadset not reachable in call
+				#
+				# accessibility follows Media strategy if not in call
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes DgtlDockHeadset
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 1
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: AuxDigital
+				#
+				# accessibility falls through Phone strategy if in call (widely speaking)
+				# but Hdmi not reachable in call
+				#
+				# accessibility follows Media strategy if not in call
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes Hdmi
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 1
+					stub = 0
+
+			conf: AnlgDockHeadset
+				#
+				# accessibility falls through Phone strategy if in call (widely speaking)
+				# but AnlgDockHeadset not reachable in call
+				#
+				# accessibility follows Media strategy if not in call
+				# Media strategy inverts the priority of USB device vs accessory
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes AnlgDockHeadset
+				ForceUseForDock Is ForceAnalogDock
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 1
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: Earpiece
+				#
+				# accessibility falls through Phone strategy if in call
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				AvailableOutputDevices Includes Earpiece
+				ForceUseForCommunication IsNot ForceSpeaker
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 1
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: Speaker
+				AvailableOutputDevices Includes Speaker
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 1
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: Default
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 1
diff --git a/common/audio/stub/parameter-framework/Settings/device_for_strategy_dtmf.pfw b/common/audio/stub/parameter-framework/Settings/device_for_strategy_dtmf.pfw
new file mode 100644
index 000000000..bbc897033
--- /dev/null
+++ b/common/audio/stub/parameter-framework/Settings/device_for_strategy_dtmf.pfw
@@ -0,0 +1,640 @@
+supDomain: DeviceForStrategy
+
+	supDomain: Dtmf
+
+		domain: UnreachableDevices
+			conf: Calibration
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					fm = 0
+					speaker_safe = 0
+					bluetooth_sco_carkit = 0
+					ip = 0
+					bus = 0
+
+		domain: Device2
+			conf: RemoteSubmix
+				#
+				# DTMF follows Media strategy if not in call
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes RemoteSubmix
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 1
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: BluetoothA2dp
+				#
+				# DTMF follows Media strategy if not in call
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				AvailableOutputDevices Includes BluetoothA2dp
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 1
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: BluetoothA2dpHeadphones
+				#
+				# DTMF follows Media strategy if not in call
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				AvailableOutputDevices Includes BluetoothA2dpHeadphones
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 1
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: BluetoothA2dpSpeaker
+				#
+				# DTMF follows Media strategy if not in call
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				AvailableOutputDevices Includes BluetoothA2dpSpeaker
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 1
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: ForceSpeakerWhenNotInCall
+				#
+				# DTMF follows Media strategy if not in call
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia Is ForceSpeaker
+				ForceUseForHdmiSystemAudio IsNot ForceHdmiSystemEnforced
+				AvailableOutputDevices Includes Speaker
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 1
+					stub = 0
+
+			conf: BluetoothScoHeadset
+				#
+				# DTMF falls through Phone strategy if in call
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				AvailableOutputDevices Includes BluetoothScoHeadset
+				ForceUseForCommunication Is ForceBtSco
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 1
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: BluetoothSco
+				#
+				# DTMF falls through Phone strategy if in call
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				AvailableOutputDevices Includes BluetoothSco
+				ForceUseForCommunication Is ForceBtSco
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 1
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: WiredHeadphone
+				ANY
+					#
+					# DTMF falls through Phone strategy if in call
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+					#
+					# DTMF follows Media strategy if not in call
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes WiredHeadphone
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 1
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: Line
+				ANY
+					#
+					# DTMF falls through Phone strategy if in call
+					# but Line has a lower priority than WiredHeadset in this case.
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+						AvailableOutputDevices Excludes WiredHeadset
+					#
+					# DTMF follows Media strategy if not in call
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes Line
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 1
+					speaker = 0
+					stub = 0
+
+			conf: WiredHeadset
+				ANY
+					#
+					# DTMF falls through Phone strategy if in call
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+					#
+					# DTMF follows Media strategy if not in call
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes WiredHeadset
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 1
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: UsbDevice
+				ANY
+					#
+					# DTMF falls through Phone strategy if in call (widely speaking)
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+					#
+					# DTMF follows Media strategy if not in call
+					# Media strategy inverts the priority of USB device vs accessory
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						AvailableOutputDevices Excludes UsbAccessory
+						ForceUseForCommunication Is ForceSpeaker
+				AvailableOutputDevices Includes UsbDevice
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 1
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: UsbAccessory
+				#
+				# DTMF falls through Phone strategy if in call (widely speaking)
+				# but USB accessory not reachable in call
+				#
+				# DTMF follows Media strategy if not in call
+				# Media strategy inverts the priority of USB device vs accessory
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes UsbAccessory
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 1
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: DgtlDockHeadset
+				#
+				# DTMF falls through Phone strategy if in call (widely speaking)
+				# but DgtlDockHeadset not reachable in call
+				#
+				# DTMF follows Media strategy if not in call
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes DgtlDockHeadset
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 1
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: Hdmi
+				#
+				# DTMF falls through Phone strategy if in call (widely speaking)
+				# but Hdmi not reachable in call
+				#
+				# DTMF follows Media strategy if not in call
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes Hdmi
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 1
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: AnlgDockHeadset
+				#
+				# DTMF falls through Phone strategy if in call (widely speaking)
+				# but AnlgDockHeadset not reachable in call
+				#
+				# DTMF follows Media strategy if not in call
+				# Media strategy inverts the priority of USB device vs accessory
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForDock Is ForceAnalogDock
+				AvailableOutputDevices Includes AnlgDockHeadset
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 1
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: Earpiece
+				#
+				# DTMF falls through Phone strategy if in call
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				AvailableOutputDevices Includes Earpiece
+				ForceUseForCommunication IsNot ForceSpeaker
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 1
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: Speaker
+				ANY
+					#
+					# DTMF falls through Phone strategy if in call
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication Is ForceSpeaker
+					#
+					# DTMF follows Media strategy if not in call
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						ForceUseForHdmiSystemAudio IsNot ForceHdmiSystemEnforced
+				AvailableOutputDevices Includes Speaker
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 1
+					stub = 0
+
+			conf: Default
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 1
+
+		domain: Arc
+			#
+			# DTMF strategy follows media strategy if not in call
+			# these following domains consists in device(s) that can co-exist with others
+			# e.g. ARC, SPDIF, AUX_LINE
+			#
+			conf: Selected
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes HdmiArc
+
+				/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi_arc = 1
+
+			conf: NotSelected
+				/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi_arc = 0
+
+		domain: Spdif
+			#
+			# DTMF strategy follows media strategy if not in call
+			# these following domains consists in device(s) that can co-exist with others
+			# e.g. ARC, SPDIF, AUX_LINE
+			#
+			conf: Selected
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes Spdif
+
+				/Policy/policy/strategies/dtmf/selected_output_devices/mask/spdif = 1
+
+			conf: NotSelected
+				/Policy/policy/strategies/dtmf/selected_output_devices/mask/spdif = 0
+
+		domain: AuxLine
+			#
+			# DTMF strategy follows media strategy if not in call
+			# these following domains consists in device(s) that can co-exist with others
+			# e.g. ARC, SPDIF, AUX_LINE
+			#
+			conf: Selected
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				AvailableOutputDevices Includes AuxLine
+
+				/Policy/policy/strategies/dtmf/selected_output_devices/mask/aux_line = 1
+
+			conf: NotSelected
+				/Policy/policy/strategies/dtmf/selected_output_devices/mask/aux_line = 0
diff --git a/common/audio/stub/parameter-framework/Settings/device_for_strategy_enforced_audible.pfw b/common/audio/stub/parameter-framework/Settings/device_for_strategy_enforced_audible.pfw
new file mode 100644
index 000000000..b71c7ab9e
--- /dev/null
+++ b/common/audio/stub/parameter-framework/Settings/device_for_strategy_enforced_audible.pfw
@@ -0,0 +1,368 @@
+supDomain: DeviceForStrategy
+
+	supDomain: EnforcedAudible
+
+		domain: UnreachableDevices
+			conf: Calibration
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					# no enforced_audible on remote submix (e.g. WFD)
+					hdmi_arc = 0
+					spdif = 0
+					aux_line = 0
+					speaker_safe = 0
+					ip = 0
+					bus = 0
+					fm = 0
+
+		domain: Speaker
+			conf: Selected
+				#
+				# strategy STRATEGY_ENFORCED_AUDIBLE uses same routing policy as STRATEGY_SONIFICATION
+				# except:
+				#    - when in call where it doesn't default to STRATEGY_PHONE behavior
+				#    - in countries where not enforced in which case it follows STRATEGY_MEDIA
+				#
+				AvailableOutputDevices Includes Speaker
+				ANY
+					ForceUseForSystem Is ForceSystemEnforced
+					ALL
+						ForceUseForMedia Is ForceSpeaker
+						AvailableOutputDevices Excludes RemoteSubmix
+						ANY
+							ForceUseForMedia IsNot ForceNoBtA2dp
+							AvailableOutputDevices Excludes BluetoothA2dp
+							AvailableOutputDevices Excludes BluetoothA2dpHeadphones
+							AvailableOutputDevices Excludes BluetoothA2dpSpeaker
+					#
+					# Speaker is also the fallback device if any of the device from Device2 domain
+					# is selected.
+					#
+					ALL
+						AvailableOutputDevices Excludes RemoteSubmix
+						AvailableOutputDevices Excludes WiredHeadphone
+						AvailableOutputDevices Excludes Line
+						AvailableOutputDevices Excludes WiredHeadset
+						AvailableOutputDevices Excludes UsbAccessory
+						AvailableOutputDevices Excludes UsbDevice
+						AvailableOutputDevices Excludes DgtlDockHeadset
+						AvailableOutputDevices Excludes Hdmi
+						ANY
+							AvailableOutputDevices Excludes AnlgDockHeadset
+							ForceUseForDock IsNot ForceAnalogDock
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					speaker = 1
+
+			conf: NotSelected
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					speaker = 0
+
+		domain: Device2
+			conf: RemoteSubmix
+				AvailableOutputDevices Includes RemoteSubmix
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 1
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					stub = 0
+
+			conf: BluetoothA2dp
+				AvailableOutputDevices Includes BluetoothA2dp
+				ForceUseForMedia IsNot ForceNoBtA2dp
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 1
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					stub = 0
+
+			conf: BluetoothA2dpHeadphones
+				AvailableOutputDevices Includes BluetoothA2dpHeadphones
+				ForceUseForMedia IsNot ForceNoBtA2dp
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 1
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					stub = 0
+
+			conf: BluetoothA2dpSpeaker
+				AvailableOutputDevices Includes BluetoothA2dpSpeaker
+				ForceUseForMedia IsNot ForceNoBtA2dp
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 1
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					stub = 0
+
+			conf: WiredHeadphone
+				ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes WiredHeadphone
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 1
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					stub = 0
+
+			conf: Line
+				ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes Line
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 1
+					stub = 0
+
+			conf: WiredHeadset
+				ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes WiredHeadset
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 1
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					stub = 0
+
+			conf: UsbAccessory
+				ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes UsbAccessory
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 1
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					stub = 0
+
+			conf: UsbDevice
+				ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes UsbDevice
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 1
+					telephony_tx = 0
+					line = 0
+					stub = 0
+
+			conf: DgtlDockHeadset
+				ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes DgtlDockHeadset
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 1
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					stub = 0
+
+			conf: Hdmi
+				ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes Hdmi
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 1
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					stub = 0
+
+			conf: AnlgDockHeadset
+				ForceUseForMedia IsNot ForceSpeaker
+				ForceUseForDock Is ForceAnalogDock
+				AvailableOutputDevices Includes AnlgDockHeadset
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 1
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					stub = 0
+
+			conf: NoDevice
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					stub = 1
diff --git a/common/audio/stub/parameter-framework/Settings/device_for_strategy_media.pfw b/common/audio/stub/parameter-framework/Settings/device_for_strategy_media.pfw
new file mode 100644
index 000000000..ee9df0de8
--- /dev/null
+++ b/common/audio/stub/parameter-framework/Settings/device_for_strategy_media.pfw
@@ -0,0 +1,352 @@
+domainGroup: DeviceForStrategy
+
+	domainGroup: Media
+
+		domain: UnreachableDevices
+			conf: Calibration
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					fm = 0
+					speaker_safe = 0
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					telephony_tx = 0
+					ip = 0
+					bus = 0
+
+		domain: Device2
+			conf: RemoteSubmix
+				AvailableOutputDevices Includes RemoteSubmix
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 1
+					line = 0
+					stub = 0
+
+			conf: BluetoothA2dp
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				ForceUseForCommunication IsNot ForceBtSco
+				AvailableOutputDevices Includes BluetoothA2dp
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 1
+					remote_submix = 0
+					line = 0
+					stub = 0
+
+			conf: BluetoothA2dpHeadphone
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				ForceUseForCommunication IsNot ForceBtSco
+				AvailableOutputDevices Includes BluetoothA2dpHeadphones
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 1
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 0
+					stub = 0
+
+			conf: BluetoothA2dpSpeaker
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				ForceUseForCommunication IsNot ForceBtSco
+				AvailableOutputDevices Includes BluetoothA2dpSpeaker
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 1
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 0
+					stub = 0
+
+			conf: ForceSpeaker
+				ForceUseForMedia Is ForceSpeaker
+				AvailableOutputDevices Includes Speaker
+				#
+				# If hdmi system audio mode is on, remove speaker out of output list.
+				#
+				ForceUseForHdmiSystemAudio IsNot ForceHdmiSystemEnforced
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 1
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 0
+					stub = 0
+
+			conf: WiredHeadphone
+				AvailableOutputDevices Includes WiredHeadphone
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 1
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 0
+					stub = 0
+
+			conf: Line
+				AvailableOutputDevices Includes Line
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 1
+					stub = 0
+
+			conf: WiredHeadset
+				AvailableOutputDevices Includes WiredHeadset
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 1
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 0
+					stub = 0
+
+			conf: UsbAccessory
+				AvailableOutputDevices Includes UsbAccessory
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 1
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 0
+					stub = 0
+
+			conf: UsbDevice
+				AvailableOutputDevices Includes UsbDevice
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 1
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 0
+					stub = 0
+
+			conf: DgtlDockHeadset
+				AvailableOutputDevices Includes DgtlDockHeadset
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 0
+					dgtl_dock_headset = 1
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 0
+					stub = 0
+
+			conf: AuxDigital
+				AvailableOutputDevices Includes Hdmi
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 1
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 0
+					stub = 0
+
+			conf: AnlgDockHeadset
+				AvailableOutputDevices Includes AnlgDockHeadset
+				ForceUseForDock Is ForceAnalogDock
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 1
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 0
+					stub = 0
+
+			conf: Speaker
+				AvailableOutputDevices Includes Speaker
+				#
+				# If hdmi system audio mode is on, remove speaker out of output list.
+				#
+				ForceUseForHdmiSystemAudio IsNot ForceHdmiSystemEnforced
+				ForceUseForCommunication IsNot ForceBtSco
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 1
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 0
+					stub = 0
+
+			conf: Default
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 0
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 0
+					stub = 1
+
+		domain: Arc
+			#
+			# these following domains consists in device(s) that can co-exist with others
+			# e.g. ARC, SPDIF, AUX_LINE
+			#
+			conf: Selected
+				AvailableOutputDevices Includes HdmiArc
+
+				/Policy/policy/strategies/media/selected_output_devices/mask/hdmi_arc = 1
+
+			conf: NotSelected
+				/Policy/policy/strategies/media/selected_output_devices/mask/hdmi_arc = 0
+
+		domain: Spdif
+			#
+			# these following domains consists in device(s) that can co-exist with others
+			# e.g. ARC, SPDIF, AUX_LINE
+			#
+			conf: Selected
+				AvailableOutputDevices Includes Spdif
+
+				/Policy/policy/strategies/media/selected_output_devices/mask/spdif = 1
+
+			conf: NotSelected
+				/Policy/policy/strategies/media/selected_output_devices/mask/spdif = 0
+
+		domain: AuxLine
+			conf: Selected
+				AvailableOutputDevices Includes AuxLine
+
+				/Policy/policy/strategies/media/selected_output_devices/mask/aux_line = 1
+
+			conf: NotSelected
+				/Policy/policy/strategies/media/selected_output_devices/mask/aux_line = 0
diff --git a/common/audio/stub/parameter-framework/Settings/device_for_strategy_phone.pfw b/common/audio/stub/parameter-framework/Settings/device_for_strategy_phone.pfw
new file mode 100644
index 000000000..e8f54a54e
--- /dev/null
+++ b/common/audio/stub/parameter-framework/Settings/device_for_strategy_phone.pfw
@@ -0,0 +1,497 @@
+supDomain: DeviceForStrategy
+
+	supDomain: Phone
+
+		domain: UnreachableDevices
+			conf: Calibration
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					# no sonification on remote submix (e.g. WFD)
+					remote_submix = 0
+					hdmi_arc = 0
+					aux_line = 0
+					spdif = 0
+					fm = 0
+					speaker_safe = 0
+					ip = 0
+					bus = 0
+
+		domain: Device
+			conf: ScoCarkit
+				AvailableOutputDevices Includes BluetoothScoCarkit
+				ForceUseForCommunication Is ForceBtSco
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 1
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: BluetoothScoHeadset
+				AvailableOutputDevices Includes BluetoothScoHeadset
+				ForceUseForCommunication Is ForceBtSco
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 1
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: BluetoothSco
+				AvailableOutputDevices Includes BluetoothSco
+				ForceUseForCommunication Is ForceBtSco
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 1
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: BluetoothA2dp
+				#
+				# Fallback BT Sco devices in case of FORCE_BT_SCO
+				# or FORCE_NONE
+				#
+				AvailableOutputDevices Includes BluetoothA2dp
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				ForceUseForCommunication Is ForceNone
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 1
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: BluetoothA2dpHeadphones
+				#
+				# Fallback BT Sco devices in case of FORCE_BT_SCO
+				# or FORCE_NONE
+				#
+				AvailableOutputDevices Includes BluetoothA2dpHeadphones
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				ForceUseForCommunication Is ForceNone
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 1
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: BluetoothA2dpSpeaker
+				#
+				# Fallback BT Sco devices in case of FORCE_BT_SCO
+				# or FORCE_NONE
+				#
+				AvailableOutputDevices Includes BluetoothA2dpSpeaker
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				ForceUseForCommunication Is ForceSpeaker
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 1
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: WiredHeadphone
+				#
+				# Fallback BT Sco devices in case of FORCE_BT_SCO
+				# or FORCE_NONE
+				#
+				AvailableOutputDevices Includes WiredHeadphone
+				ForceUseForCommunication IsNot ForceSpeaker
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 1
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: WiredHeadset
+				#
+				# Fallback BT Sco devices in case of FORCE_BT_SCO
+				# or FORCE_NONE
+				#
+				AvailableOutputDevices Includes WiredHeadset
+				ForceUseForCommunication IsNot ForceSpeaker
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 1
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: Line
+				AvailableOutputDevices Includes Line
+				ForceUseForCommunication IsNot ForceSpeaker
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 1
+					speaker = 0
+					stub = 0
+
+			conf: UsbDevice
+				#
+				# Fallback BT Sco devices in case of FORCE_BT_SCO
+				# or FORCE_NONE
+				#
+				AvailableOutputDevices Includes UsbDevice
+				ANY
+					ForceUseForCommunication Is ForceBtSco
+					ForceUseForCommunication Is ForceNone
+					ALL
+						ForceUseForCommunication Is ForceSpeaker
+						#
+						# In case of Force Speaker, priority between device and accessory are
+						# inverted compared to Force None or Bt Sco
+						#
+						AvailableOutputDevices Excludes UsbAccessory
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 1
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: UsbAccessory
+				#
+				# Fallback BT Sco devices in case of FORCE_BT_SCO
+				# or FORCE_NONE
+				#
+				AvailableOutputDevices Includes UsbAccessory
+				TelephonyMode IsNot InCommunication
+				TelephonyMode IsNot InCall
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 1
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: DgtlDockHeadset
+				#
+				# Fallback BT Sco devices in case of FORCE_BT_SCO
+				# or FORCE_NONE
+				#
+				AvailableOutputDevices Includes DgtlDockHeadset
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 1
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: Hdmi
+				#
+				# Fallback BT Sco devices in case of FORCE_BT_SCO
+				# or FORCE_NONE
+				#
+				AvailableOutputDevices Includes Hdmi
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 1
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: AnlgDockHeadset
+				#
+				# Fallback BT Sco devices in case of FORCE_BT_SCO
+				# or FORCE_NONE
+				#
+				AvailableOutputDevices Includes AnlgDockHeadset
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 1
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: Earpiece
+				#
+				# Fallback BT Sco devices in case of FORCE_BT_SCO
+				# or FORCE_NONE
+				#
+				AvailableOutputDevices Includes Earpiece
+				ForceUseForCommunication IsNot ForceSpeaker
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 1
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 0
+
+			conf: Speaker
+				#
+				# Fallback BT Sco devices in case of FORCE_BT_SCO
+				# or FORCE_NONE
+				#
+				AvailableOutputDevices Includes Speaker
+				ForceUseForCommunication Is ForceSpeaker
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 1
+					stub = 0
+
+			conf: Default
+				#
+				# Fallback on default output device which can be speaker for example
+				#
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+					stub = 1
diff --git a/common/audio/stub/parameter-framework/Settings/device_for_strategy_rerouting.pfw b/common/audio/stub/parameter-framework/Settings/device_for_strategy_rerouting.pfw
new file mode 100644
index 000000000..71c5a2310
--- /dev/null
+++ b/common/audio/stub/parameter-framework/Settings/device_for_strategy_rerouting.pfw
@@ -0,0 +1,313 @@
+domainGroup: DeviceForStrategy
+
+	domainGroup: Rerouting
+		#
+		# Falls through media strategy
+		#
+		domain: UnreachableDevices
+			conf: Calibration
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					hdmi_arc = 0
+					spdif = 0
+					aux_line = 0
+					fm = 0
+					speaker_safe = 0
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					telephony_tx = 0
+					ip = 0
+					bus = 0
+
+		domain: Device2
+			conf: RemoteSubmix
+				AvailableOutputDevices Includes RemoteSubmix
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 1
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: BluetoothA2dp
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				AvailableOutputDevices Includes BluetoothA2dp
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 1
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: BluetoothA2dpHeadphone
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				AvailableOutputDevices Includes BluetoothA2dpHeadphones
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 1
+					bluetooth_a2dp_speaker = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: BluetoothA2dpSpeaker
+				ForceUseForMedia IsNot ForceNoBtA2dp
+				AvailableOutputDevices Includes BluetoothA2dpSpeaker
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 1
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: ForceSpeaker
+				ForceUseForMedia Is ForceSpeaker
+				AvailableOutputDevices Includes Speaker
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 1
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: WiredHeadphone
+				AvailableOutputDevices Includes WiredHeadphone
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 1
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: Line
+				AvailableOutputDevices Includes Line
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 1
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: WiredHeadset
+				AvailableOutputDevices Includes WiredHeadset
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 0
+					wired_headset = 1
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: UsbAccessory
+				AvailableOutputDevices Includes UsbAccessory
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 1
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: UsbDevice
+				AvailableOutputDevices Includes UsbDevice
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 1
+					hdmi = 0
+					stub = 0
+
+			conf: DgtlDockHeadset
+				AvailableOutputDevices Includes DgtlDockHeadset
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 1
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: AuxDigital
+				#
+				# Rerouting is similar to media and sonification (exept here: sonification is not allowed on HDMI)
+				#
+				AvailableOutputDevices Includes Hdmi
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 1
+					stub = 0
+
+			conf: AnlgDockHeadset
+				AvailableOutputDevices Includes AnlgDockHeadset
+				ForceUseForDock Is ForceAnalogDock
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 1
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: Speaker
+				AvailableOutputDevices Includes Speaker
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 1
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: Default
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 1
diff --git a/common/audio/stub/parameter-framework/Settings/device_for_strategy_sonification.pfw b/common/audio/stub/parameter-framework/Settings/device_for_strategy_sonification.pfw
new file mode 100644
index 000000000..0e0e465f0
--- /dev/null
+++ b/common/audio/stub/parameter-framework/Settings/device_for_strategy_sonification.pfw
@@ -0,0 +1,504 @@
+supDomain: DeviceForStrategy
+
+	supDomain: Sonification
+
+		domain: UnreachableDevices
+			conf: Calibration
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					# no sonification on remote submix (e.g. WFD)
+					remote_submix = 0
+					hdmi_arc = 0
+					spdif = 0
+					fm = 0
+					speaker_safe = 0
+					aux_line = 0
+					#
+					# Sonification follows phone strategy if in call but HDMI is not reachable
+					#
+					hdmi = 0
+					ip = 0
+					bus = 0
+
+		domain: Speaker
+
+			conf: Selected
+				AvailableOutputDevices Includes Speaker
+				ANY
+					#
+					# Sonification falls through ENFORCED_AUDIBLE if not in call (widely speaking)
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+					ALL
+						#
+						# Sonification follows phone strategy if in call (widely speaking)
+						#
+						ForceUseForCommunication Is ForceSpeaker
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						AvailableOutputDevices Excludes Line
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					speaker = 1
+
+			conf: NotSelected
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					speaker = 0
+
+		domain: Device2
+
+			conf: BluetoothA2dp
+				#
+				# Sonification falls through media strategy if not in call (widely speaking)
+				#
+				AvailableOutputDevices Includes BluetoothA2dp
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceNoBtA2dp
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 1
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					stub = 0
+
+			conf: BluetoothA2dpHeadphones
+				#
+				# Sonification falls through media strategy if not in call (widely speaking)
+				#
+				AvailableOutputDevices Includes BluetoothA2dpHeadphones
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceNoBtA2dp
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 1
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					stub = 0
+
+			conf: BluetoothA2dpSpeaker
+				#
+				# Sonification falls through media strategy if not in call (widely speaking)
+				#
+				AvailableOutputDevices Includes BluetoothA2dpSpeaker
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceNoBtA2dp
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 1
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					stub = 0
+
+			conf: ScoCarkit
+				#
+				# Sonification follows phone strategy if in call (widely speaking)
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				ForceUseForCommunication Is ForceBtSco
+				AvailableOutputDevices Includes BluetoothScoCarkit
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 1
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					stub = 0
+
+			conf: ScoHeadset
+				#
+				# Sonification follows phone strategy if in call (widely speaking)
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				ForceUseForCommunication Is ForceBtSco
+				AvailableOutputDevices Includes BluetoothScoHeadset
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 1
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					stub = 0
+
+			conf: Sco
+				#
+				# Sonification follows phone strategy if in call (widely speaking)
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				ForceUseForCommunication Is ForceBtSco
+				AvailableOutputDevices Includes BluetoothSco
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 1
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					stub = 0
+
+			conf: WiredHeadphone
+				AvailableOutputDevices Includes WiredHeadphone
+				ANY
+					#
+					# Sonification falls through media strategy if not in call (widely speaking)
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						ForceUseForMedia IsNot ForceSpeaker
+					#
+					# Sonification follows Phone strategy if in call (widely speaking)
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 1
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					stub = 0
+
+			conf: Line
+				AvailableOutputDevices Includes Line
+				ANY
+					#
+					# Sonification follows Phone strategy if in call (widely speaking)
+					# but Line has a lower priority than WiredHeadset in this case.
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+						AvailableOutputDevices Excludes WiredHeadset
+					#
+					# Sonification falls through media strategy if not in call (widely speaking)
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						ForceUseForMedia IsNot ForceSpeaker
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 1
+					stub = 0
+
+			conf: WiredHeadset
+				AvailableOutputDevices Includes WiredHeadset
+				ANY
+					#
+					# Sonification falls through media strategy if not in call (widely speaking)
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						ForceUseForMedia IsNot ForceSpeaker
+					ALL
+						#
+						# Sonification Follows Phone Strategy if in call (widely speaking)
+						#
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 1
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					stub = 0
+
+			conf: UsbDevice
+				AvailableOutputDevices Includes UsbDevice
+				ANY
+					#
+					# Sonification falls through media strategy if not in call (widely speaking)
+					#
+					ALL
+						AvailableOutputDevices Excludes UsbAccessory
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						ForceUseForMedia IsNot ForceSpeaker
+					ALL
+						#
+						# Sonification Follows Phone Strategy if in call (widely speaking)
+						#
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 1
+					telephony_tx = 0
+					line = 0
+					stub = 0
+
+			conf: UsbAccessory
+				AvailableOutputDevices Includes UsbAccessory
+				#
+				# Sonification falls through media strategy if not in call (widely speaking)
+				#
+				# Sonification Follows Phone Strategy if in call (widely speaking)
+				# but USB Accessory not reachable in call.
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceSpeaker
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 1
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					stub = 0
+
+			conf: DgtlDockHeadset
+				AvailableOutputDevices Includes DgtlDockHeadset
+				#
+				# Sonification falls through media strategy if not in call
+				#
+				# Sonification Follows Phone Strategy if in call (widely speaking)
+				# but DgtlDockHeadset not reachable in call.
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceSpeaker
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 1
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					stub = 0
+
+			conf: AnlgDockHeadset
+				AvailableOutputDevices Includes AnlgDockHeadset
+				#
+				# Sonification falls through media strategy if not in call
+				#
+				# Sonification Follows Phone Strategy if in call (widely speaking)
+				# but AnlgDockHeadset not reachable in call.
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceSpeaker
+				ForceUseForDock Is ForceAnalogDock
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 1
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					stub = 0
+
+			conf: Earpiece
+				#
+				# Sonification Follows Phone Strategy if in call
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				ForceUseForCommunication IsNot ForceSpeaker
+				AvailableOutputDevices Includes Earpiece
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 1
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					stub = 0
+
+			conf: None
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					stub = 1
diff --git a/common/audio/stub/parameter-framework/Settings/device_for_strategy_sonification_respectful.pfw b/common/audio/stub/parameter-framework/Settings/device_for_strategy_sonification_respectful.pfw
new file mode 100644
index 000000000..4614bd913
--- /dev/null
+++ b/common/audio/stub/parameter-framework/Settings/device_for_strategy_sonification_respectful.pfw
@@ -0,0 +1,549 @@
+domainGroup: DeviceForStrategy
+
+	domainGroup: SonificationRespectful
+		#
+		# Sonificiation Respectful follows:
+		#	- If in call: Strategy sonification (that follows phone strategy in call also...)
+		#	- If not in call AND a music stream is active remotely: Strategy sonification (that
+		#     follows enforced audible, which follows media)
+		#	- if not in call and no music stream active remotely and music stream active): strategy
+		#     media
+		#   - Otherwise follows sonification by replacing speaker with speaker safe if speaker is
+		#	  selected.
+		#
+		# Case of stream active handled programmatically
+
+		domain: UnreachableDevices
+			conf: Calibration
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					remote_submix = 0
+					hdmi_arc = 0
+					aux_line = 0
+					spdif = 0
+					fm = 0
+					telephony_tx = 0
+					ip = 0
+					bus = 0
+
+		domain: Speakers
+
+			conf: SpeakerSafe
+				AvailableOutputDevices Includes Speaker
+				AvailableOutputDevices Includes SpeakerSafe
+				#
+				# Follows sonification strategy if not in call and replace speaker by speaker safe
+				# if and only if speaker only selected
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					speaker_safe = 1
+					speaker = 0
+
+			conf: Speaker
+				AvailableOutputDevices Includes Speaker
+				ANY
+					#
+					# Follows sonification strategy if not in call
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+					ALL
+						#
+						# Follows Phone Strategy if call
+						#
+						ForceUseForCommunication Is ForceSpeaker
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						AvailableOutputDevices Excludes Line
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					speaker_safe = 0
+					speaker = 1
+
+			conf: None
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					speaker_safe = 0
+					speaker = 0
+
+		domain: Device2
+			conf: BluetoothA2dp
+				#
+				# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
+				# SonificationRespectful follows media if music stream is active
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia Is ForceNoBtA2dp
+				AvailableOutputDevices Includes BluetoothA2dp
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 1
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: BluetoothA2dpHeadphones
+				#
+				# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
+				# SonificationRespectful follows media if music stream is active
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia Is ForceNoBtA2dp
+				AvailableOutputDevices Includes BluetoothA2dpHeadphones
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 1
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: BluetoothA2dpSpeaker
+				#
+				# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
+				# SonificationRespectful follows media if music stream is active
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia Is ForceNoBtA2dp
+				AvailableOutputDevices Includes BluetoothA2dpSpeaker
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 1
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: BluetoothScoCarkit
+				#
+				# SonificationRespectful Follows Phone strategy if in call
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				ForceUseForCommunication Is ForceBtSco
+				AvailableOutputDevices Includes BluetoothScoCarkit
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 1
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: BluetoothScoHeadset
+				#
+				# SonificationRespectful Follows Phone strategy if in call
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				ForceUseForCommunication Is ForceBtSco
+				AvailableOutputDevices Includes BluetoothScoHeadset
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 1
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: BluetoothSco
+				#
+				# SonificationRespectful Follows Phone strategy if in call
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				ForceUseForCommunication Is ForceBtSco
+				AvailableOutputDevices Includes BluetoothSco
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 1
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: WiredHeadphone
+				ANY
+					ALL
+						#
+						# SonificationRespectful Follows Phone strategy if in call
+						#
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+					ALL
+						#
+						# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
+						# SonificationRespectful follows media if music stream is active
+						#
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes WiredHeadphone
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 1
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: Line
+				ANY
+					#
+					# SonificationRespectful Follows Phone strategy if in call
+					# but Line has a lower priority than WiredHeadset in this case.
+					#
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+						AvailableOutputDevices Excludes WiredHeadset
+					#
+					# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
+					# SonificationRespectful follows media if music stream is active
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						AvailableOutputDevices Includes WiredHeadphone
+						ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes Line
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 1
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: WiredHeadset
+				ANY
+					ALL
+						#
+						# SonificationRespectful Follows Phone strategy if in call
+						#
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+					ALL
+						#
+						# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
+						# SonificationRespectful follows media if music stream is active
+						#
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes WiredHeadset
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 1
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: UsbDevice
+				ANY
+					ALL
+						#
+						# SonificationRespectful Follows Phone strategy if in call
+						#
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+					ALL
+						#
+						# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
+						# SonificationRespectful follows media if music stream is active
+						#
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						ForceUseForMedia IsNot ForceSpeaker
+						AvailableOutputDevices Excludes UsbAccessory
+				AvailableOutputDevices Includes UsbDevice
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 1
+					hdmi = 0
+					stub = 0
+
+			conf: UsbAccessory
+				#
+				# SonificationRespectful Follows Phone strategy if in call (widely speaking)
+				# but UsbAccessory not reachable in call.
+				#
+				# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
+				# SonificationRespectful follows media if music stream is active
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes UsbAccessory
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 1
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: DgtlDockHeadset
+				#
+				# SonificationRespectful Follows Phone strategy if in call (widely speaking)
+				# but DgtlDockHeadset not reachable in call.
+				#
+				# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
+				# SonificationRespectful follows media if music stream is active
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes DgtlDockHeadset
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 1
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: AuxDigital
+				#
+				# SonificationRespectful Follows Phone strategy if in call (widely speaking)
+				# but HDMI not reachable in call.
+				#
+				# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
+				# SonificationRespectful follows media if music stream is active
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes Hdmi
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 1
+					stub = 0
+
+			conf: AnlgDockHeadset
+				#
+				# SonificationRespectful Follows Phone strategy if in call (widely speaking)
+				# but AnlgDockHeadset not reachable in call.
+				#
+				# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
+				# SonificationRespectful follows media if music stream is active
+				#
+				TelephonyMode IsNot InCall
+				TelephonyMode IsNot InCommunication
+				ForceUseForMedia IsNot ForceSpeaker
+				ForceUseForDock Is ForceAnalogDock
+				AvailableOutputDevices Includes AnlgDockHeadset
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 1
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
+
+			conf: Earpiece
+				#
+				# SonificationRespectful Follows Phone strategy if in call
+				#
+				ANY
+					TelephonyMode Is InCall
+					TelephonyMode Is InCommunication
+				ForceUseForCommunication IsNot ForceSpeaker
+				AvailableOutputDevices Includes Earpiece
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 1
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					hdmi = 0
+					stub = 0
diff --git a/common/audio/stub/parameter-framework/Settings/device_for_strategy_transmitted_through_speaker.pfw b/common/audio/stub/parameter-framework/Settings/device_for_strategy_transmitted_through_speaker.pfw
new file mode 100644
index 000000000..cd745c484
--- /dev/null
+++ b/common/audio/stub/parameter-framework/Settings/device_for_strategy_transmitted_through_speaker.pfw
@@ -0,0 +1,42 @@
+supDomain: DeviceForStrategy
+
+	supDomain: TransmittedThroughSpeaker
+		domain: UnreacheableDevices
+			conf: Calibration
+				component: /Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask
+					remote_submix = 0
+					hdmi_arc = 0
+					spdif = 0
+					aux_line = 0
+					fm = 0
+					speaker_safe = 0
+					earpiece = 0
+					wired_headset = 1
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					telephony_tx = 0
+					line = 0
+					ip = 0
+					bus = 0
+					stub = 0
+
+		domain: Speaker
+			conf: Selected
+				AvailableOutputDevices Includes Speaker
+
+				component: /Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask
+					speaker = 1
+
+			conf: NotSelected
+				component: /Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask
+					speaker = 0
diff --git a/common/audio/stub/parameter-framework/Settings/strategy_for_stream.pfw b/common/audio/stub/parameter-framework/Settings/strategy_for_stream.pfw
new file mode 100644
index 000000000..0cd729271
--- /dev/null
+++ b/common/audio/stub/parameter-framework/Settings/strategy_for_stream.pfw
@@ -0,0 +1,19 @@
+domain: StrategyForStream
+
+	conf: Calibration
+		/Policy/policy/streams/voice_call/applicable_strategy/strategy = phone
+		#
+		# NOTE: SYSTEM stream uses MEDIA strategy because muting music and switching outputs
+		# while key clicks are played produces a poor result
+		#
+		/Policy/policy/streams/system/applicable_strategy/strategy = media
+		/Policy/policy/streams/ring/applicable_strategy/strategy = sonification
+		/Policy/policy/streams/music/applicable_strategy/strategy = media
+		/Policy/policy/streams/alarm/applicable_strategy/strategy = sonification
+		/Policy/policy/streams/notification/applicable_strategy/strategy = sonification_respectful
+		/Policy/policy/streams/bluetooth_sco/applicable_strategy/strategy = phone
+		/Policy/policy/streams/enforced_audible/applicable_strategy/strategy = enforced_audible
+		/Policy/policy/streams/dtmf/applicable_strategy/strategy = dtmf
+		/Policy/policy/streams/tts/applicable_strategy/strategy = transmitted_through_speaker
+		/Policy/policy/streams/accessibility/applicable_strategy/strategy = accessibility
+		/Policy/policy/streams/rerouting/applicable_strategy/strategy = rerouting
diff --git a/common/audio/stub/parameter-framework/Settings/strategy_for_usage.pfw b/common/audio/stub/parameter-framework/Settings/strategy_for_usage.pfw
new file mode 100644
index 000000000..bd807608b
--- /dev/null
+++ b/common/audio/stub/parameter-framework/Settings/strategy_for_usage.pfw
@@ -0,0 +1,38 @@
+supDomain: SelectedStrategyForUsages
+
+	domain: Calibration
+		conf: Calibration
+			/Policy/policy/usages/unknown/applicable_strategy/strategy = media
+			/Policy/policy/usages/media/applicable_strategy/strategy = media
+			/Policy/policy/usages/voice_communication/applicable_strategy/strategy = phone
+			/Policy/policy/usages/voice_communication_signalling/applicable_strategy/strategy = dtmf
+			/Policy/policy/usages/alarm/applicable_strategy/strategy = sonification
+			/Policy/policy/usages/notification/applicable_strategy/strategy = sonification_respectful
+			/Policy/policy/usages/notification_telephony_ringtone/applicable_strategy/strategy = sonification
+			/Policy/policy/usages/notification_communication_request/applicable_strategy/strategy = sonification_respectful
+			/Policy/policy/usages/notification_communication_instant/applicable_strategy/strategy = sonification_respectful
+			/Policy/policy/usages/notification_communication_delayed/applicable_strategy/strategy = sonification_respectful
+			/Policy/policy/usages/notification_event/applicable_strategy/strategy = sonification_respectful
+			/Policy/policy/usages/assistance_navigation_guidance/applicable_strategy/strategy = media
+			/Policy/policy/usages/assistance_sonification/applicable_strategy/strategy = media
+			/Policy/policy/usages/game/applicable_strategy/strategy = media
+
+	domain: AssistanceAccessibility
+		conf: Sonification
+			#
+			# In case of Ring or Alarm stream type active, switching to sonification
+			# @todo: handle this dynamic case. As a WA, using Ringtone mode...
+			#
+			TelephonyMode Is RingTone
+
+			/Policy/policy/usages/assistance_accessibility/applicable_strategy/strategy = sonification
+
+		conf: Phone
+			ANY
+				TelephonyMode Is InCall
+				TelephonyMode Is InCommunication
+
+			/Policy/policy/usages/assistance_accessibility/applicable_strategy/strategy = phone
+
+		conf: Accessibility
+			/Policy/policy/usages/assistance_accessibility/applicable_strategy/strategy = accessibility
diff --git a/common/audio/stub/parameter-framework/Settings/volumes.pfw b/common/audio/stub/parameter-framework/Settings/volumes.pfw
new file mode 100644
index 000000000..b7edfa179
--- /dev/null
+++ b/common/audio/stub/parameter-framework/Settings/volumes.pfw
@@ -0,0 +1,26 @@
+supDomain: VolumeProfilesForStream
+	domain: Calibration
+		conf: Calibration
+			/Policy/policy/streams/voice_call/applicable_volume_profile/volume_profile = voice_call
+			/Policy/policy/streams/system/applicable_volume_profile/volume_profile = system
+			/Policy/policy/streams/ring/applicable_volume_profile/volume_profile = ring
+			/Policy/policy/streams/music/applicable_volume_profile/volume_profile = music
+			/Policy/policy/streams/alarm/applicable_volume_profile/volume_profile = alarm
+			/Policy/policy/streams/notification/applicable_volume_profile/volume_profile = notification
+			/Policy/policy/streams/bluetooth_sco/applicable_volume_profile/volume_profile = bluetooth_sco
+			/Policy/policy/streams/enforced_audible/applicable_volume_profile/volume_profile = enforced_audible
+			/Policy/policy/streams/tts/applicable_volume_profile/volume_profile = tts
+			/Policy/policy/streams/accessibility/applicable_volume_profile/volume_profile = accessibility
+			/Policy/policy/streams/rerouting/applicable_volume_profile/volume_profile = rerouting
+			/Policy/policy/streams/patch/applicable_volume_profile/volume_profile = patch
+
+	domain: Dtmf
+		conf: InCall
+			ANY
+				TelephonyMode Is InCall
+				TelephonyMode Is InCommunication
+
+			/Policy/policy/streams/dtmf/applicable_volume_profile/volume_profile = voice_call
+
+		conf: OutOfCall
+			/Policy/policy/streams/dtmf/applicable_volume_profile/volume_profile = dtmf
diff --git a/common/audio/stub/parameter-framework/SettingsNoInput/device_for_input_source.pfw b/common/audio/stub/parameter-framework/SettingsNoInput/device_for_input_source.pfw
new file mode 100644
index 000000000..986864d22
--- /dev/null
+++ b/common/audio/stub/parameter-framework/SettingsNoInput/device_for_input_source.pfw
@@ -0,0 +1,283 @@
+supDomain: DeviceForInputSource
+	domain: Calibration
+		conf: Calibration
+			#
+			# Note that ALL input devices must have the sign bit set to 1.
+			# As the devices is a mask, use the "in" bit as a direction indicator.
+			#
+			component: /Policy/policy/input_sources/default/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0>
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 1
+			component: /Policy/policy/input_sources/mic/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0>
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 1
+			component: /Policy/policy/input_sources/voice_downlink/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0>
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 1
+			component: /Policy/policy/input_sources/voice_call/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0>
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 1
+			component: /Policy/policy/input_sources/voice_uplink/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0>
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 1
+			component: /Policy/policy/input_sources/camcorder/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0>
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 1
+			component: /Policy/policy/input_sources/voice_recognition/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0>
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 1
+			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0>
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 1
+			component: /Policy/policy/input_sources/remote_submix/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0>
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 1
+			component: /Policy/policy/input_sources/hotword/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0>
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 1
+			component: /Policy/policy/input_sources/unprocessed/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0>
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 1
+			component: /Policy/policy/input_sources/fm_tuner/applicable_input_device/mask
+				communication = 0
+				ambient = 0
+				builtin_mic = 0
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				hdmi = 0
+				telephony_rx = 0
+				back_mic = 0
+				remote_submix = 0
+				anlg_dock_headset = 0
+				dgtl_dock_headset = 0>
+				usb_accessory = 0
+				usb_device = 0
+				fm_tuner = 0
+				tv_tuner = 0
+				line = 0
+				spdif = 0
+				bluetooth_a2dp = 0
+				loopback = 0
+				ip = 0
+				bus = 0
+				stub = 1
diff --git a/common/audio/stub/parameter-framework/SettingsNoOutput/device_for_strategies.pfw b/common/audio/stub/parameter-framework/SettingsNoOutput/device_for_strategies.pfw
new file mode 100644
index 000000000..8b8faa3a2
--- /dev/null
+++ b/common/audio/stub/parameter-framework/SettingsNoOutput/device_for_strategies.pfw
@@ -0,0 +1,254 @@
+domain: DeviceForStrategy
+	conf: Calibration
+		component: /Policy/policy/strategies
+			component: media/selected_output_devices/mask
+				earpiece = 0
+				speaker = 0
+				wired_headset = 0
+				wired_headphone = 0
+				bluetooth_sco = 0
+				bluetooth_sco_headset = 0
+				bluetooth_sco_carkit = 0
+				bluetooth_a2dp = 0>
+				bluetooth_a2dp_headphones = 0
+				bluetooth_a2dp_speaker = 0
+				hdmi = 0
+				angl_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				remote_submix = 0
+				telephony_tx = 0
+				line = 0
+				hdmi_arc = 0
+				spdif = 0
+				fm = 0
+				aux_line = 0
+				speaker_safe = 0
+				ip = 0
+				bus = 0
+				stub = 1
+
+			component: phone/selected_output_devices/mask
+				earpiece = 0
+				speaker = 0
+				wired_headset = 0
+				wired_headphone = 0
+				bluetooth_sco = 0
+				bluetooth_sco_headset = 0
+				bluetooth_sco_carkit = 0
+				bluetooth_a2dp = 0>
+				bluetooth_a2dp_headphones = 0
+				bluetooth_a2dp_speaker = 0
+				hdmi = 0
+				angl_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				remote_submix = 0
+				telephony_tx = 0
+				line = 0
+				hdmi_arc = 0
+				spdif = 0
+				fm = 0
+				aux_line = 0
+				speaker_safe = 0
+				ip = 0
+				bus = 0
+				stub = 1
+
+			component: sonification/selected_output_devices/mask
+				earpiece = 0
+				speaker = 0
+				wired_headset = 0
+				wired_headphone = 0
+				bluetooth_sco = 0
+				bluetooth_sco_headset = 0
+				bluetooth_sco_carkit = 0
+				bluetooth_a2dp = 0>
+				bluetooth_a2dp_headphones = 0
+				bluetooth_a2dp_speaker = 0
+				hdmi = 0
+				angl_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				remote_submix = 0
+				telephony_tx = 0
+				line = 0
+				hdmi_arc = 0
+				spdif = 0
+				fm = 0
+				aux_line = 0
+				speaker_safe = 0
+				ip = 0
+				bus = 0
+				stub = 1
+
+			component: sonification_respectful/selected_output_devices/mask
+				earpiece = 0
+				speaker = 0
+				wired_headset = 0
+				wired_headphone = 0
+				bluetooth_sco = 0
+				bluetooth_sco_headset = 0
+				bluetooth_sco_carkit = 0
+				bluetooth_a2dp = 0>
+				bluetooth_a2dp_headphones = 0
+				bluetooth_a2dp_speaker = 0
+				hdmi = 0
+				angl_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				remote_submix = 0
+				telephony_tx = 0
+				line = 0
+				hdmi_arc = 0
+				spdif = 0
+				fm = 0
+				aux_line = 0
+				speaker_safe = 0
+				ip = 0
+				bus = 0
+				stub = 1
+
+			component: dtmf/selected_output_devices/mask
+				earpiece = 0
+				speaker = 0
+				wired_headset = 0
+				wired_headphone = 0
+				bluetooth_sco = 0
+				bluetooth_sco_headset = 0
+				bluetooth_sco_carkit = 0
+				bluetooth_a2dp = 0>
+				bluetooth_a2dp_headphones = 0
+				bluetooth_a2dp_speaker = 0
+				hdmi = 0
+				angl_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				remote_submix = 0
+				telephony_tx = 0
+				line = 0
+				hdmi_arc = 0
+				spdif = 0
+				fm = 0
+				aux_line = 0
+				speaker_safe = 0
+				ip = 0
+				bus = 0
+				stub = 1
+
+			component: enforced_audible/selected_output_devices/mask
+				earpiece = 0
+				speaker = 0
+				wired_headset = 0
+				wired_headphone = 0
+				bluetooth_sco = 0
+				bluetooth_sco_headset = 0
+				bluetooth_sco_carkit = 0
+				bluetooth_a2dp = 0>
+				bluetooth_a2dp_headphones = 0
+				bluetooth_a2dp_speaker = 0
+				hdmi = 0
+				angl_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				remote_submix = 0
+				telephony_tx = 0
+				line = 0
+				hdmi_arc = 0
+				spdif = 0
+				fm = 0
+				aux_line = 0
+				speaker_safe = 0
+				ip = 0
+				bus = 0
+				stub = 1
+
+			component: transmitted_through_speaker/selected_output_devices/mask
+				earpiece = 0
+				speaker = 0
+				wired_headset = 0
+				wired_headphone = 0
+				bluetooth_sco = 0
+				bluetooth_sco_headset = 0
+				bluetooth_sco_carkit = 0
+				bluetooth_a2dp = 0>
+				bluetooth_a2dp_headphones = 0
+				bluetooth_a2dp_speaker = 0
+				hdmi = 0
+				angl_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				remote_submix = 0
+				telephony_tx = 0
+				line = 0
+				hdmi_arc = 0
+				spdif = 0
+				fm = 0
+				aux_line = 0
+				speaker_safe = 0
+				ip = 0
+				bus = 0
+				stub = 1
+
+			component: accessibility/selected_output_devices/mask
+				earpiece = 0
+				speaker = 0
+				wired_headset = 0
+				wired_headphone = 0
+				bluetooth_sco = 0
+				bluetooth_sco_headset = 0
+				bluetooth_sco_carkit = 0
+				bluetooth_a2dp = 0>
+				bluetooth_a2dp_headphones = 0
+				bluetooth_a2dp_speaker = 0
+				hdmi = 0
+				angl_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				remote_submix = 0
+				telephony_tx = 0
+				line = 0
+				hdmi_arc = 0
+				spdif = 0
+				fm = 0
+				aux_line = 0
+				speaker_safe = 0
+				ip = 0
+				bus = 0
+				stub = 1
+
+			component: rerouting/selected_output_devices/mask
+				earpiece = 0
+				speaker = 0
+				wired_headset = 0
+				wired_headphone = 0
+				bluetooth_sco = 0
+				bluetooth_sco_headset = 0
+				bluetooth_sco_carkit = 0
+				bluetooth_a2dp = 0>
+				bluetooth_a2dp_headphones = 0
+				bluetooth_a2dp_speaker = 0
+				hdmi = 0
+				angl_dock_headset = 0
+				dgtl_dock_headset = 0
+				usb_accessory = 0
+				usb_device = 0
+				remote_submix = 0
+				telephony_tx = 0
+				line = 0
+				hdmi_arc = 0
+				spdif = 0
+				fm = 0
+				aux_line = 0
+				speaker_safe = 0
+				ip = 0
+				bus = 0
+				stub = 1
diff --git a/common/audio/stub/parameter-framework/Structure/PolicyClass.xml b/common/audio/stub/parameter-framework/Structure/PolicyClass.xml
new file mode 100644
index 000000000..296879f31
--- /dev/null
+++ b/common/audio/stub/parameter-framework/Structure/PolicyClass.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemClass xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="../../Schemas/SystemClass.xsd" Name="Policy">
+    <SubsystemInclude Path="PolicySubsystem.xml"/>
+</SystemClass>
diff --git a/common/audio/stub/parameter-framework/Structure/PolicySubsystem-CommonTypes.xml b/common/audio/stub/parameter-framework/Structure/PolicySubsystem-CommonTypes.xml
new file mode 100644
index 000000000..461e44a7c
--- /dev/null
+++ b/common/audio/stub/parameter-framework/Structure/PolicySubsystem-CommonTypes.xml
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ComponentTypeSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xmlns:xi="http://www.w3.org/2001/XInclude"
+              xsi:noNamespaceSchemaLocation="Schemas/ComponentTypeSet.xsd">
+    <!-- Output devices definition as a bitfield for the supported devices per output
+    profile. It must match with the output device enum parameter.
+    -->
+     <!--#################### GLOBAL COMPONENTS BEGIN ####################-->
+
+     <!--#################### GLOBAL COMPONENTS END ####################-->
+
+    <ComponentType Name="OutputDevicesMask" Description="32th bit is not allowed as dedicated
+                                                     for input devices detection">
+        <BitParameterBlock Name="mask" Size="32">
+            <BitParameter Name="earpiece" Size="1" Pos="0"/>
+            <BitParameter Name="speaker" Size="1" Pos="1"/>
+            <BitParameter Name="wired_headset" Size="1" Pos="2"/>
+            <BitParameter Name="wired_headphone" Size="1" Pos="3"/>
+            <BitParameter Name="bluetooth_sco" Size="1" Pos="4"/>
+            <BitParameter Name="bluetooth_sco_headset" Size="1" Pos="5"/>
+            <BitParameter Name="bluetooth_sco_carkit" Size="1" Pos="6"/>
+            <BitParameter Name="bluetooth_a2dp" Size="1" Pos="7"/>
+            <BitParameter Name="bluetooth_a2dp_headphones" Size="1" Pos="8"/>
+            <BitParameter Name="bluetooth_a2dp_speaker" Size="1" Pos="9"/>
+            <BitParameter Name="hdmi" Size="1" Pos="10"/>
+            <BitParameter Name="angl_dock_headset" Size="1" Pos="11"/>
+            <BitParameter Name="dgtl_dock_headset" Size="1" Pos="12"/>
+            <BitParameter Name="usb_accessory" Size="1" Pos="13"/>
+            <BitParameter Name="usb_device" Size="1" Pos="14"/>
+            <BitParameter Name="remote_submix" Size="1" Pos="15"/>
+            <BitParameter Name="telephony_tx" Size="1" Pos="16"/>
+            <BitParameter Name="line" Size="1" Pos="17"/>
+            <BitParameter Name="hdmi_arc" Size="1" Pos="18"/>
+            <BitParameter Name="spdif" Size="1" Pos="19"/>
+            <BitParameter Name="fm" Size="1" Pos="20"/>
+            <BitParameter Name="aux_line" Size="1" Pos="21"/>
+            <BitParameter Name="speaker_safe" Size="1" Pos="22"/>
+            <BitParameter Name="ip" Size="1" Pos="23"/>
+            <BitParameter Name="bus" Size="1" Pos="24"/>
+            <BitParameter Name="stub" Size="1" Pos="30"/>
+        </BitParameterBlock>
+    </ComponentType>
+
+    <!-- Input devices definition as a bitfield for the supported devices per Input
+    profile. It must match with the Input device enum parameter.
+    -->
+    <ComponentType Name="InputDevicesMask">
+        <BitParameterBlock Name="mask" Size="32">
+            <BitParameter Name="communication" Size="1" Pos="0"/>
+            <BitParameter Name="ambient" Size="1" Pos="1"/>
+            <BitParameter Name="builtin_mic" Size="1" Pos="2"/>
+            <BitParameter Name="bluetooth_sco_headset" Size="1" Pos="3"/>
+            <BitParameter Name="wired_headset" Size="1" Pos="4"/>
+            <BitParameter Name="hdmi" Size="1" Pos="5"/>
+            <BitParameter Name="telephony_rx" Size="1" Pos="6"/>
+            <BitParameter Name="back_mic" Size="1" Pos="7"/>
+            <BitParameter Name="remote_submix" Size="1" Pos="8"/>
+            <BitParameter Name="anlg_dock_headset" Size="1" Pos="9"/>
+            <BitParameter Name="dgtl_dock_headset" Size="1" Pos="10"/>
+            <BitParameter Name="usb_accessory" Size="1" Pos="11"/>
+            <BitParameter Name="usb_device" Size="1" Pos="12"/>
+            <BitParameter Name="fm_tuner" Size="1" Pos="13"/>
+            <BitParameter Name="tv_tuner" Size="1" Pos="14"/>
+            <BitParameter Name="line" Size="1" Pos="15"/>
+            <BitParameter Name="spdif" Size="1" Pos="16"/>
+            <BitParameter Name="bluetooth_a2dp" Size="1" Pos="17"/>
+            <BitParameter Name="loopback" Size="1" Pos="18"/>
+            <BitParameter Name="ip" Size="1" Pos="19"/>
+            <BitParameter Name="bus" Size="1" Pos="20"/>
+            <BitParameter Name="stub" Size="1" Pos="30"/>
+        </BitParameterBlock>
+    </ComponentType>
+
+    <ComponentType Name="OutputFlags"
+                   Description="the audio output flags serve two purposes:
+                    - when an AudioTrack is created they indicate a wish to be connected to an
+                      output stream with attributes corresponding to the specified flags.
+                    - when present in an output profile descriptor listed for a particular audio
+                      hardware module, they indicate that an output stream can be opened that
+                      supports the attributes indicated by the flags.
+                    The audio policy manager will try to match the flags in the request
+                    (when getOuput() is called) to an available output stream.">
+        <BitParameterBlock Name="mask" Size="32">
+            <BitParameter Name="direct" Size="1" Pos="0"/>
+            <BitParameter Name="primary" Size="1" Pos="1"/>
+            <BitParameter Name="fast" Size="1" Pos="2"/>
+            <BitParameter Name="deep_buffer" Size="1" Pos="3"/>
+            <BitParameter Name="compress_offload" Size="1" Pos="4"/>
+            <BitParameter Name="non_blocking" Size="1" Pos="5"/>
+            <BitParameter Name="hw_av_sync" Size="1" Pos="6"/>
+            <BitParameter Name="tts" Size="1" Pos="7"/>
+            <BitParameter Name="raw" Size="1" Pos="8"/>
+            <BitParameter Name="sync" Size="1" Pos="9"/>
+            <BitParameter Name="iec958_nonaudio" Size="1" Pos="10"/>
+        </BitParameterBlock>
+    </ComponentType>
+
+    <ComponentType Name="InputFlags"
+                   Description="The audio input flags are analogous to audio output flags.
+                                Currently they are used only when an AudioRecord is created,
+                                to indicate a preference to be connected to an input stream with
+                                attributes corresponding to the specified flags.">
+        <BitParameterBlock Name="mask" Size="32">
+            <BitParameter Name="fast" Size="1" Pos="0"/>
+            <BitParameter Name="hw_hotword" Size="1" Pos="2"/>
+            <BitParameter Name="raw" Size="1" Pos="3"/>
+            <BitParameter Name="sync" Size="1" Pos="4"/>
+        </BitParameterBlock>
+    </ComponentType>
+
+    <ComponentType Name="InputSourcesMask" Description="The audio input source is also known
+                                                        as the use case.">
+        <BitParameterBlock Name="mask" Size="32">
+            <BitParameter Name="default" Size="1" Pos="0"/>
+            <BitParameter Name="mic" Size="1" Pos="1"/>
+            <BitParameter Name="voice_uplink" Size="1" Pos="2"/>
+            <BitParameter Name="voice_downlink" Size="1" Pos="3"/>
+            <BitParameter Name="voice_call" Size="1" Pos="4"/>
+            <BitParameter Name="camcorder" Size="1" Pos="5"/>
+            <BitParameter Name="voice_recognition" Size="1" Pos="6"/>
+            <BitParameter Name="voice_communication" Size="1" Pos="7"/>
+            <BitParameter Name="remote_submix" Size="1" Pos="8"/>
+            <BitParameter Name="unprocessed" Size="1" Pos="9"/>
+            <BitParameter Name="fm_tuner" Size="1" Pos="10"/>
+            <BitParameter Name="hotword" Size="1" Pos="11"/>
+        </BitParameterBlock>
+    </ComponentType>
+
+    <!-- Routing Strategy definition as an enumeration. Numerical value must match the value
+         of the routing strategy in policy header file. -->
+    <ComponentType Name="Strategy">
+        <EnumParameter Name="strategy" Size="32">
+            <ValuePair Literal="media" Numerical="0"/>
+            <ValuePair Literal="phone" Numerical="1"/>
+            <ValuePair Literal="sonification" Numerical="2"/>
+            <ValuePair Literal="sonification_respectful" Numerical="3"/>
+            <ValuePair Literal="dtmf" Numerical="4"/>
+            <ValuePair Literal="enforced_audible" Numerical="5"/>
+            <ValuePair Literal="transmitted_through_speaker" Numerical="6"/>
+            <ValuePair Literal="accessibility" Numerical="7"/>
+            <ValuePair Literal="rerouting" Numerical="8"/>
+        </EnumParameter>
+    </ComponentType>
+
+    <!--#################### STRATEGY COMMON TYPES BEGIN ####################-->
+
+    <ComponentType Name="StrategyConfig" Mapping="Strategy:'%1'">
+        <Component Name="selected_output_devices" Type="OutputDevicesMask"/>
+    </ComponentType>
+
+    <!--#################### STRATEGY COMMON TYPES END ####################-->
+
+    <!--#################### STREAM COMMON TYPES BEGIN ####################-->
+
+    <ComponentType Name="VolumeProfileType">
+        <EnumParameter Name="volume_profile" Size="32">
+            <ValuePair Literal="voice_call" Numerical="0"/>
+            <ValuePair Literal="system" Numerical="1"/>
+            <ValuePair Literal="ring" Numerical="2"/>
+            <ValuePair Literal="music" Numerical="3"/>
+            <ValuePair Literal="alarm" Numerical="4"/>
+            <ValuePair Literal="notification" Numerical="5"/>
+            <ValuePair Literal="bluetooth_sco" Numerical="6"/>
+            <ValuePair Literal="enforced_audible" Numerical="7"/>
+            <ValuePair Literal="dtmf" Numerical="8"/>
+            <ValuePair Literal="tts" Numerical="9"/>
+            <ValuePair Literal="accessibility" Numerical="10"/>
+            <ValuePair Literal="rerouting" Numerical="11"/>
+            <ValuePair Literal="patch" Numerical="12"/>
+        </EnumParameter>
+    </ComponentType>
+
+    <ComponentType Name="Stream">
+        <Component Name="applicable_strategy" Type="Strategy"/>
+        <Component Name="applicable_volume_profile" Type="VolumeProfileType"
+                   Description="Volume profile followed by a given stream type."/>
+    </ComponentType>
+
+    <!--#################### STREAM COMMON TYPES END ####################-->
+
+    <!--#################### USAGE COMMON TYPES BEGIN ####################-->
+
+    <ComponentType Name="Usage">
+        <Component Name="applicable_strategy" Type="Strategy" Mapping="Usage:'%1'"/>
+    </ComponentType>
+
+    <!--#################### USAGE COMMON TYPES END ####################-->
+
+    <!--#################### INPUT SOURCE COMMON TYPES BEGIN ####################-->
+
+    <ComponentType Name="InputSource">
+        <Component Name="applicable_input_device" Type="InputDevicesMask"
+                   Mapping="InputSource:'%1'" Description="Selected Input device"/>
+    </ComponentType>
+
+    <!--#################### INPUT SOURCE COMMON TYPES END ####################-->
+
+</ComponentTypeSet>
diff --git a/common/audio/stub/parameter-framework/Structure/PolicySubsystem.xml b/common/audio/stub/parameter-framework/Structure/PolicySubsystem.xml
new file mode 100644
index 000000000..71b2b6238
--- /dev/null
+++ b/common/audio/stub/parameter-framework/Structure/PolicySubsystem.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Subsystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:xi="http://www.w3.org/2001/XInclude"
+           xsi:noNamespaceSchemaLocation="Schemas/Subsystem.xsd"
+           Name="policy" Type="Policy">
+
+    <ComponentLibrary>
+        <!--#################### GLOBAL COMPONENTS BEGIN ####################-->
+        <!-- Common Types defintion -->
+        <xi:include href="PolicySubsystem-CommonTypes.xml"/>
+
+        <!--#################### GLOBAL COMPONENTS END ####################-->
+
+        <!--#################### STRATEGY BEGIN ####################-->
+
+        <ComponentType Name="Strategies" Description="Identifier must match the enum value to make
+                             the link between the PolicyManager and PFW">
+            <Component Name="media" Type="StrategyConfig" Mapping="Amend1:Media,Identifier:0"/>
+            <Component Name="phone" Type="StrategyConfig" Mapping="Amend1:Phone,Identifier:1"/>
+            <Component Name="sonification" Type="StrategyConfig"
+                                           Mapping="Amend1:Sonification,Identifier:2"/>
+            <Component Name="sonification_respectful" Type="StrategyConfig"
+                       Mapping="Amend1:SonificationRespectful,Identifier:3"/>
+            <Component Name="dtmf" Type="StrategyConfig" Mapping="Amend1:Dtmf,Identifier:4"/>
+            <Component Name="enforced_audible" Type="StrategyConfig"
+                                               Mapping="Amend1:EnforcedAudible,Identifier:5"/>
+            <Component Name="transmitted_through_speaker" Type="StrategyConfig"
+                       Mapping="Amend1:TransmittedThroughSpeaker,Identifier:6"/>
+            <Component Name="accessibility" Type="StrategyConfig"
+                                            Mapping="Amend1:Accessibility,Identifier:7"/>
+            <Component Name="rerouting" Type="StrategyConfig"
+                                        Mapping="Amend1:Rerouting,Identifier:8"/>
+        </ComponentType>
+
+        <!--#################### STRATEGY END ####################-->
+
+        <!--#################### STREAM BEGIN ####################-->
+
+        <ComponentType Name="Streams" Description="associated to audio_stream_type_t definition,
+                             identifier mapping must match the value of the enum">
+            <Component Name="voice_call" Type="Stream" Mapping="Stream:VoiceCall,Identifier:0"/>
+            <Component Name="system" Type="Stream" Mapping="Stream:System,Identifier:1"/>
+            <Component Name="ring" Type="Stream" Mapping="Stream:Ring,Identifier:2"/>
+            <Component Name="music" Type="Stream" Mapping="Stream:Music,Identifier:3"/>
+            <Component Name="alarm" Type="Stream" Mapping="Stream:Alarm,Identifier:4"/>
+            <Component Name="notification" Type="Stream"
+                                           Mapping="Stream:Notification,Identifier:5"/>
+            <Component Name="bluetooth_sco" Type="Stream"
+                                            Mapping="Stream:BluetoothSco,Identifier:6"/>
+            <Component Name="enforced_audible" Type="Stream"
+                                               Mapping="Stream:EnforceAudible,Identifier:7"
+                       Description="Sounds that cannot be muted by user and must
+                                    be routed to speaker"/>
+            <Component Name="dtmf" Type="Stream" Mapping="Stream:Dtmf,Identifier:8"/>
+            <Component Name="tts" Type="Stream" Mapping="Stream:Tts,Identifier:9"
+                             Description="Transmitted Through Speaker.
+                                          Plays over speaker only, silent on other devices"/>
+            <Component Name="accessibility" Type="Stream"
+                                            Mapping="Stream:Accessibility,Identifier:10"
+                             Description="For accessibility talk back prompts"/>
+            <Component Name="rerouting" Type="Stream" Mapping="Stream:Rerouting,Identifier:11"
+                             Description="For dynamic policy output mixes"/>
+            <Component Name="patch" Type="Stream" Mapping="Stream:Patch,Identifier:12"
+                             Description="For internal audio flinger tracks. Fixed volume"/>
+        </ComponentType>
+
+        <!--#################### STREAM END ####################-->
+
+        <!--#################### USAGE BEGIN ####################-->
+
+        <ComponentType Name="Usages" Description="associated to audio_stream_type_t definition,
+                             identifier mapping must match the value of the enum">
+            <Component Name="unknown" Type="Usage" Mapping="Amend1:Unknown,Identifier:0"/>
+            <Component Name="media" Type="Usage" Mapping="Amend1:Media,Identifier:1"/>
+            <Component Name="voice_communication" Type="Usage"
+                                                  Mapping="Amend1:VoiceCommunication,Identifier:2"/>
+            <Component Name="voice_communication_signalling" Type="Usage"
+                       Mapping="Amend1:VoiceCommunicationSignalling,Identifier:3"/>
+            <Component Name="alarm" Type="Usage" Mapping="Amend1:Alarm,Identifier:4"/>
+            <Component Name="notification" Type="Usage" Mapping="Amend1:Notification,Identifier:5"/>
+            <Component Name="notification_telephony_ringtone" Type="Usage"
+                       Mapping="Amend1:NotificationTelephonyRingtone,Identifier:6"/>
+            <Component Name="notification_communication_request" Type="Usage"
+                       Mapping="Amend1:NotificationCommunicationRequest,Identifier:7"/>
+            <Component Name="notification_communication_instant" Type="Usage"
+                       Mapping="Amend1:NotificationCommunicationInstant,Identifier:8"/>
+            <Component Name="notification_communication_delayed" Type="Usage"
+                       Mapping="Amend1:NotificationCommunicationDelated,Identifier:9"/>
+            <Component Name="notification_event" Type="Usage"
+                                                 Mapping="Amend1:NotificationEvent,Identifier:10"/>
+            <Component Name="assistance_accessibility" Type="Usage"
+                       Mapping="Amend1:AssistanceAccessibility,Identifier:11"/>
+            <Component Name="assistance_navigation_guidance" Type="Usage"
+                       Mapping="Amend1:AssistanceNavigationGuidance,Identifier:12"/>
+            <Component Name="assistance_sonification" Type="Usage"
+                       Mapping="Amend1:AssistanceSonification,Identifier:13"/>
+            <Component Name="game" Type="Usage" Mapping="Amend1:BluetoothSco,Identifier:14"/>
+            <Component Name="virtual_source" Type="Usage"
+                                             Mapping="Amend1:VirtualSource,Identifier:15"/>
+        </ComponentType>
+
+        <!--#################### USAGE END ####################-->
+
+        <!--#################### INPUT SOURCE BEGIN ####################-->
+
+        <ComponentType Name="InputSources" Description="associated to audio_source_t definition,
+                             identifier mapping must match the value of the enum">
+            <Component Name="default" Type="InputSource" Mapping="Amend1:Default,Identifier:0"/>
+            <Component Name="mic" Type="InputSource" Mapping="Amend1:Mic,Identifier:1"/>
+            <Component Name="voice_uplink" Type="InputSource"
+                                           Mapping="Amend1:VoiceUplink,Identifier:2"/>
+            <Component Name="voice_downlink" Type="InputSource"
+                                             Mapping="Amend1:VoiceDownlink,Identifier:3"/>
+            <Component Name="voice_call" Type="InputSource"
+                                         Mapping="Amend1:VoiceCall,Identifier:4"/>
+            <Component Name="camcorder" Type="InputSource" Mapping="Amend1:Camcorder,Identifier:5"/>
+            <Component Name="voice_recognition" Type="InputSource"
+                                                Mapping="Amend1:VoiceRecognition,Identifier:6"/>
+            <Component Name="voice_communication" Type="InputSource"
+                                                  Mapping="Amend1:VoiceCommunication,Identifier:7"/>
+            <Component Name="remote_submix" Type="InputSource"
+                                            Mapping="Amend1:RemoteSubmix,Identifier:8"/>
+            <Component Name="unprocessed" Type="InputSource"
+                                            Mapping="Amend1:Unprocessed,Identifier:9"/>
+            <Component Name="fm_tuner" Type="InputSource" Mapping="Amend1:FmTuner,Identifier:1998"/>
+            <Component Name="hotword" Type="InputSource" Mapping="Amend1:Hotword,Identifier:1999"/>
+        </ComponentType>
+
+        <!--#################### INPUT SOURCE END ####################-->
+
+    </ComponentLibrary>
+
+    <InstanceDefinition>
+        <Component Name="streams" Type="Streams"/>
+        <Component Name="strategies" Type="Strategies"/>
+        <Component Name="input_sources" Type="InputSources"/>
+        <Component Name="usages" Type="Usages"/>
+    </InstanceDefinition>
+</Subsystem>
diff --git a/common/audio/stub/parameter-framework/policy_criteria.txt b/common/audio/stub/parameter-framework/policy_criteria.txt
new file mode 100644
index 000000000..480cbe1cd
--- /dev/null
+++ b/common/audio/stub/parameter-framework/policy_criteria.txt
@@ -0,0 +1,10 @@
+ExclusiveCriterion TelephonyMode                :   Normal          RingTone                InCall              InCommunication
+InclusiveCriterion AvailableInputDevices        :   Communication Ambient BuiltinMic BluetoothScoHeadset WiredHeadset Hdmi TelephonyRx BackMic RemoteSubmix AnlgDockHeadset DgtlDockHeadset UsbAccessory UsbDevice FmTuner TvTuner Line Spdif BluetoothA2dp Loopback Ip Bus Stub
+InclusiveCriterion AvailableOutputDevices       :   Earpiece Speaker WiredSpeaker WiredHeadset WiredHeadphone BluetoothSco BluetoothScoHeadset BluetoothScoCarkit BluetoothA2dp BluetoothA2dpHeadphones BluetoothA2dpSpeaker Hdmi AnlgDockHeadset DgtlDockHeadset UsbAccessory UsbDevice RemoteSubmix TelephonyTx Line HdmiArc Spdif Fm AuxLine SpeakerSafe Ip Bus Stub
+ExclusiveCriterion ForceUseForCommunication     :   ForceNone       ForceSpeaker            ForceBtSco
+ExclusiveCriterion ForceUseForMedia             :   ForceNone       ForceSpeaker			ForceHeadphones         ForceBtA2dp         ForceWiredAccessory ForceAnalogDock ForceDigitalDock    ForceNoBtA2dp       ForceSystemEnforced
+ExclusiveCriterion ForceUseForRecord            :   ForceNone       ForceBtSco              ForceWiredAccessory
+ExclusiveCriterion ForceUseForDock              :   ForceNone       ForceWiredAccessory     ForceBtCarDock      ForceBtDeskDock     ForceAnalogDock ForceDigitalDock
+ExclusiveCriterion ForceUseForSystem            :   ForceNone       ForceSystemEnforced
+ExclusiveCriterion ForceUseForHdmiSystemAudio   :   ForceNone       ForceHdmiSystemEnforced
+ExclusiveCriterion ForceUseForEncodedSurround   :   ForceNone       ForceEncodedSurroundNever   ForceEncodedSurroundAlways

From 82b21bc1992b88e88c228ce060bc38a9167fe402 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Fri, 16 Jun 2017 16:01:22 +0530
Subject: [PATCH 109/427] Revert "Audio: Add support for configurable audio
 policy of stub"

Reverting this commit as it causes build failure.

This reverts commit 0a71538e78c6ca18bf2f520fbefe94d688cfa255.
---
 common/audio/AndroidBoard.mk                  |     2 +-
 common/audio/stub/audiopolicy.mk              |     3 -
 .../stub/parameter-framework/AndroidBoard.mk  |   170 -
 ...rameterFrameworkConfigurationPolicy.xml.in |    14 -
 .../audio/stub/parameter-framework/README.md  |    11 -
 .../Settings/PolicyConfigurableDomains.xml    | 10228 ----------------
 .../Settings/device_for_input_source.pfw      |   578 -
 .../device_for_strategy_accessibility.pfw     |   610 -
 .../Settings/device_for_strategy_dtmf.pfw     |   640 -
 .../device_for_strategy_enforced_audible.pfw  |   368 -
 .../Settings/device_for_strategy_media.pfw    |   352 -
 .../Settings/device_for_strategy_phone.pfw    |   497 -
 .../device_for_strategy_rerouting.pfw         |   313 -
 .../device_for_strategy_sonification.pfw      |   504 -
 ...e_for_strategy_sonification_respectful.pfw |   549 -
 ...r_strategy_transmitted_through_speaker.pfw |    42 -
 .../Settings/strategy_for_stream.pfw          |    19 -
 .../Settings/strategy_for_usage.pfw           |    38 -
 .../parameter-framework/Settings/volumes.pfw  |    26 -
 .../device_for_input_source.pfw               |   283 -
 .../device_for_strategies.pfw                 |   254 -
 .../Structure/PolicyClass.xml                 |     5 -
 .../Structure/PolicySubsystem-CommonTypes.xml |   198 -
 .../Structure/PolicySubsystem.xml             |   139 -
 .../parameter-framework/policy_criteria.txt   |    10 -
 25 files changed, 1 insertion(+), 15852 deletions(-)
 delete mode 100644 common/audio/stub/audiopolicy.mk
 delete mode 100644 common/audio/stub/parameter-framework/AndroidBoard.mk
 delete mode 100644 common/audio/stub/parameter-framework/ParameterFrameworkConfigurationPolicy.xml.in
 delete mode 100644 common/audio/stub/parameter-framework/README.md
 delete mode 100644 common/audio/stub/parameter-framework/Settings/PolicyConfigurableDomains.xml
 delete mode 100644 common/audio/stub/parameter-framework/Settings/device_for_input_source.pfw
 delete mode 100644 common/audio/stub/parameter-framework/Settings/device_for_strategy_accessibility.pfw
 delete mode 100644 common/audio/stub/parameter-framework/Settings/device_for_strategy_dtmf.pfw
 delete mode 100644 common/audio/stub/parameter-framework/Settings/device_for_strategy_enforced_audible.pfw
 delete mode 100644 common/audio/stub/parameter-framework/Settings/device_for_strategy_media.pfw
 delete mode 100644 common/audio/stub/parameter-framework/Settings/device_for_strategy_phone.pfw
 delete mode 100644 common/audio/stub/parameter-framework/Settings/device_for_strategy_rerouting.pfw
 delete mode 100644 common/audio/stub/parameter-framework/Settings/device_for_strategy_sonification.pfw
 delete mode 100644 common/audio/stub/parameter-framework/Settings/device_for_strategy_sonification_respectful.pfw
 delete mode 100644 common/audio/stub/parameter-framework/Settings/device_for_strategy_transmitted_through_speaker.pfw
 delete mode 100644 common/audio/stub/parameter-framework/Settings/strategy_for_stream.pfw
 delete mode 100644 common/audio/stub/parameter-framework/Settings/strategy_for_usage.pfw
 delete mode 100644 common/audio/stub/parameter-framework/Settings/volumes.pfw
 delete mode 100644 common/audio/stub/parameter-framework/SettingsNoInput/device_for_input_source.pfw
 delete mode 100644 common/audio/stub/parameter-framework/SettingsNoOutput/device_for_strategies.pfw
 delete mode 100644 common/audio/stub/parameter-framework/Structure/PolicyClass.xml
 delete mode 100644 common/audio/stub/parameter-framework/Structure/PolicySubsystem-CommonTypes.xml
 delete mode 100644 common/audio/stub/parameter-framework/Structure/PolicySubsystem.xml
 delete mode 100644 common/audio/stub/parameter-framework/policy_criteria.txt

diff --git a/common/audio/AndroidBoard.mk b/common/audio/AndroidBoard.mk
index 65adf092b..0da940533 100644
--- a/common/audio/AndroidBoard.mk
+++ b/common/audio/AndroidBoard.mk
@@ -185,5 +185,5 @@ endif
 ###########################################
 
 ifeq ($(USE_CONFIGURABLE_AUDIO_POLICY), 1)
-include device/intel/android_ia/common/audio/$(AUDIO_HARDWARE)/audiopolicy.mk
+include device/intel/android_ia/common/audio/reference_configurable_audio_policy/AndroidBoard.mk
 endif
diff --git a/common/audio/stub/audiopolicy.mk b/common/audio/stub/audiopolicy.mk
deleted file mode 100644
index 6da16622a..000000000
--- a/common/audio/stub/audiopolicy.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-pfw_rebuild_settings ?= true
-include $(LOCAL_PATH)/parameter-framework/AndroidBoard.mk
diff --git a/common/audio/stub/parameter-framework/AndroidBoard.mk b/common/audio/stub/parameter-framework/AndroidBoard.mk
deleted file mode 100644
index 4d598b9f9..000000000
--- a/common/audio/stub/parameter-framework/AndroidBoard.mk
+++ /dev/null
@@ -1,170 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-ifeq ($(USE_CONFIGURABLE_AUDIO_POLICY), 1)
-
-POLICY_NO_INPUT  := 0
-POLICY_NO_OUTPUT := 0
-
-PFW_CORE := external/parameter-framework
-BUILD_PFW_SETTINGS := $(PFW_CORE)/support/android/build_pfw_settings.mk
-PFW_DEFAULT_SCHEMAS_DIR := $(PFW_CORE)/upstream/schemas
-PFW_SCHEMAS_DIR := $(PFW_DEFAULT_SCHEMAS_DIR)
-
-##################################################################
-# CONFIGURATION FILES
-##################################################################
-######### Policy PFW top level file #########
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := ParameterFrameworkConfigurationPolicy.xml
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/parameter-framework
-LOCAL_SRC_FILES := $(LOCAL_MODULE).in
-
-AUDIO_PATTERN = @TUNING_ALLOWED@
-ifeq ($(TARGET_BUILD_VARIANT),user)
-AUDIO_VALUE = false
-else
-AUDIO_VALUE = true
-
-LOCAL_REQUIRED_MODULES := \
-     libremote-processor \
-     remote-process \
-
-endif
-
-LOCAL_POST_INSTALL_CMD := $(hide) sed -i -e 's|$(AUDIO_PATTERN)|$(AUDIO_VALUE)|g' $(LOCAL_MODULE_PATH)/$(LOCAL_MODULE)
-
-include $(BUILD_PREBUILT)
-
-
-########## Policy PFW Structures #########
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := PolicyClass.xml
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/parameter-framework/Structure/Policy
-LOCAL_SRC_FILES := Structure/$(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := PolicySubsystem.xml
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_REQUIRED_MODULES := \
-    PolicySubsystem-CommonTypes.xml \
-    PolicySubsystem-Volume.xml \
-    libpolicy-subsystem \
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/parameter-framework/Structure/Policy
-LOCAL_SRC_FILES := Structure/$(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := PolicySubsystem-CommonTypes.xml
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/parameter-framework/Structure/Policy
-LOCAL_SRC_FILES := Structure/$(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-
-ifneq ($(POLICY_NO_INPUT),1)
-ifneq ($(POLICY_NO_OUTPUT),1)
-######### Policy PFW Settings #########
-include $(CLEAR_VARS)
-LOCAL_MODULE := parameter-framework.policy
-LOCAL_MODULE_STEM := PolicyConfigurableDomains.xml
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy
-LOCAL_ADDITIONAL_DEPENDENCIES := \
-        PolicyClass.xml \
-        PolicySubsystem.xml \
-        ParameterFrameworkConfigurationPolicy.xml
-
-ifeq ($(pfw_rebuild_settings),true)
-PFW_TOPLEVEL_FILE := $(TARGET_OUT_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml
-PFW_CRITERIA_FILE := $(LOCAL_PATH)/policy_criteria.txt
-PFW_EDD_FILES := \
-        $(LOCAL_PATH)/Settings/device_for_strategy_media.pfw \
-        $(LOCAL_PATH)/Settings/device_for_strategy_phone.pfw \
-        $(LOCAL_PATH)/Settings/device_for_strategy_sonification.pfw \
-        $(LOCAL_PATH)/Settings/device_for_strategy_sonification_respectful.pfw \
-        $(LOCAL_PATH)/Settings/device_for_strategy_dtmf.pfw \
-        $(LOCAL_PATH)/Settings/device_for_strategy_enforced_audible.pfw \
-        $(LOCAL_PATH)/Settings/device_for_strategy_transmitted_through_speaker.pfw \
-        $(LOCAL_PATH)/Settings/device_for_strategy_accessibility.pfw \
-        $(LOCAL_PATH)/Settings/device_for_strategy_rerouting.pfw \
-        $(LOCAL_PATH)/Settings/strategy_for_stream.pfw \
-        $(LOCAL_PATH)/Settings/strategy_for_usage.pfw \
-        $(LOCAL_PATH)/Settings/device_for_input_source.pfw \
-        $(LOCAL_PATH)/Settings/volumes.pfw
-
-include $(BUILD_PFW_SETTINGS)
-else
-# Use the existing file
-LOCAL_SRC_FILES := Settings/$(LOCAL_MODULE_STEM)
-include $(BUILD_PREBUILT)
-endif # pfw_rebuild_settings
-
-endif # NO_INPUT
-endif # NO_OUPUT
-
-######### Policy PFW Settings - No Output #########
-ifeq ($(POLICY_NO_OUTPUT),1)
-include $(CLEAR_VARS)
-LOCAL_MODULE := parameter-framework.policy.no-output
-LOCAL_MODULE_STEM := PolicyConfigurableDomains-NoOutputDevice.xml
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy
-LOCAL_ADDITIONAL_DEPENDENCIES := \
-        PolicyClass.xml \
-        PolicySubsystem.xml \
-        ParameterFrameworkConfigurationPolicy.xml
-
-PFW_TOPLEVEL_FILE := $(TARGET_OUT_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml
-PFW_CRITERIA_FILE := $(LOCAL_PATH)/policy_criteria.txt
-PFW_EDD_FILES := \
-        $(LOCAL_PATH)/SettingsNoOutput/device_for_strategies.pfw \
-        $(LOCAL_PATH)/Settings/strategy_for_stream.pfw \
-        $(LOCAL_PATH)/Settings/strategy_for_usage.pfw \
-        $(LOCAL_PATH)/Settings/device_for_input_source.pfw \
-        $(LOCAL_PATH)/Settings/volumes.pfw
-
-include $(BUILD_PFW_SETTINGS)
-endif # NO_OUTPUT
-
-######### Policy PFW Settings - No Input #########
-ifeq ($(POLICY_NO_INPUT),1)
-include $(CLEAR_VARS)
-LOCAL_MODULE := parameter-framework.policy.no-input
-LOCAL_MODULE_STEM := PolicyConfigurableDomains-NoInputDevice.xml
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy
-LOCAL_ADDITIONAL_DEPENDENCIES := \
-        PolicyClass.xml \
-        PolicySubsystem.xml \
-        ParameterFrameworkConfigurationPolicy.xml
-
-PFW_TOPLEVEL_FILE := $(TARGET_OUT_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml
-PFW_CRITERIA_FILE := $(LOCAL_PATH)/policy_criteria.txt
-PFW_EDD_FILES := \
-        $(LOCAL_PATH)/Settings/device_for_strategy_media.pfw \
-        $(LOCAL_PATH)/Settings/device_for_strategy_phone.pfw \
-        $(LOCAL_PATH)/Settings/device_for_strategy_sonification.pfw \
-        $(LOCAL_PATH)/Settings/device_for_strategy_sonification_respectful.pfw \
-        $(LOCAL_PATH)/Settings/device_for_strategy_dtmf.pfw \
-        $(LOCAL_PATH)/Settings/device_for_strategy_enforced_audible.pfw \
-        $(LOCAL_PATH)/Settings/device_for_strategy_transmitted_through_speaker.pfw \
-        $(LOCAL_PATH)/Settings/device_for_strategy_accessibility.pfw \
-        $(LOCAL_PATH)/Settings/device_for_strategy_rerouting.pfw \
-        $(LOCAL_PATH)/Settings/strategy_for_stream.pfw \
-        $(LOCAL_PATH)/Settings/strategy_for_usage.pfw \
-        $(LOCAL_PATH)/SettingsNoInput/device_for_input_source.pfw \
-        $(LOCAL_PATH)/Settings/volumes.pfw
-
-include $(BUILD_PFW_SETTINGS)
-endif # NO_INPUT
-
-endif # USE_CONFIGURABLE_AUDIO_POLICY
diff --git a/common/audio/stub/parameter-framework/ParameterFrameworkConfigurationPolicy.xml.in b/common/audio/stub/parameter-framework/ParameterFrameworkConfigurationPolicy.xml.in
deleted file mode 100644
index f5615cd52..000000000
--- a/common/audio/stub/parameter-framework/ParameterFrameworkConfigurationPolicy.xml.in
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ParameterFrameworkConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    SystemClassName="Policy" ServerPort="5019" TuningAllowed="@TUNING_ALLOWED@">
-
-    <SubsystemPlugins>
-        <Location Folder="">
-            <Plugin Name="libpolicy-subsystem.so"/>
-        </Location>
-    </SubsystemPlugins>
-    <StructureDescriptionFileLocation Path="Structure/Policy/PolicyClass.xml"/>
-    <SettingsConfiguration>
-        <ConfigurableDomainsFileLocation Path="Settings/Policy/PolicyConfigurableDomains.xml"/>
-    </SettingsConfiguration>
-</ParameterFrameworkConfiguration>
diff --git a/common/audio/stub/parameter-framework/README.md b/common/audio/stub/parameter-framework/README.md
deleted file mode 100644
index 92668e1ec..000000000
--- a/common/audio/stub/parameter-framework/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Configurable Policy Engine Example
-================================
-
-This folder exposes a generic functional configurable policy engine configuration files
-to provide to have a product following the nexus experience.
-
-A vendor wishing to customize the behavior shall provides its own set of configuration files
-within the device folder for the product to customize.
-
-For any question about the parameter framework and configuration files,
-See [the wiki on github](https://github.com/01org/parameter-framework/wiki).
diff --git a/common/audio/stub/parameter-framework/Settings/PolicyConfigurableDomains.xml b/common/audio/stub/parameter-framework/Settings/PolicyConfigurableDomains.xml
deleted file mode 100644
index aa2af0ff2..000000000
--- a/common/audio/stub/parameter-framework/Settings/PolicyConfigurableDomains.xml
+++ /dev/null
@@ -1,10228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- #### DO NOT EDIT THIS FILE #### -->
-<ConfigurableDomains SystemClassName="Policy">
-  <ConfigurableDomain Name="DeviceForStrategy.Media.UnreachableDevices" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="Calibration">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/fm"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker_safe"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/earpiece"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_sco"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_sco_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_sco_carkit"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/telephony_tx"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/ip"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bus"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/stub"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="Calibration">
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/fm">
-          <BitParameter Name="fm">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker_safe">
-          <BitParameter Name="speaker_safe">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/ip">
-          <BitParameter Name="ip">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bus">
-          <BitParameter Name="bus">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/stub">
-          <BitParameter Name="stub">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.Media.Device2" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="RemoteSubmix">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="RemoteSubmix"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothA2dp">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceBtSco"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpHeadphone">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceBtSco"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpSpeaker">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceBtSco"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="ForceSpeaker">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceSpeaker"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForHdmiSystemAudio" MatchesWhen="IsNot" Value="ForceHdmiSystemEnforced"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="WiredHeadphone">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Line">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="WiredHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="UsbAccessory">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbAccessory"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="UsbDevice">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="DgtlDockHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="DgtlDockHeadset"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="AuxDigital">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Hdmi"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="AnlgDockHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AnlgDockHeadset"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForDock" MatchesWhen="Is" Value="ForceAnalogDock"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Speaker">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForHdmiSystemAudio" MatchesWhen="IsNot" Value="ForceHdmiSystemEnforced"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceBtSco"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Default">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="RemoteSubmix">
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothA2dp">
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpHeadphone">
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpSpeaker">
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="ForceSpeaker">
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="WiredHeadphone">
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Line">
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
-          <BitParameter Name="line">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="WiredHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="UsbAccessory">
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="UsbDevice">
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="DgtlDockHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="AuxDigital">
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="AnlgDockHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Speaker">
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Default">
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.Media.Arc" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="Selected">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="HdmiArc"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="NotSelected">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi_arc"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="Selected">
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi_arc">
-          <BitParameter Name="hdmi_arc">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="NotSelected">
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/hdmi_arc">
-          <BitParameter Name="hdmi_arc">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.Media.Spdif" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="Selected">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Spdif"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="NotSelected">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/spdif"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="Selected">
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/spdif">
-          <BitParameter Name="spdif">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="NotSelected">
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/spdif">
-          <BitParameter Name="spdif">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.Media.AuxLine" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="Selected">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AuxLine"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="NotSelected">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/aux_line"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="Selected">
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/aux_line">
-          <BitParameter Name="aux_line">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="NotSelected">
-        <ConfigurableElement Path="/Policy/policy/strategies/media/selected_output_devices/mask/aux_line">
-          <BitParameter Name="aux_line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.Phone.UnreachableDevices" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="Calibration">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/remote_submix"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi_arc"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/aux_line"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/spdif"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/fm"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker_safe"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/ip"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bus"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/stub"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="Calibration">
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi_arc">
-          <BitParameter Name="hdmi_arc">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/aux_line">
-          <BitParameter Name="aux_line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/spdif">
-          <BitParameter Name="spdif">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/fm">
-          <BitParameter Name="fm">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker_safe">
-          <BitParameter Name="speaker_safe">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/ip">
-          <BitParameter Name="ip">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bus">
-          <BitParameter Name="bus">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/stub">
-          <BitParameter Name="stub">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.Phone.Device" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="ScoCarkit">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoCarkit"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothScoHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoHeadset"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothSco">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothSco"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothA2dp">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceNone"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpHeadphones">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceNone"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpSpeaker">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="WiredHeadphone">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="WiredHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Line">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="UsbDevice">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
-          <CompoundRule Type="Any">
-            <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
-            <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceNone"/>
-            <CompoundRule Type="All">
-              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
-              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="UsbAccessory"/>
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-            </CompoundRule>
-          </CompoundRule>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="UsbAccessory">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbAccessory"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="DgtlDockHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="DgtlDockHeadset"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Hdmi">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Hdmi"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="AnlgDockHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AnlgDockHeadset"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Earpiece">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Earpiece"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Speaker">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Default">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="ScoCarkit">
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothScoHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothSco">
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothA2dp">
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpHeadphones">
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpSpeaker">
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="WiredHeadphone">
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="WiredHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Line">
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
-          <BitParameter Name="line">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="UsbDevice">
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="UsbAccessory">
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="DgtlDockHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Hdmi">
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="AnlgDockHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Earpiece">
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Speaker">
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Default">
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.Sonification.UnreachableDevices" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="Calibration">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/remote_submix"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/hdmi_arc"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/spdif"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/fm"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/speaker_safe"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/aux_line"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/hdmi"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/ip"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bus"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/stub"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="Calibration">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/hdmi_arc">
-          <BitParameter Name="hdmi_arc">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/spdif">
-          <BitParameter Name="spdif">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/fm">
-          <BitParameter Name="fm">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/speaker_safe">
-          <BitParameter Name="speaker_safe">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/aux_line">
-          <BitParameter Name="aux_line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/ip">
-          <BitParameter Name="ip">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bus">
-          <BitParameter Name="bus">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/stub">
-          <BitParameter Name="stub">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.Sonification.Speaker" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="Selected">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
-          <CompoundRule Type="Any">
-            <CompoundRule Type="All">
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-            </CompoundRule>
-            <CompoundRule Type="All">
-              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
-              <CompoundRule Type="Any">
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-              </CompoundRule>
-              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="Line"/>
-            </CompoundRule>
-          </CompoundRule>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="NotSelected">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/speaker"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="Selected">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="NotSelected">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.Sonification.Device2" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="BluetoothA2dp">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpHeadphones">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpSpeaker">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="ScoCarkit">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoCarkit"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="ScoHeadset">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoHeadset"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Sco">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothSco"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="WiredHeadphone">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
-          <CompoundRule Type="Any">
-            <CompoundRule Type="All">
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-            </CompoundRule>
-            <CompoundRule Type="All">
-              <CompoundRule Type="Any">
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-              </CompoundRule>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-            </CompoundRule>
-          </CompoundRule>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Line">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
-          <CompoundRule Type="Any">
-            <CompoundRule Type="All">
-              <CompoundRule Type="Any">
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-              </CompoundRule>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="WiredHeadset"/>
-            </CompoundRule>
-            <CompoundRule Type="All">
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-            </CompoundRule>
-          </CompoundRule>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="WiredHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
-          <CompoundRule Type="Any">
-            <CompoundRule Type="All">
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-            </CompoundRule>
-            <CompoundRule Type="All">
-              <CompoundRule Type="Any">
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-              </CompoundRule>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-            </CompoundRule>
-          </CompoundRule>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="UsbDevice">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
-          <CompoundRule Type="Any">
-            <CompoundRule Type="All">
-              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="UsbAccessory"/>
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-            </CompoundRule>
-            <CompoundRule Type="All">
-              <CompoundRule Type="Any">
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-              </CompoundRule>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-            </CompoundRule>
-          </CompoundRule>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="UsbAccessory">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbAccessory"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="DgtlDockHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="DgtlDockHeadset"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="AnlgDockHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AnlgDockHeadset"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForDock" MatchesWhen="Is" Value="ForceAnalogDock"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Earpiece">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Earpiece"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="None">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="BluetoothA2dp">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpHeadphones">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpSpeaker">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="ScoCarkit">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="ScoHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Sco">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="WiredHeadphone">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Line">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
-          <BitParameter Name="line">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="WiredHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="UsbDevice">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="UsbAccessory">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="DgtlDockHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="AnlgDockHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Earpiece">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="None">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.SonificationRespectful.UnreachableDevices" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="Calibration">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/remote_submix"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi_arc"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/aux_line"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/spdif"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/fm"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/telephony_tx"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/ip"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bus"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/stub"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="Calibration">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi_arc">
-          <BitParameter Name="hdmi_arc">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/aux_line">
-          <BitParameter Name="aux_line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/spdif">
-          <BitParameter Name="spdif">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/fm">
-          <BitParameter Name="fm">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/ip">
-          <BitParameter Name="ip">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bus">
-          <BitParameter Name="bus">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/stub">
-          <BitParameter Name="stub">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.SonificationRespectful.Speakers" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="SpeakerSafe">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="SpeakerSafe"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Speaker">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
-          <CompoundRule Type="Any">
-            <CompoundRule Type="All">
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-            </CompoundRule>
-            <CompoundRule Type="All">
-              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
-              <CompoundRule Type="Any">
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-              </CompoundRule>
-              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="Line"/>
-            </CompoundRule>
-          </CompoundRule>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="None">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/speaker_safe"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/speaker"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="SpeakerSafe">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/speaker_safe">
-          <BitParameter Name="speaker_safe">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Speaker">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/speaker_safe">
-          <BitParameter Name="speaker_safe">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="None">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/speaker_safe">
-          <BitParameter Name="speaker_safe">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.SonificationRespectful.Device2" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="BluetoothA2dp">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceNoBtA2dp"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpHeadphones">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceNoBtA2dp"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpSpeaker">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceNoBtA2dp"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothScoCarkit">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoCarkit"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothScoHeadset">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoHeadset"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothSco">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothSco"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="WiredHeadphone">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <CompoundRule Type="All">
-              <CompoundRule Type="Any">
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-              </CompoundRule>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-            </CompoundRule>
-            <CompoundRule Type="All">
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-            </CompoundRule>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Line">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <CompoundRule Type="All">
-              <CompoundRule Type="Any">
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-              </CompoundRule>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="WiredHeadset"/>
-            </CompoundRule>
-            <CompoundRule Type="All">
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-            </CompoundRule>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="WiredHeadset">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <CompoundRule Type="All">
-              <CompoundRule Type="Any">
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-              </CompoundRule>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-            </CompoundRule>
-            <CompoundRule Type="All">
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-            </CompoundRule>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="UsbDevice">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <CompoundRule Type="All">
-              <CompoundRule Type="Any">
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-              </CompoundRule>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-            </CompoundRule>
-            <CompoundRule Type="All">
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="UsbAccessory"/>
-            </CompoundRule>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="UsbAccessory">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbAccessory"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="DgtlDockHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="DgtlDockHeadset"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="AuxDigital">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Hdmi"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="AnlgDockHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForDock" MatchesWhen="Is" Value="ForceAnalogDock"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AnlgDockHeadset"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Earpiece">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Earpiece"/>
-        </CompoundRule>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="BluetoothA2dp">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpHeadphones">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpSpeaker">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothScoCarkit">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothScoHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothSco">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="WiredHeadphone">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Line">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
-          <BitParameter Name="line">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="WiredHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="UsbDevice">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="UsbAccessory">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="DgtlDockHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="AuxDigital">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="AnlgDockHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Earpiece">
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.Dtmf.UnreachableDevices" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="Calibration">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/fm"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker_safe"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_carkit"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/ip"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bus"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/stub"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="Calibration">
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/fm">
-          <BitParameter Name="fm">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker_safe">
-          <BitParameter Name="speaker_safe">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/ip">
-          <BitParameter Name="ip">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bus">
-          <BitParameter Name="bus">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/stub">
-          <BitParameter Name="stub">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.Dtmf.Device2" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="RemoteSubmix">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="RemoteSubmix"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothA2dp">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpHeadphones">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpSpeaker">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="ForceSpeakerWhenNotInCall">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceSpeaker"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForHdmiSystemAudio" MatchesWhen="IsNot" Value="ForceHdmiSystemEnforced"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothScoHeadset">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoHeadset"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothSco">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothSco"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="WiredHeadphone">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <CompoundRule Type="All">
-              <CompoundRule Type="Any">
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-              </CompoundRule>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-            </CompoundRule>
-            <CompoundRule Type="All">
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-            </CompoundRule>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Line">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <CompoundRule Type="All">
-              <CompoundRule Type="Any">
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-              </CompoundRule>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="WiredHeadset"/>
-            </CompoundRule>
-            <CompoundRule Type="All">
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-            </CompoundRule>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="WiredHeadset">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <CompoundRule Type="All">
-              <CompoundRule Type="Any">
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-              </CompoundRule>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-            </CompoundRule>
-            <CompoundRule Type="All">
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-            </CompoundRule>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="UsbDevice">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <CompoundRule Type="All">
-              <CompoundRule Type="Any">
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-              </CompoundRule>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-            </CompoundRule>
-            <CompoundRule Type="All">
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="UsbAccessory"/>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
-            </CompoundRule>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="UsbAccessory">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbAccessory"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="DgtlDockHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="DgtlDockHeadset"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Hdmi">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Hdmi"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="AnlgDockHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForDock" MatchesWhen="Is" Value="ForceAnalogDock"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AnlgDockHeadset"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Earpiece">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Earpiece"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Speaker">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <CompoundRule Type="All">
-              <CompoundRule Type="Any">
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-              </CompoundRule>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
-            </CompoundRule>
-            <CompoundRule Type="All">
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForHdmiSystemAudio" MatchesWhen="IsNot" Value="ForceHdmiSystemEnforced"/>
-            </CompoundRule>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Default">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="RemoteSubmix">
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothA2dp">
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpHeadphones">
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpSpeaker">
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="ForceSpeakerWhenNotInCall">
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothScoHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothSco">
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="WiredHeadphone">
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Line">
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
-          <BitParameter Name="line">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="WiredHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="UsbDevice">
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="UsbAccessory">
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="DgtlDockHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Hdmi">
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="AnlgDockHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Earpiece">
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Speaker">
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Default">
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.Dtmf.Arc" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="Selected">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="HdmiArc"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="NotSelected">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi_arc"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="Selected">
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi_arc">
-          <BitParameter Name="hdmi_arc">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="NotSelected">
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi_arc">
-          <BitParameter Name="hdmi_arc">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.Dtmf.Spdif" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="Selected">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Spdif"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="NotSelected">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/spdif"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="Selected">
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/spdif">
-          <BitParameter Name="spdif">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="NotSelected">
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/spdif">
-          <BitParameter Name="spdif">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.Dtmf.AuxLine" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="Selected">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AuxLine"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="NotSelected">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/aux_line"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="Selected">
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/aux_line">
-          <BitParameter Name="aux_line">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="NotSelected">
-        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/aux_line">
-          <BitParameter Name="aux_line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.EnforcedAudible.UnreachableDevices" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="Calibration">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi_arc"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/spdif"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/aux_line"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker_safe"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/ip"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bus"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/fm"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/stub"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="Calibration">
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi_arc">
-          <BitParameter Name="hdmi_arc">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/spdif">
-          <BitParameter Name="spdif">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/aux_line">
-          <BitParameter Name="aux_line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker_safe">
-          <BitParameter Name="speaker_safe">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/ip">
-          <BitParameter Name="ip">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bus">
-          <BitParameter Name="bus">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/fm">
-          <BitParameter Name="fm">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/stub">
-          <BitParameter Name="stub">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.EnforcedAudible.Speaker" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="Selected">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
-          <CompoundRule Type="Any">
-            <SelectionCriterionRule SelectionCriterion="ForceUseForSystem" MatchesWhen="Is" Value="ForceSystemEnforced"/>
-            <CompoundRule Type="All">
-              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceSpeaker"/>
-              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="RemoteSubmix"/>
-              <CompoundRule Type="Any">
-                <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
-                <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="BluetoothA2dp"/>
-                <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="BluetoothA2dpHeadphones"/>
-                <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="BluetoothA2dpSpeaker"/>
-              </CompoundRule>
-            </CompoundRule>
-            <CompoundRule Type="All">
-              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="RemoteSubmix"/>
-              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="WiredHeadphone"/>
-              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="Line"/>
-              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="WiredHeadset"/>
-              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="UsbAccessory"/>
-              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="UsbDevice"/>
-              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="DgtlDockHeadset"/>
-              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="Hdmi"/>
-              <CompoundRule Type="Any">
-                <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="AnlgDockHeadset"/>
-                <SelectionCriterionRule SelectionCriterion="ForceUseForDock" MatchesWhen="IsNot" Value="ForceAnalogDock"/>
-              </CompoundRule>
-            </CompoundRule>
-          </CompoundRule>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="NotSelected">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="Selected">
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="NotSelected">
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.EnforcedAudible.Device2" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="RemoteSubmix">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="RemoteSubmix"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothA2dp">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpHeadphones">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpSpeaker">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="WiredHeadphone">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Line">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="WiredHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="UsbAccessory">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbAccessory"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="UsbDevice">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="DgtlDockHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="DgtlDockHeadset"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Hdmi">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Hdmi"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="AnlgDockHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForDock" MatchesWhen="Is" Value="ForceAnalogDock"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AnlgDockHeadset"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="NoDevice">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="RemoteSubmix">
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothA2dp">
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpHeadphones">
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpSpeaker">
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="WiredHeadphone">
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Line">
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
-          <BitParameter Name="line">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="WiredHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="UsbAccessory">
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="UsbDevice">
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="DgtlDockHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Hdmi">
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="AnlgDockHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="NoDevice">
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/enforced_audible/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.TransmittedThroughSpeaker.UnreacheableDevices" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="Calibration">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/remote_submix"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/hdmi_arc"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/spdif"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/aux_line"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/fm"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/speaker_safe"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/earpiece"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/wired_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/wired_headphone"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_sco"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_sco_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_sco_carkit"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_a2dp"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/hdmi"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/angl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/dgtl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/usb_accessory"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/usb_device"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/telephony_tx"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/line"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/ip"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bus"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/stub"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="Calibration">
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/hdmi_arc">
-          <BitParameter Name="hdmi_arc">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/spdif">
-          <BitParameter Name="spdif">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/aux_line">
-          <BitParameter Name="aux_line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/fm">
-          <BitParameter Name="fm">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/speaker_safe">
-          <BitParameter Name="speaker_safe">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/ip">
-          <BitParameter Name="ip">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/bus">
-          <BitParameter Name="bus">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/stub">
-          <BitParameter Name="stub">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.TransmittedThroughSpeaker.Speaker" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="Selected">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="NotSelected">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/speaker"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="Selected">
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="NotSelected">
-        <ConfigurableElement Path="/Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.Accessibility.UnreachableDevices" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="Calibration">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi_arc"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/spdif"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/aux_line"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/fm"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker_safe"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/telephony_tx"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/ip"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bus"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/stub"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="Calibration">
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi_arc">
-          <BitParameter Name="hdmi_arc">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/spdif">
-          <BitParameter Name="spdif">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/aux_line">
-          <BitParameter Name="aux_line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/fm">
-          <BitParameter Name="fm">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker_safe">
-          <BitParameter Name="speaker_safe">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/ip">
-          <BitParameter Name="ip">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bus">
-          <BitParameter Name="bus">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/stub">
-          <BitParameter Name="stub">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.Accessibility.Device" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="RemoteSubmix">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="RemoteSubmix"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothA2dp">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpHeadphone">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpSpeaker">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="ForceSpeakerWhenNotInCall">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceSpeaker"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothScoCarkit">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoCarkit"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothScoHeadset">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothScoHeadset"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothSco">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothSco"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="WiredHeadphone">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <CompoundRule Type="All">
-              <CompoundRule Type="Any">
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-              </CompoundRule>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-            </CompoundRule>
-            <CompoundRule Type="All">
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-            </CompoundRule>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Line">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <CompoundRule Type="All">
-              <CompoundRule Type="Any">
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-              </CompoundRule>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="WiredHeadset"/>
-            </CompoundRule>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="WiredHeadset">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <CompoundRule Type="All">
-              <CompoundRule Type="Any">
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-              </CompoundRule>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-            </CompoundRule>
-            <CompoundRule Type="All">
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-            </CompoundRule>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="UsbDevice">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <CompoundRule Type="All">
-              <CompoundRule Type="Any">
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-              </CompoundRule>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-            </CompoundRule>
-            <CompoundRule Type="All">
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="UsbAccessory"/>
-              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
-            </CompoundRule>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="UsbAccessory">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbAccessory"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="DgtlDockHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="DgtlDockHeadset"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="AuxDigital">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Hdmi"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="AnlgDockHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AnlgDockHeadset"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForDock" MatchesWhen="Is" Value="ForceAnalogDock"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Earpiece">
-        <CompoundRule Type="All">
-          <CompoundRule Type="Any">
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-          </CompoundRule>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Earpiece"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Speaker">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Default">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="RemoteSubmix">
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothA2dp">
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpHeadphone">
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpSpeaker">
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="ForceSpeakerWhenNotInCall">
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothScoCarkit">
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothScoHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothSco">
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="WiredHeadphone">
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Line">
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
-          <BitParameter Name="line">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="WiredHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="UsbDevice">
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="UsbAccessory">
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="DgtlDockHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="AuxDigital">
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="AnlgDockHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Earpiece">
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Speaker">
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Default">
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/accessibility/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.Rerouting.UnreachableDevices" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="Calibration">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi_arc"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/spdif"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/aux_line"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/fm"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker_safe"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/earpiece"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_sco"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_sco_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_sco_carkit"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/telephony_tx"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/ip"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bus"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/stub"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="Calibration">
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi_arc">
-          <BitParameter Name="hdmi_arc">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/spdif">
-          <BitParameter Name="spdif">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/aux_line">
-          <BitParameter Name="aux_line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/fm">
-          <BitParameter Name="fm">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker_safe">
-          <BitParameter Name="speaker_safe">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/earpiece">
-          <BitParameter Name="earpiece">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_sco">
-          <BitParameter Name="bluetooth_sco">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_sco_carkit">
-          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/telephony_tx">
-          <BitParameter Name="telephony_tx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/ip">
-          <BitParameter Name="ip">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bus">
-          <BitParameter Name="bus">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/stub">
-          <BitParameter Name="stub">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForStrategy.Rerouting.Device2" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="RemoteSubmix">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="RemoteSubmix"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothA2dp">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpHeadphone">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpSpeaker">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="ForceSpeaker">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceSpeaker"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="WiredHeadphone">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Line">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="WiredHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="UsbAccessory">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbAccessory"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="UsbDevice">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="DgtlDockHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="DgtlDockHeadset"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="AuxDigital">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Hdmi"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="AnlgDockHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="AnlgDockHeadset"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForDock" MatchesWhen="Is" Value="ForceAnalogDock"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Speaker">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Default">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device"/>
-      <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="RemoteSubmix">
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothA2dp">
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpHeadphone">
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BluetoothA2dpSpeaker">
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="ForceSpeaker">
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="WiredHeadphone">
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Line">
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
-          <BitParameter Name="line">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="WiredHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="UsbAccessory">
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="UsbDevice">
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="DgtlDockHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="AuxDigital">
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="AnlgDockHeadset">
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Speaker">
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Default">
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_headphones">
-          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/bluetooth_a2dp_speaker">
-          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/speaker">
-          <BitParameter Name="speaker">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/wired_headphone">
-          <BitParameter Name="wired_headphone">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/angl_dock_headset">
-          <BitParameter Name="angl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/strategies/rerouting/selected_output_devices/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="StrategyForStream" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="Calibration">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/streams/voice_call/applicable_strategy/strategy"/>
-      <ConfigurableElement Path="/Policy/policy/streams/system/applicable_strategy/strategy"/>
-      <ConfigurableElement Path="/Policy/policy/streams/ring/applicable_strategy/strategy"/>
-      <ConfigurableElement Path="/Policy/policy/streams/music/applicable_strategy/strategy"/>
-      <ConfigurableElement Path="/Policy/policy/streams/alarm/applicable_strategy/strategy"/>
-      <ConfigurableElement Path="/Policy/policy/streams/notification/applicable_strategy/strategy"/>
-      <ConfigurableElement Path="/Policy/policy/streams/bluetooth_sco/applicable_strategy/strategy"/>
-      <ConfigurableElement Path="/Policy/policy/streams/enforced_audible/applicable_strategy/strategy"/>
-      <ConfigurableElement Path="/Policy/policy/streams/dtmf/applicable_strategy/strategy"/>
-      <ConfigurableElement Path="/Policy/policy/streams/tts/applicable_strategy/strategy"/>
-      <ConfigurableElement Path="/Policy/policy/streams/accessibility/applicable_strategy/strategy"/>
-      <ConfigurableElement Path="/Policy/policy/streams/rerouting/applicable_strategy/strategy"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="Calibration">
-        <ConfigurableElement Path="/Policy/policy/streams/voice_call/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">phone</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/streams/system/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">media</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/streams/ring/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">sonification</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/streams/music/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">media</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/streams/alarm/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">sonification</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/streams/notification/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">sonification_respectful</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/streams/bluetooth_sco/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">phone</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/streams/enforced_audible/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">enforced_audible</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/streams/dtmf/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">dtmf</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/streams/tts/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">transmitted_through_speaker</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/streams/accessibility/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">accessibility</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/streams/rerouting/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">rerouting</EnumParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="SelectedStrategyForUsages.Calibration" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="Calibration">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/usages/unknown/applicable_strategy/strategy"/>
-      <ConfigurableElement Path="/Policy/policy/usages/media/applicable_strategy/strategy"/>
-      <ConfigurableElement Path="/Policy/policy/usages/voice_communication/applicable_strategy/strategy"/>
-      <ConfigurableElement Path="/Policy/policy/usages/voice_communication_signalling/applicable_strategy/strategy"/>
-      <ConfigurableElement Path="/Policy/policy/usages/alarm/applicable_strategy/strategy"/>
-      <ConfigurableElement Path="/Policy/policy/usages/notification/applicable_strategy/strategy"/>
-      <ConfigurableElement Path="/Policy/policy/usages/notification_telephony_ringtone/applicable_strategy/strategy"/>
-      <ConfigurableElement Path="/Policy/policy/usages/notification_communication_request/applicable_strategy/strategy"/>
-      <ConfigurableElement Path="/Policy/policy/usages/notification_communication_instant/applicable_strategy/strategy"/>
-      <ConfigurableElement Path="/Policy/policy/usages/notification_communication_delayed/applicable_strategy/strategy"/>
-      <ConfigurableElement Path="/Policy/policy/usages/notification_event/applicable_strategy/strategy"/>
-      <ConfigurableElement Path="/Policy/policy/usages/assistance_navigation_guidance/applicable_strategy/strategy"/>
-      <ConfigurableElement Path="/Policy/policy/usages/assistance_sonification/applicable_strategy/strategy"/>
-      <ConfigurableElement Path="/Policy/policy/usages/game/applicable_strategy/strategy"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="Calibration">
-        <ConfigurableElement Path="/Policy/policy/usages/unknown/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">media</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/usages/media/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">media</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/usages/voice_communication/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">phone</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/usages/voice_communication_signalling/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">dtmf</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/usages/alarm/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">sonification</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/usages/notification/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">sonification_respectful</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/usages/notification_telephony_ringtone/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">sonification</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/usages/notification_communication_request/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">sonification_respectful</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/usages/notification_communication_instant/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">sonification_respectful</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/usages/notification_communication_delayed/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">sonification_respectful</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/usages/notification_event/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">sonification_respectful</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/usages/assistance_navigation_guidance/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">media</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/usages/assistance_sonification/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">media</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/usages/game/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">media</EnumParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="SelectedStrategyForUsages.AssistanceAccessibility" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="Sonification">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="RingTone"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Phone">
-        <CompoundRule Type="Any">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Accessibility">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/usages/assistance_accessibility/applicable_strategy/strategy"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="Sonification">
-        <ConfigurableElement Path="/Policy/policy/usages/assistance_accessibility/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">sonification</EnumParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Phone">
-        <ConfigurableElement Path="/Policy/policy/usages/assistance_accessibility/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">phone</EnumParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Accessibility">
-        <ConfigurableElement Path="/Policy/policy/usages/assistance_accessibility/applicable_strategy/strategy">
-          <EnumParameter Name="strategy">accessibility</EnumParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForInputSource.Calibration" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="Calibration">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/communication"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/ambient"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/hdmi"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/telephony_rx"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/back_mic"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/remote_submix"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/anlg_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/dgtl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_accessory"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/fm_tuner"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/tv_tuner"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/line"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/spdif"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/loopback"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/ip"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bus"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/stub"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/communication"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/ambient"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/hdmi"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/telephony_rx"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/back_mic"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/remote_submix"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/anlg_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/dgtl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_accessory"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/fm_tuner"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/tv_tuner"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/line"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/spdif"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/loopback"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/ip"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bus"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/stub"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/communication"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/ambient"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/builtin_mic"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/bluetooth_sco_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/wired_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/hdmi"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/back_mic"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/remote_submix"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/anlg_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/dgtl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/usb_accessory"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/usb_device"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/fm_tuner"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/tv_tuner"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/line"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/spdif"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/bluetooth_a2dp"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/loopback"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/ip"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/bus"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/stub"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/communication"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/ambient"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/builtin_mic"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/bluetooth_sco_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/wired_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/hdmi"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/back_mic"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/remote_submix"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/anlg_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/dgtl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/usb_accessory"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/usb_device"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/fm_tuner"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/tv_tuner"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/line"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/spdif"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/bluetooth_a2dp"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/loopback"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/ip"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/bus"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/stub"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/communication"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/ambient"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/builtin_mic"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/bluetooth_sco_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/wired_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/hdmi"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/back_mic"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/remote_submix"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/anlg_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/dgtl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/usb_accessory"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/usb_device"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/fm_tuner"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/tv_tuner"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/line"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/spdif"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/bluetooth_a2dp"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/loopback"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/ip"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/bus"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/stub"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/communication"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/ambient"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/bluetooth_sco_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/wired_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/hdmi"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/telephony_rx"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/remote_submix"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/anlg_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/dgtl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/usb_accessory"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/usb_device"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/fm_tuner"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/tv_tuner"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/line"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/spdif"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/bluetooth_a2dp"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/loopback"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/ip"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/bus"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/stub"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/communication"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/ambient"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/hdmi"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/telephony_rx"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/back_mic"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/remote_submix"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/anlg_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/dgtl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/usb_accessory"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/fm_tuner"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/tv_tuner"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/line"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/spdif"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bluetooth_a2dp"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/loopback"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/ip"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bus"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/stub"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/communication"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/ambient"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/hdmi"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/telephony_rx"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/remote_submix"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/anlg_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/dgtl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_accessory"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/fm_tuner"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/tv_tuner"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/line"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/spdif"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_a2dp"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/loopback"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/ip"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bus"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/stub"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/communication"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/ambient"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/builtin_mic"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/bluetooth_sco_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/wired_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/hdmi"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/telephony_rx"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/back_mic"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/anlg_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/dgtl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/usb_accessory"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/usb_device"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/fm_tuner"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/tv_tuner"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/line"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/spdif"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/bluetooth_a2dp"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/loopback"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/ip"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/bus"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/stub"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/communication"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/ambient"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/hdmi"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/telephony_rx"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/back_mic"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/remote_submix"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/anlg_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/dgtl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/usb_accessory"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/fm_tuner"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/tv_tuner"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/line"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/spdif"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_a2dp"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/loopback"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/ip"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bus"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/stub"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/communication"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/ambient"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/hdmi"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/telephony_rx"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/back_mic"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/remote_submix"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/anlg_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/dgtl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/usb_accessory"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/fm_tuner"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/tv_tuner"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/line"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/spdif"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/bluetooth_a2dp"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/loopback"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/ip"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/bus"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/stub"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/communication"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/ambient"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/bluetooth_sco_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/hdmi"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/telephony_rx"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/builtin_mic"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/wired_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/back_mic"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/remote_submix"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/anlg_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/dgtl_dock_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/usb_accessory"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/usb_device"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/tv_tuner"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/line"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/spdif"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/bluetooth_a2dp"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/loopback"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/ip"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/bus"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="Calibration">
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/communication">
-          <BitParameter Name="communication">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/ambient">
-          <BitParameter Name="ambient">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/telephony_rx">
-          <BitParameter Name="telephony_rx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/back_mic">
-          <BitParameter Name="back_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/anlg_dock_headset">
-          <BitParameter Name="anlg_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/fm_tuner">
-          <BitParameter Name="fm_tuner">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/tv_tuner">
-          <BitParameter Name="tv_tuner">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/spdif">
-          <BitParameter Name="spdif">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/loopback">
-          <BitParameter Name="loopback">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/ip">
-          <BitParameter Name="ip">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bus">
-          <BitParameter Name="bus">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/stub">
-          <BitParameter Name="stub">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/communication">
-          <BitParameter Name="communication">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/ambient">
-          <BitParameter Name="ambient">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/telephony_rx">
-          <BitParameter Name="telephony_rx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/back_mic">
-          <BitParameter Name="back_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/anlg_dock_headset">
-          <BitParameter Name="anlg_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/fm_tuner">
-          <BitParameter Name="fm_tuner">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/tv_tuner">
-          <BitParameter Name="tv_tuner">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/spdif">
-          <BitParameter Name="spdif">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/loopback">
-          <BitParameter Name="loopback">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/ip">
-          <BitParameter Name="ip">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bus">
-          <BitParameter Name="bus">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/stub">
-          <BitParameter Name="stub">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/communication">
-          <BitParameter Name="communication">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/ambient">
-          <BitParameter Name="ambient">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/back_mic">
-          <BitParameter Name="back_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/anlg_dock_headset">
-          <BitParameter Name="anlg_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/fm_tuner">
-          <BitParameter Name="fm_tuner">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/tv_tuner">
-          <BitParameter Name="tv_tuner">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/spdif">
-          <BitParameter Name="spdif">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/loopback">
-          <BitParameter Name="loopback">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/ip">
-          <BitParameter Name="ip">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/bus">
-          <BitParameter Name="bus">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/stub">
-          <BitParameter Name="stub">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/communication">
-          <BitParameter Name="communication">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/ambient">
-          <BitParameter Name="ambient">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/back_mic">
-          <BitParameter Name="back_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/anlg_dock_headset">
-          <BitParameter Name="anlg_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/fm_tuner">
-          <BitParameter Name="fm_tuner">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/tv_tuner">
-          <BitParameter Name="tv_tuner">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/spdif">
-          <BitParameter Name="spdif">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/loopback">
-          <BitParameter Name="loopback">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/ip">
-          <BitParameter Name="ip">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/bus">
-          <BitParameter Name="bus">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/stub">
-          <BitParameter Name="stub">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/communication">
-          <BitParameter Name="communication">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/ambient">
-          <BitParameter Name="ambient">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/back_mic">
-          <BitParameter Name="back_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/anlg_dock_headset">
-          <BitParameter Name="anlg_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/fm_tuner">
-          <BitParameter Name="fm_tuner">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/tv_tuner">
-          <BitParameter Name="tv_tuner">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/spdif">
-          <BitParameter Name="spdif">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/loopback">
-          <BitParameter Name="loopback">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/ip">
-          <BitParameter Name="ip">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/bus">
-          <BitParameter Name="bus">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/stub">
-          <BitParameter Name="stub">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/communication">
-          <BitParameter Name="communication">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/ambient">
-          <BitParameter Name="ambient">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/telephony_rx">
-          <BitParameter Name="telephony_rx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/anlg_dock_headset">
-          <BitParameter Name="anlg_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/fm_tuner">
-          <BitParameter Name="fm_tuner">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/tv_tuner">
-          <BitParameter Name="tv_tuner">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/spdif">
-          <BitParameter Name="spdif">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/loopback">
-          <BitParameter Name="loopback">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/ip">
-          <BitParameter Name="ip">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/bus">
-          <BitParameter Name="bus">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/stub">
-          <BitParameter Name="stub">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/communication">
-          <BitParameter Name="communication">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/ambient">
-          <BitParameter Name="ambient">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/telephony_rx">
-          <BitParameter Name="telephony_rx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/back_mic">
-          <BitParameter Name="back_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/anlg_dock_headset">
-          <BitParameter Name="anlg_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/fm_tuner">
-          <BitParameter Name="fm_tuner">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/tv_tuner">
-          <BitParameter Name="tv_tuner">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/spdif">
-          <BitParameter Name="spdif">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/loopback">
-          <BitParameter Name="loopback">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/ip">
-          <BitParameter Name="ip">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bus">
-          <BitParameter Name="bus">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/stub">
-          <BitParameter Name="stub">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/communication">
-          <BitParameter Name="communication">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/ambient">
-          <BitParameter Name="ambient">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/telephony_rx">
-          <BitParameter Name="telephony_rx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/anlg_dock_headset">
-          <BitParameter Name="anlg_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/fm_tuner">
-          <BitParameter Name="fm_tuner">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/tv_tuner">
-          <BitParameter Name="tv_tuner">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/spdif">
-          <BitParameter Name="spdif">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/loopback">
-          <BitParameter Name="loopback">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/ip">
-          <BitParameter Name="ip">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bus">
-          <BitParameter Name="bus">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/stub">
-          <BitParameter Name="stub">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/communication">
-          <BitParameter Name="communication">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/ambient">
-          <BitParameter Name="ambient">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/telephony_rx">
-          <BitParameter Name="telephony_rx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/back_mic">
-          <BitParameter Name="back_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/anlg_dock_headset">
-          <BitParameter Name="anlg_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/fm_tuner">
-          <BitParameter Name="fm_tuner">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/tv_tuner">
-          <BitParameter Name="tv_tuner">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/spdif">
-          <BitParameter Name="spdif">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/loopback">
-          <BitParameter Name="loopback">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/ip">
-          <BitParameter Name="ip">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/bus">
-          <BitParameter Name="bus">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/stub">
-          <BitParameter Name="stub">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/communication">
-          <BitParameter Name="communication">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/ambient">
-          <BitParameter Name="ambient">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/telephony_rx">
-          <BitParameter Name="telephony_rx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/back_mic">
-          <BitParameter Name="back_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/anlg_dock_headset">
-          <BitParameter Name="anlg_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/fm_tuner">
-          <BitParameter Name="fm_tuner">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/tv_tuner">
-          <BitParameter Name="tv_tuner">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/spdif">
-          <BitParameter Name="spdif">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/loopback">
-          <BitParameter Name="loopback">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/ip">
-          <BitParameter Name="ip">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bus">
-          <BitParameter Name="bus">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/stub">
-          <BitParameter Name="stub">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/communication">
-          <BitParameter Name="communication">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/ambient">
-          <BitParameter Name="ambient">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/telephony_rx">
-          <BitParameter Name="telephony_rx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/back_mic">
-          <BitParameter Name="back_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/anlg_dock_headset">
-          <BitParameter Name="anlg_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/fm_tuner">
-          <BitParameter Name="fm_tuner">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/tv_tuner">
-          <BitParameter Name="tv_tuner">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/spdif">
-          <BitParameter Name="spdif">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/loopback">
-          <BitParameter Name="loopback">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/ip">
-          <BitParameter Name="ip">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/bus">
-          <BitParameter Name="bus">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/stub">
-          <BitParameter Name="stub">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/communication">
-          <BitParameter Name="communication">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/ambient">
-          <BitParameter Name="ambient">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/hdmi">
-          <BitParameter Name="hdmi">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/telephony_rx">
-          <BitParameter Name="telephony_rx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/back_mic">
-          <BitParameter Name="back_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/anlg_dock_headset">
-          <BitParameter Name="anlg_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/dgtl_dock_headset">
-          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/usb_accessory">
-          <BitParameter Name="usb_accessory">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/tv_tuner">
-          <BitParameter Name="tv_tuner">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/line">
-          <BitParameter Name="line">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/spdif">
-          <BitParameter Name="spdif">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/loopback">
-          <BitParameter Name="loopback">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/ip">
-          <BitParameter Name="ip">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/bus">
-          <BitParameter Name="bus">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForInputSource.DefaultAndMic" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="A2dp">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Sco">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BluetoothScoHeadset"/>
-          <SelectionCriterionRule SelectionCriterion="ForceUseForRecord" MatchesWhen="Is" Value="ForceBtSco"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="WiredHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="UsbDevice">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BuiltinMic">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BuiltinMic"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Default">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_a2dp"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/wired_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_device"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/builtin_mic"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_sco_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_a2dp"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/wired_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_device"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/builtin_mic"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_sco_headset"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="A2dp">
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Sco">
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="WiredHeadset">
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="UsbDevice">
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BuiltinMic">
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Default">
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_a2dp">
-          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForInputSource.VoiceUplinkAndVoiceDownlinkAndVoiceCall" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="VoiceCall">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="TelephonyRx"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Default">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/telephony_rx"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/telephony_rx"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/telephony_rx"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="VoiceCall">
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/telephony_rx">
-          <BitParameter Name="telephony_rx">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/telephony_rx">
-          <BitParameter Name="telephony_rx">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/telephony_rx">
-          <BitParameter Name="telephony_rx">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Default">
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/telephony_rx">
-          <BitParameter Name="telephony_rx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/telephony_rx">
-          <BitParameter Name="telephony_rx">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/telephony_rx">
-          <BitParameter Name="telephony_rx">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForInputSource.Camcorder" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="BackMic">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BackMic"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BuiltinMic">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BuiltinMic"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Default">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/back_mic"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/builtin_mic"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="BackMic">
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/back_mic">
-          <BitParameter Name="back_mic">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BuiltinMic">
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/back_mic">
-          <BitParameter Name="back_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Default">
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/back_mic">
-          <BitParameter Name="back_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForInputSource.VoiceRecognitionAndHotword" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="ScoHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="ForceUseForRecord" MatchesWhen="Is" Value="ForceBtSco"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BluetoothScoHeadset"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="WiredHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="UsbDevice">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BuiltinMic">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BuiltinMic"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Default">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bluetooth_sco_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/wired_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/usb_device"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/builtin_mic"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_sco_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/wired_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/usb_device"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/builtin_mic"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="ScoHeadset">
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="WiredHeadset">
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="UsbDevice">
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BuiltinMic">
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Default">
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForInputSource.VoiceCommunication" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="ScoHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BluetoothScoHeadset"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="WiredHeadset">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceNone"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="WiredHeadset"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="UsbDevice">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceNone"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BuiltinMic">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BuiltinMic"/>
-          <CompoundRule Type="Any">
-            <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceNone"/>
-            <CompoundRule Type="All">
-              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
-              <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Excludes" Value="BackMic"/>
-            </CompoundRule>
-          </CompoundRule>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="BackMic">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
-          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="BackMic"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Default">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_sco_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/wired_headset"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_device"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/builtin_mic"/>
-      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/back_mic"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="ScoHeadset">
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/back_mic">
-          <BitParameter Name="back_mic">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="WiredHeadset">
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/back_mic">
-          <BitParameter Name="back_mic">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="UsbDevice">
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/back_mic">
-          <BitParameter Name="back_mic">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BuiltinMic">
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/back_mic">
-          <BitParameter Name="back_mic">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="BackMic">
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/back_mic">
-          <BitParameter Name="back_mic">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Default">
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bluetooth_sco_headset">
-          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/wired_headset">
-          <BitParameter Name="wired_headset">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/usb_device">
-          <BitParameter Name="usb_device">0</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/builtin_mic">
-          <BitParameter Name="builtin_mic">1</BitParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/back_mic">
-          <BitParameter Name="back_mic">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForInputSource.RemoteSubmix" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="RemoteSubmix">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="RemoteSubmix"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Default">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/remote_submix"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="RemoteSubmix">
-        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/remote_submix">
-          <BitParameter Name="remote_submix">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Default">
-        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/remote_submix">
-          <BitParameter Name="remote_submix">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="DeviceForInputSource.FmTuner" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="FmTuner">
-        <CompoundRule Type="All">
-          <SelectionCriterionRule SelectionCriterion="AvailableInputDevices" MatchesWhen="Includes" Value="FmTuner"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="Default">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/fm_tuner"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="FmTuner">
-        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/fm_tuner">
-          <BitParameter Name="fm_tuner">1</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="Default">
-        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/fm_tuner">
-          <BitParameter Name="fm_tuner">0</BitParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="VolumeProfilesForStream.Calibration" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="Calibration">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/streams/voice_call/applicable_volume_profile/volume_profile"/>
-      <ConfigurableElement Path="/Policy/policy/streams/system/applicable_volume_profile/volume_profile"/>
-      <ConfigurableElement Path="/Policy/policy/streams/ring/applicable_volume_profile/volume_profile"/>
-      <ConfigurableElement Path="/Policy/policy/streams/music/applicable_volume_profile/volume_profile"/>
-      <ConfigurableElement Path="/Policy/policy/streams/alarm/applicable_volume_profile/volume_profile"/>
-      <ConfigurableElement Path="/Policy/policy/streams/notification/applicable_volume_profile/volume_profile"/>
-      <ConfigurableElement Path="/Policy/policy/streams/bluetooth_sco/applicable_volume_profile/volume_profile"/>
-      <ConfigurableElement Path="/Policy/policy/streams/enforced_audible/applicable_volume_profile/volume_profile"/>
-      <ConfigurableElement Path="/Policy/policy/streams/tts/applicable_volume_profile/volume_profile"/>
-      <ConfigurableElement Path="/Policy/policy/streams/accessibility/applicable_volume_profile/volume_profile"/>
-      <ConfigurableElement Path="/Policy/policy/streams/rerouting/applicable_volume_profile/volume_profile"/>
-      <ConfigurableElement Path="/Policy/policy/streams/patch/applicable_volume_profile/volume_profile"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="Calibration">
-        <ConfigurableElement Path="/Policy/policy/streams/voice_call/applicable_volume_profile/volume_profile">
-          <EnumParameter Name="volume_profile">voice_call</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/streams/system/applicable_volume_profile/volume_profile">
-          <EnumParameter Name="volume_profile">system</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/streams/ring/applicable_volume_profile/volume_profile">
-          <EnumParameter Name="volume_profile">ring</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/streams/music/applicable_volume_profile/volume_profile">
-          <EnumParameter Name="volume_profile">music</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/streams/alarm/applicable_volume_profile/volume_profile">
-          <EnumParameter Name="volume_profile">alarm</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/streams/notification/applicable_volume_profile/volume_profile">
-          <EnumParameter Name="volume_profile">notification</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/streams/bluetooth_sco/applicable_volume_profile/volume_profile">
-          <EnumParameter Name="volume_profile">bluetooth_sco</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/streams/enforced_audible/applicable_volume_profile/volume_profile">
-          <EnumParameter Name="volume_profile">enforced_audible</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/streams/tts/applicable_volume_profile/volume_profile">
-          <EnumParameter Name="volume_profile">tts</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/streams/accessibility/applicable_volume_profile/volume_profile">
-          <EnumParameter Name="volume_profile">accessibility</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/streams/rerouting/applicable_volume_profile/volume_profile">
-          <EnumParameter Name="volume_profile">rerouting</EnumParameter>
-        </ConfigurableElement>
-        <ConfigurableElement Path="/Policy/policy/streams/patch/applicable_volume_profile/volume_profile">
-          <EnumParameter Name="volume_profile">patch</EnumParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-  <ConfigurableDomain Name="VolumeProfilesForStream.Dtmf" SequenceAware="false">
-    <Configurations>
-      <Configuration Name="InCall">
-        <CompoundRule Type="Any">
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
-          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
-        </CompoundRule>
-      </Configuration>
-      <Configuration Name="OutOfCall">
-        <CompoundRule Type="All"/>
-      </Configuration>
-    </Configurations>
-    <ConfigurableElements>
-      <ConfigurableElement Path="/Policy/policy/streams/dtmf/applicable_volume_profile/volume_profile"/>
-    </ConfigurableElements>
-    <Settings>
-      <Configuration Name="InCall">
-        <ConfigurableElement Path="/Policy/policy/streams/dtmf/applicable_volume_profile/volume_profile">
-          <EnumParameter Name="volume_profile">voice_call</EnumParameter>
-        </ConfigurableElement>
-      </Configuration>
-      <Configuration Name="OutOfCall">
-        <ConfigurableElement Path="/Policy/policy/streams/dtmf/applicable_volume_profile/volume_profile">
-          <EnumParameter Name="volume_profile">dtmf</EnumParameter>
-        </ConfigurableElement>
-      </Configuration>
-    </Settings>
-  </ConfigurableDomain>
-</ConfigurableDomains>
diff --git a/common/audio/stub/parameter-framework/Settings/device_for_input_source.pfw b/common/audio/stub/parameter-framework/Settings/device_for_input_source.pfw
deleted file mode 100644
index 66d657ac7..000000000
--- a/common/audio/stub/parameter-framework/Settings/device_for_input_source.pfw
+++ /dev/null
@@ -1,578 +0,0 @@
-supDomain: DeviceForInputSource
-	domain: Calibration
-		conf: Calibration
-			component: /Policy/policy/input_sources/default/applicable_input_device/mask
-				communication = 0
-				ambient = 0
-				hdmi = 0
-				telephony_rx = 0
-				back_mic = 0
-				remote_submix = 0
-				anlg_dock_headset = 0
-				dgtl_dock_headset = 0
-				usb_accessory = 0
-				fm_tuner = 0
-				tv_tuner = 0
-				line = 0
-				spdif = 0
-				loopback = 0
-				ip = 0
-				bus = 0
-				stub = 0
-			component: /Policy/policy/input_sources/mic/applicable_input_device/mask
-				communication = 0
-				ambient = 0
-				hdmi = 0
-				telephony_rx = 0
-				back_mic = 0
-				remote_submix = 0
-				anlg_dock_headset = 0
-				dgtl_dock_headset = 0
-				usb_accessory = 0
-				fm_tuner = 0
-				tv_tuner = 0
-				line = 0
-				spdif = 0
-				loopback = 0
-				ip = 0
-				bus = 0
-				stub = 0
-			component: /Policy/policy/input_sources/voice_downlink/applicable_input_device/mask
-				communication = 0
-				ambient = 0
-				builtin_mic = 0
-				bluetooth_sco_headset = 0
-				wired_headset = 0
-				hdmi = 0
-				back_mic = 0
-				remote_submix = 0
-				anlg_dock_headset = 0
-				dgtl_dock_headset = 0
-				usb_accessory = 0
-				usb_device = 0
-				fm_tuner = 0
-				tv_tuner = 0
-				line = 0
-				spdif = 0
-				bluetooth_a2dp = 0
-				loopback = 0
-				ip = 0
-				bus = 0
-				stub = 0
-			component: /Policy/policy/input_sources/voice_call/applicable_input_device/mask
-				communication = 0
-				ambient = 0
-				builtin_mic = 0
-				bluetooth_sco_headset = 0
-				wired_headset = 0
-				hdmi = 0
-				back_mic = 0
-				remote_submix = 0
-				anlg_dock_headset = 0
-				dgtl_dock_headset = 0
-				usb_accessory = 0
-				usb_device = 0
-				fm_tuner = 0
-				tv_tuner = 0
-				line = 0
-				spdif = 0
-				bluetooth_a2dp = 0
-				loopback = 0
-				ip = 0
-				bus = 0
-				stub = 0
-			component: /Policy/policy/input_sources/voice_uplink/applicable_input_device/mask
-				communication = 0
-				ambient = 0
-				builtin_mic = 0
-				bluetooth_sco_headset = 0
-				wired_headset = 0
-				hdmi = 0
-				back_mic = 0
-				remote_submix = 0
-				anlg_dock_headset = 0
-				dgtl_dock_headset = 0
-				usb_accessory = 0
-				usb_device = 0
-				fm_tuner = 0
-				tv_tuner = 0
-				line = 0
-				spdif = 0
-				bluetooth_a2dp = 0
-				loopback = 0
-				ip = 0
-				bus = 0
-				stub = 0
-			component: /Policy/policy/input_sources/camcorder/applicable_input_device/mask
-				communication = 0
-				ambient = 0
-				bluetooth_sco_headset = 0
-				wired_headset = 0
-				hdmi = 0
-				telephony_rx = 0
-				remote_submix = 0
-				anlg_dock_headset = 0
-				dgtl_dock_headset = 0
-				usb_accessory = 0
-				usb_device = 0
-				fm_tuner = 0
-				tv_tuner = 0
-				line = 0
-				spdif = 0
-				bluetooth_a2dp = 0
-				loopback = 0
-				ip = 0
-				bus = 0
-				stub = 0
-			component: /Policy/policy/input_sources/voice_recognition/applicable_input_device/mask
-				communication = 0
-				ambient = 0
-				hdmi = 0
-				telephony_rx = 0
-				back_mic = 0
-				remote_submix = 0
-				anlg_dock_headset = 0
-				dgtl_dock_headset = 0
-				usb_accessory = 0
-				fm_tuner = 0
-				tv_tuner = 0
-				line = 0
-				spdif = 0
-				bluetooth_a2dp = 0
-				loopback = 0
-				ip = 0
-				bus = 0
-				stub = 0
-			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
-				communication = 0
-				ambient = 0
-				hdmi = 0
-				telephony_rx = 0
-				remote_submix = 0
-				anlg_dock_headset = 0
-				dgtl_dock_headset = 0
-				usb_accessory = 0
-				fm_tuner = 0
-				tv_tuner = 0
-				line = 0
-				spdif = 0
-				bluetooth_a2dp = 0
-				loopback = 0
-				ip = 0
-				bus = 0
-				stub = 0
-			component: /Policy/policy/input_sources/remote_submix/applicable_input_device/mask
-				communication = 0
-				ambient = 0
-				builtin_mic = 0
-				bluetooth_sco_headset = 0
-				wired_headset = 0
-				hdmi = 0
-				telephony_rx = 0
-				back_mic = 0
-				anlg_dock_headset = 0
-				dgtl_dock_headset = 0
-				usb_accessory = 0
-				usb_device = 0
-				fm_tuner = 0
-				tv_tuner = 0
-				line = 0
-				spdif = 0
-				bluetooth_a2dp = 0
-				loopback = 0
-				ip = 0
-				bus = 0
-				stub = 0
-			component: /Policy/policy/input_sources/hotword/applicable_input_device/mask
-				communication = 0
-				ambient = 0
-				hdmi = 0
-				telephony_rx = 0
-				back_mic = 0
-				remote_submix = 0
-				anlg_dock_headset = 0
-				dgtl_dock_headset = 0
-				usb_accessory = 0
-				fm_tuner = 0
-				tv_tuner = 0
-				line = 0
-				spdif = 0
-				bluetooth_a2dp = 0
-				loopback = 0
-				ip = 0
-				bus = 0
-				stub = 0
-			component: /Policy/policy/input_sources/unprocessed/applicable_input_device/mask
-				communication = 0
-				ambient = 0
-				hdmi = 0
-				telephony_rx = 0
-				back_mic = 0
-				remote_submix = 0
-				anlg_dock_headset = 0
-				dgtl_dock_headset = 0
-				usb_accessory = 0
-				fm_tuner = 0
-				tv_tuner = 0
-				line = 0
-				spdif = 0
-				bluetooth_a2dp = 0
-				loopback = 0
-				ip = 0
-				bus = 0
-				stub = 0
-			component: /Policy/policy/input_sources/fm_tuner/applicable_input_device/mask
-				communication = 0
-				ambient = 0
-				bluetooth_sco_headset = 0
-				hdmi = 0
-				telephony_rx = 0
-				builtin_mic = 0
-				wired_headset = 0
-				back_mic = 0
-				remote_submix = 0
-				anlg_dock_headset = 0
-				dgtl_dock_headset = 0
-				usb_accessory = 0
-				usb_device = 0
-				tv_tuner = 0
-				line = 0
-				spdif = 0
-				bluetooth_a2dp = 0
-				loopback = 0
-				ip = 0
-				bus = 0
-				stub = 0
-
-	domain: DefaultAndMic
-		conf: A2dp
-			AvailableInputDevices Includes BluetoothA2dp
-
-			component: /Policy/policy/input_sources
-				component: default/applicable_input_device/mask/
-					bluetooth_a2dp = 1
-					wired_headset = 0
-					usb_device = 0
-					builtin_mic = 0
-					bluetooth_sco_headset = 0
-				component: mic/applicable_input_device/mask/
-					bluetooth_a2dp = 1
-					wired_headset = 0
-					usb_device = 0
-					builtin_mic = 0
-					bluetooth_sco_headset = 0
-
-		conf: Sco
-			AvailableInputDevices Includes BluetoothScoHeadset
-			ForceUseForRecord Is ForceBtSco
-
-			component: /Policy/policy/input_sources
-				component: default/applicable_input_device/mask/
-					bluetooth_a2dp = 0
-					wired_headset = 0
-					usb_device = 0
-					builtin_mic = 0
-					bluetooth_sco_headset = 1
-				component: mic/applicable_input_device/mask/
-					bluetooth_a2dp = 0
-					wired_headset = 0
-					usb_device = 0
-					builtin_mic = 0
-					bluetooth_sco_headset = 1
-
-		conf: WiredHeadset
-			AvailableInputDevices Includes WiredHeadset
-
-			component: /Policy/policy/input_sources
-				component: default/applicable_input_device/mask/
-					bluetooth_a2dp = 0
-					wired_headset = 1
-					usb_device = 0
-					builtin_mic = 0
-					bluetooth_sco_headset = 0
-				component: mic/applicable_input_device/mask/
-					bluetooth_a2dp = 0
-					wired_headset = 1
-					usb_device = 0
-					builtin_mic = 0
-					bluetooth_sco_headset = 0
-
-		conf: UsbDevice
-			AvailableInputDevices Includes UsbDevice
-
-			component: /Policy/policy/input_sources
-				component: default/applicable_input_device/mask/
-					bluetooth_a2dp = 0
-					wired_headset = 0
-					usb_device = 1
-					builtin_mic = 0
-					bluetooth_sco_headset = 0
-				component: mic/applicable_input_device/mask/
-					bluetooth_a2dp = 0
-					wired_headset = 0
-					usb_device = 1
-					builtin_mic = 0
-					bluetooth_sco_headset = 0
-
-		conf: BuiltinMic
-			AvailableInputDevices Includes BuiltinMic
-
-			component: /Policy/policy/input_sources
-				component: default/applicable_input_device/mask/
-					bluetooth_a2dp = 0
-					wired_headset = 0
-					usb_device = 0
-					builtin_mic = 1
-					bluetooth_sco_headset = 0
-				component: mic/applicable_input_device/mask/
-					bluetooth_a2dp = 0
-					wired_headset = 0
-					usb_device = 0
-					builtin_mic = 1
-					bluetooth_sco_headset = 0
-
-		conf: Default
-			component: /Policy/policy/input_sources
-				component: default/applicable_input_device/mask/
-					bluetooth_a2dp = 0
-					wired_headset = 0
-					usb_device = 0
-					builtin_mic = 0
-					bluetooth_sco_headset = 0
-				component: mic/applicable_input_device/mask/
-					bluetooth_a2dp = 0
-					wired_headset = 0
-					usb_device = 0
-					builtin_mic = 0
-					bluetooth_sco_headset = 0
-
-	domain: VoiceUplinkAndVoiceDownlinkAndVoiceCall
-		conf: VoiceCall
-			AvailableInputDevices Includes TelephonyRx
-
-			component: /Policy/policy/input_sources
-				voice_downlink/applicable_input_device/mask/telephony_rx = 1
-				voice_call/applicable_input_device/mask/telephony_rx = 1
-				voice_uplink/applicable_input_device/mask/telephony_rx = 1
-
-		conf: Default
-			component: /Policy/policy/input_sources
-				voice_downlink/applicable_input_device/mask/telephony_rx = 0
-				voice_call/applicable_input_device/mask/telephony_rx = 0
-				voice_uplink/applicable_input_device/mask/telephony_rx = 0
-
-	domain: Camcorder
-		conf: BackMic
-			AvailableInputDevices Includes BackMic
-
-			component: /Policy/policy/input_sources/camcorder/applicable_input_device/mask
-				back_mic = 1
-				builtin_mic = 0
-
-		conf: BuiltinMic
-			AvailableInputDevices Includes BuiltinMic
-
-			component: /Policy/policy/input_sources/camcorder/applicable_input_device/mask
-				back_mic = 0
-				builtin_mic = 1
-
-		conf: Default
-			component: /Policy/policy/input_sources/camcorder/applicable_input_device/mask
-				back_mic = 0
-				builtin_mic = 0
-
-	domain: VoiceRecognitionAndUnprocessedAndHotword
-		conf: ScoHeadset
-			ForceUseForRecord Is ForceBtSco
-			AvailableInputDevices Includes BluetoothScoHeadset
-
-			component: /Policy/policy/input_sources
-				component: voice_recognition/applicable_input_device/mask
-					bluetooth_sco_headset = 1
-					wired_headset = 0
-					usb_device = 0
-					builtin_mic = 0
-				component: unprocessed/applicable_input_device/mask
-					bluetooth_sco_headset = 1
-					wired_headset = 0
-					usb_device = 0
-					builtin_mic = 0
-				component: hotword/applicable_input_device/mask
-					bluetooth_sco_headset = 1
-					wired_headset = 0
-					usb_device = 0
-					builtin_mic = 0
-
-		conf: WiredHeadset
-			AvailableInputDevices Includes WiredHeadset
-
-			component: /Policy/policy/input_sources
-				component: voice_recognition/applicable_input_device/mask
-					bluetooth_sco_headset = 0
-					wired_headset = 1
-					usb_device = 0
-					builtin_mic = 0
-				component: unprocessed/applicable_input_device/mask
-					bluetooth_sco_headset = 0
-					wired_headset = 1
-					usb_device = 0
-					builtin_mic = 0
-				component: hotword/applicable_input_device/mask
-					bluetooth_sco_headset = 0
-					wired_headset = 1
-					usb_device = 0
-					builtin_mic = 0
-
-		conf: UsbDevice
-			AvailableInputDevices Includes UsbDevice
-
-			component: /Policy/policy/input_sources
-				component: voice_recognition/applicable_input_device/mask
-					bluetooth_sco_headset = 0
-					wired_headset = 0
-					usb_device = 1
-					builtin_mic = 0
-				component: unprocessed/applicable_input_device/mask
-					bluetooth_sco_headset = 0
-					wired_headset = 0
-					usb_device = 1
-					builtin_mic = 0
-				component: hotword/applicable_input_device/mask
-					bluetooth_sco_headset = 0
-					wired_headset = 0
-					usb_device = 1
-					builtin_mic = 0
-
-		conf: BuiltinMic
-			AvailableInputDevices Includes BuiltinMic
-
-			component: /Policy/policy/input_sources
-				component: voice_recognition/applicable_input_device/mask
-					bluetooth_sco_headset = 0
-					wired_headset = 0
-					usb_device = 0
-					builtin_mic = 1
-				component: unprocessed/applicable_input_device/mask
-					bluetooth_sco_headset = 0
-					wired_headset = 0
-					usb_device = 0
-					builtin_mic = 1
-				component: hotword/applicable_input_device/mask
-					bluetooth_sco_headset = 0
-					wired_headset = 0
-					usb_device = 0
-					builtin_mic = 1
-
-		conf: Default
-			component: /Policy/policy/input_sources
-				component: voice_recognition/applicable_input_device/mask
-					bluetooth_sco_headset = 0
-					wired_headset = 0
-					usb_device = 0
-					builtin_mic = 0
-				component: unprocessed/applicable_input_device/mask
-					bluetooth_sco_headset = 0
-					wired_headset = 0
-					usb_device = 0
-					builtin_mic = 0
-				component: hotword/applicable_input_device/mask
-					bluetooth_sco_headset = 0
-					wired_headset = 0
-					usb_device = 0
-					builtin_mic = 0
-
-	domain: VoiceCommunication
-		conf: ScoHeadset
-			#
-			# SCO device may be requested but no SCO device is available
-			#
-			ForceUseForCommunication Is ForceBtSco
-			AvailableInputDevices Includes BluetoothScoHeadset
-
-			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
-				bluetooth_sco_headset = 1
-				wired_headset = 0
-				usb_device = 0
-				builtin_mic = 0
-				back_mic = 0
-
-		conf: WiredHeadset
-			ForceUseForCommunication Is ForceNone
-			AvailableInputDevices Includes WiredHeadset
-
-			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
-				bluetooth_sco_headset = 0
-				wired_headset = 1
-				usb_device = 0
-				builtin_mic = 0
-				back_mic = 0
-
-		conf: UsbDevice
-			ForceUseForCommunication Is ForceNone
-			AvailableInputDevices Includes UsbDevice
-
-			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
-				bluetooth_sco_headset = 0
-				wired_headset = 0
-				usb_device = 1
-				builtin_mic = 0
-				back_mic = 0
-
-		conf: BuiltinMic
-			AvailableInputDevices Includes BuiltinMic
-			ANY
-				ForceUseForCommunication Is ForceNone
-				ALL
-					ForceUseForCommunication Is ForceSpeaker
-					AvailableInputDevices Excludes BackMic
-
-			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
-				bluetooth_sco_headset = 0
-				wired_headset = 0
-				usb_device = 0
-				builtin_mic = 1
-				back_mic = 0
-
-		conf: BackMic
-			ForceUseForCommunication Is ForceSpeaker
-			AvailableInputDevices Includes BackMic
-
-			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
-				bluetooth_sco_headset = 0
-				wired_headset = 0
-				usb_device = 0
-				builtin_mic = 0
-				back_mic = 1
-
-		conf: Default
-			#
-			# Fallback on the default input device which can be builtin mic for example
-			#
-			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
-				bluetooth_sco_headset = 0
-				wired_headset = 0
-				usb_device = 0
-				builtin_mic = 1
-				back_mic = 0
-
-	domain: RemoteSubmix
-		conf: RemoteSubmix
-			AvailableInputDevices Includes RemoteSubmix
-
-			component: /Policy/policy/input_sources/remote_submix/applicable_input_device/mask
-				remote_submix = 1
-
-		conf: Default
-			component: /Policy/policy/input_sources/remote_submix/applicable_input_device/mask
-				remote_submix = 0
-
-	domain: FmTuner
-		conf: FmTuner
-			AvailableInputDevices Includes FmTuner
-
-			component: /Policy/policy/input_sources/fm_tuner/applicable_input_device/mask
-				fm_tuner = 1
-
-		conf: Default
-			component: /Policy/policy/input_sources/fm_tuner/applicable_input_device/mask
-				fm_tuner = 0
diff --git a/common/audio/stub/parameter-framework/Settings/device_for_strategy_accessibility.pfw b/common/audio/stub/parameter-framework/Settings/device_for_strategy_accessibility.pfw
deleted file mode 100644
index 163baea78..000000000
--- a/common/audio/stub/parameter-framework/Settings/device_for_strategy_accessibility.pfw
+++ /dev/null
@@ -1,610 +0,0 @@
-supDomain: DeviceForStrategy
-
-	supDomain: Accessibility
-		#
-		# STRATEGY_ACCESSIBILITY follows STRATEGY_PHONE if in call widely speaking
-		# STRATEGY_ACCESSIBILITY follows STRATEGY_MEDIA otherwise
-		#
-		# Other case are handled programmatically has involving activity of streams.
-		#
-		domain: UnreachableDevices
-			conf: Calibration
-				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
-					hdmi_arc = 0
-					spdif = 0
-					aux_line = 0
-					fm = 0
-					speaker_safe = 0
-					telephony_tx = 0
-					ip = 0
-					bus = 0
-
-		domain: Device
-			conf: RemoteSubmix
-				#
-				# Accessibility follows Media strategy if not in call
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				AvailableOutputDevices Includes RemoteSubmix
-
-				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
-					remote_submix = 1
-					earpiece = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_sco = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: BluetoothA2dp
-				#
-				# Accessibility falls through media strategy if not in call (widely speaking)
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				ForceUseForMedia IsNot ForceNoBtA2dp
-				AvailableOutputDevices Includes BluetoothA2dp
-
-				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					bluetooth_a2dp = 1
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_sco = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: BluetoothA2dpHeadphone
-				#
-				# Accessibility falls through media strategy if not in call (widely speaking)
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				ForceUseForMedia IsNot ForceNoBtA2dp
-				AvailableOutputDevices Includes BluetoothA2dpHeadphones
-
-				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 1
-					bluetooth_a2dp_speaker = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_sco = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: BluetoothA2dpSpeaker
-				#
-				# Accessibility falls through media strategy if not in call (widely speaking)
-				#
-				ForceUseForMedia IsNot ForceNoBtA2dp
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				AvailableOutputDevices Includes BluetoothA2dpSpeaker
-
-				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 1
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_sco = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: ForceSpeakerWhenNotInCall
-				#
-				# Accessibility follows Media strategy if not in call
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				ForceUseForMedia Is ForceSpeaker
-				AvailableOutputDevices Includes Speaker
-
-				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_sco = 0
-					speaker = 1
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: BluetoothScoCarkit
-				#
-				# accessibility falls through Phone strategy if in call
-				#
-				ANY
-					TelephonyMode Is InCall
-					TelephonyMode Is InCommunication
-				AvailableOutputDevices Includes BluetoothScoCarkit
-				ForceUseForCommunication Is ForceBtSco
-
-				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 1
-					bluetooth_sco = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: BluetoothScoHeadset
-				#
-				# accessibility falls through Phone strategy if in call
-				#
-				ANY
-					TelephonyMode Is InCall
-					TelephonyMode Is InCommunication
-				AvailableOutputDevices Includes BluetoothScoHeadset
-				ForceUseForCommunication Is ForceBtSco
-
-				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_sco_headset = 1
-					bluetooth_sco_carkit = 0
-					bluetooth_sco = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: BluetoothSco
-				#
-				# accessibility falls through Phone strategy if in call
-				#
-				ANY
-					TelephonyMode Is InCall
-					TelephonyMode Is InCommunication
-				AvailableOutputDevices Includes BluetoothSco
-				ForceUseForCommunication Is ForceBtSco
-
-				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_sco = 1
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: WiredHeadphone
-				ANY
-					#
-					# accessibility falls through Phone strategy if in call
-					#
-					ALL
-						ANY
-							TelephonyMode Is InCall
-							TelephonyMode Is InCommunication
-						ForceUseForCommunication IsNot ForceSpeaker
-					#
-					# accessibility follows Media strategy if not in call
-					#
-					ALL
-						TelephonyMode IsNot InCall
-						TelephonyMode IsNot InCommunication
-				AvailableOutputDevices Includes WiredHeadphone
-
-				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_sco = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 1
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: Line
-				ANY
-					#
-					# accessibility falls through Phone strategy if in call
-					# but Line has a lower priority than WiredHeadset in this case.
-					#
-					ALL
-						ANY
-							TelephonyMode Is InCall
-							TelephonyMode Is InCommunication
-						ForceUseForCommunication IsNot ForceSpeaker
-						AvailableOutputDevices Excludes WiredHeadset
-					#
-					# accessibility follows Media strategy if not in call
-					#
-				AvailableOutputDevices Includes Line
-
-				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_sco = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 1
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: WiredHeadset
-				ANY
-					#
-					# accessibility falls through Phone strategy if in call
-					#
-					ALL
-						ANY
-							TelephonyMode Is InCall
-							TelephonyMode Is InCommunication
-						ForceUseForCommunication IsNot ForceSpeaker
-					#
-					# accessibility follows Media strategy if not in call
-					#
-					ALL
-						TelephonyMode IsNot InCall
-						TelephonyMode IsNot InCommunication
-				AvailableOutputDevices Includes WiredHeadset
-
-				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_sco = 0
-					speaker = 0
-					wired_headset = 1
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: UsbDevice
-				ANY
-					#
-					# accessibility falls through Phone strategy if in call (widely speaking)
-					#
-					ALL
-						ANY
-							TelephonyMode Is InCall
-							TelephonyMode Is InCommunication
-						ForceUseForCommunication IsNot ForceSpeaker
-					#
-					# accessibility follows Media strategy if not in call
-					# Media strategy inverts the priority of USB device vs accessory
-					#
-					ALL
-						TelephonyMode IsNot InCall
-						TelephonyMode IsNot InCommunication
-						AvailableOutputDevices Excludes UsbAccessory
-						ForceUseForCommunication Is ForceSpeaker
-				AvailableOutputDevices Includes UsbDevice
-
-				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_sco = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 1
-					hdmi = 0
-					stub = 0
-
-			conf: UsbAccessory
-				#
-				# accessibility falls through Phone strategy if in call (widely speaking)
-				# but USB accessory not reachable in call
-				#
-				# accessibility follows Media strategy if not in call
-				# Media strategy inverts the priority of USB device vs accessory
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				AvailableOutputDevices Includes UsbAccessory
-
-				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_sco = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 1
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: DgtlDockHeadset
-				#
-				# accessibility falls through Phone strategy if in call (widely speaking)
-				# but DgtlDockHeadset not reachable in call
-				#
-				# accessibility follows Media strategy if not in call
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				AvailableOutputDevices Includes DgtlDockHeadset
-
-				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_sco = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 1
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: AuxDigital
-				#
-				# accessibility falls through Phone strategy if in call (widely speaking)
-				# but Hdmi not reachable in call
-				#
-				# accessibility follows Media strategy if not in call
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				AvailableOutputDevices Includes Hdmi
-
-				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_sco = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 1
-					stub = 0
-
-			conf: AnlgDockHeadset
-				#
-				# accessibility falls through Phone strategy if in call (widely speaking)
-				# but AnlgDockHeadset not reachable in call
-				#
-				# accessibility follows Media strategy if not in call
-				# Media strategy inverts the priority of USB device vs accessory
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				AvailableOutputDevices Includes AnlgDockHeadset
-				ForceUseForDock Is ForceAnalogDock
-
-				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_sco = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 1
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: Earpiece
-				#
-				# accessibility falls through Phone strategy if in call
-				#
-				ANY
-					TelephonyMode Is InCall
-					TelephonyMode Is InCommunication
-				AvailableOutputDevices Includes Earpiece
-				ForceUseForCommunication IsNot ForceSpeaker
-
-				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 1
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_sco = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: Speaker
-				AvailableOutputDevices Includes Speaker
-
-				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_sco = 0
-					speaker = 1
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: Default
-				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_sco = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 1
diff --git a/common/audio/stub/parameter-framework/Settings/device_for_strategy_dtmf.pfw b/common/audio/stub/parameter-framework/Settings/device_for_strategy_dtmf.pfw
deleted file mode 100644
index bbc897033..000000000
--- a/common/audio/stub/parameter-framework/Settings/device_for_strategy_dtmf.pfw
+++ /dev/null
@@ -1,640 +0,0 @@
-supDomain: DeviceForStrategy
-
-	supDomain: Dtmf
-
-		domain: UnreachableDevices
-			conf: Calibration
-				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
-					fm = 0
-					speaker_safe = 0
-					bluetooth_sco_carkit = 0
-					ip = 0
-					bus = 0
-
-		domain: Device2
-			conf: RemoteSubmix
-				#
-				# DTMF follows Media strategy if not in call
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				AvailableOutputDevices Includes RemoteSubmix
-
-				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
-					remote_submix = 1
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: BluetoothA2dp
-				#
-				# DTMF follows Media strategy if not in call
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				ForceUseForMedia IsNot ForceNoBtA2dp
-				AvailableOutputDevices Includes BluetoothA2dp
-
-				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_a2dp = 1
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: BluetoothA2dpHeadphones
-				#
-				# DTMF follows Media strategy if not in call
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				ForceUseForMedia IsNot ForceNoBtA2dp
-				AvailableOutputDevices Includes BluetoothA2dpHeadphones
-
-				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 1
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: BluetoothA2dpSpeaker
-				#
-				# DTMF follows Media strategy if not in call
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				ForceUseForMedia IsNot ForceNoBtA2dp
-				AvailableOutputDevices Includes BluetoothA2dpSpeaker
-
-				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 1
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: ForceSpeakerWhenNotInCall
-				#
-				# DTMF follows Media strategy if not in call
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				ForceUseForMedia Is ForceSpeaker
-				ForceUseForHdmiSystemAudio IsNot ForceHdmiSystemEnforced
-				AvailableOutputDevices Includes Speaker
-
-				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 1
-					stub = 0
-
-			conf: BluetoothScoHeadset
-				#
-				# DTMF falls through Phone strategy if in call
-				#
-				ANY
-					TelephonyMode Is InCall
-					TelephonyMode Is InCommunication
-				AvailableOutputDevices Includes BluetoothScoHeadset
-				ForceUseForCommunication Is ForceBtSco
-
-				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 1
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: BluetoothSco
-				#
-				# DTMF falls through Phone strategy if in call
-				#
-				ANY
-					TelephonyMode Is InCall
-					TelephonyMode Is InCommunication
-				AvailableOutputDevices Includes BluetoothSco
-				ForceUseForCommunication Is ForceBtSco
-
-				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 1
-					bluetooth_sco_headset = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: WiredHeadphone
-				ANY
-					#
-					# DTMF falls through Phone strategy if in call
-					#
-					ALL
-						ANY
-							TelephonyMode Is InCall
-							TelephonyMode Is InCommunication
-						ForceUseForCommunication IsNot ForceSpeaker
-					#
-					# DTMF follows Media strategy if not in call
-					#
-					ALL
-						TelephonyMode IsNot InCall
-						TelephonyMode IsNot InCommunication
-				AvailableOutputDevices Includes WiredHeadphone
-
-				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 1
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: Line
-				ANY
-					#
-					# DTMF falls through Phone strategy if in call
-					# but Line has a lower priority than WiredHeadset in this case.
-					#
-					ALL
-						ANY
-							TelephonyMode Is InCall
-							TelephonyMode Is InCommunication
-						ForceUseForCommunication IsNot ForceSpeaker
-						AvailableOutputDevices Excludes WiredHeadset
-					#
-					# DTMF follows Media strategy if not in call
-					#
-					ALL
-						TelephonyMode IsNot InCall
-						TelephonyMode IsNot InCommunication
-				AvailableOutputDevices Includes Line
-
-				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 1
-					speaker = 0
-					stub = 0
-
-			conf: WiredHeadset
-				ANY
-					#
-					# DTMF falls through Phone strategy if in call
-					#
-					ALL
-						ANY
-							TelephonyMode Is InCall
-							TelephonyMode Is InCommunication
-						ForceUseForCommunication IsNot ForceSpeaker
-					#
-					# DTMF follows Media strategy if not in call
-					#
-					ALL
-						TelephonyMode IsNot InCall
-						TelephonyMode IsNot InCommunication
-				AvailableOutputDevices Includes WiredHeadset
-
-				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 1
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: UsbDevice
-				ANY
-					#
-					# DTMF falls through Phone strategy if in call (widely speaking)
-					#
-					ALL
-						ANY
-							TelephonyMode Is InCall
-							TelephonyMode Is InCommunication
-						ForceUseForCommunication IsNot ForceSpeaker
-					#
-					# DTMF follows Media strategy if not in call
-					# Media strategy inverts the priority of USB device vs accessory
-					#
-					ALL
-						TelephonyMode IsNot InCall
-						TelephonyMode IsNot InCommunication
-						AvailableOutputDevices Excludes UsbAccessory
-						ForceUseForCommunication Is ForceSpeaker
-				AvailableOutputDevices Includes UsbDevice
-
-				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 1
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: UsbAccessory
-				#
-				# DTMF falls through Phone strategy if in call (widely speaking)
-				# but USB accessory not reachable in call
-				#
-				# DTMF follows Media strategy if not in call
-				# Media strategy inverts the priority of USB device vs accessory
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				AvailableOutputDevices Includes UsbAccessory
-
-				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 1
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: DgtlDockHeadset
-				#
-				# DTMF falls through Phone strategy if in call (widely speaking)
-				# but DgtlDockHeadset not reachable in call
-				#
-				# DTMF follows Media strategy if not in call
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				AvailableOutputDevices Includes DgtlDockHeadset
-
-				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 1
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: Hdmi
-				#
-				# DTMF falls through Phone strategy if in call (widely speaking)
-				# but Hdmi not reachable in call
-				#
-				# DTMF follows Media strategy if not in call
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				AvailableOutputDevices Includes Hdmi
-
-				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 1
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: AnlgDockHeadset
-				#
-				# DTMF falls through Phone strategy if in call (widely speaking)
-				# but AnlgDockHeadset not reachable in call
-				#
-				# DTMF follows Media strategy if not in call
-				# Media strategy inverts the priority of USB device vs accessory
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				ForceUseForDock Is ForceAnalogDock
-				AvailableOutputDevices Includes AnlgDockHeadset
-
-				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 1
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: Earpiece
-				#
-				# DTMF falls through Phone strategy if in call
-				#
-				ANY
-					TelephonyMode Is InCall
-					TelephonyMode Is InCommunication
-				AvailableOutputDevices Includes Earpiece
-				ForceUseForCommunication IsNot ForceSpeaker
-
-				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 1
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: Speaker
-				ANY
-					#
-					# DTMF falls through Phone strategy if in call
-					#
-					ALL
-						ANY
-							TelephonyMode Is InCall
-							TelephonyMode Is InCommunication
-						ForceUseForCommunication Is ForceSpeaker
-					#
-					# DTMF follows Media strategy if not in call
-					#
-					ALL
-						TelephonyMode IsNot InCall
-						TelephonyMode IsNot InCommunication
-						ForceUseForHdmiSystemAudio IsNot ForceHdmiSystemEnforced
-				AvailableOutputDevices Includes Speaker
-
-				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 1
-					stub = 0
-
-			conf: Default
-				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 1
-
-		domain: Arc
-			#
-			# DTMF strategy follows media strategy if not in call
-			# these following domains consists in device(s) that can co-exist with others
-			# e.g. ARC, SPDIF, AUX_LINE
-			#
-			conf: Selected
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				AvailableOutputDevices Includes HdmiArc
-
-				/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi_arc = 1
-
-			conf: NotSelected
-				/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi_arc = 0
-
-		domain: Spdif
-			#
-			# DTMF strategy follows media strategy if not in call
-			# these following domains consists in device(s) that can co-exist with others
-			# e.g. ARC, SPDIF, AUX_LINE
-			#
-			conf: Selected
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				AvailableOutputDevices Includes Spdif
-
-				/Policy/policy/strategies/dtmf/selected_output_devices/mask/spdif = 1
-
-			conf: NotSelected
-				/Policy/policy/strategies/dtmf/selected_output_devices/mask/spdif = 0
-
-		domain: AuxLine
-			#
-			# DTMF strategy follows media strategy if not in call
-			# these following domains consists in device(s) that can co-exist with others
-			# e.g. ARC, SPDIF, AUX_LINE
-			#
-			conf: Selected
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				AvailableOutputDevices Includes AuxLine
-
-				/Policy/policy/strategies/dtmf/selected_output_devices/mask/aux_line = 1
-
-			conf: NotSelected
-				/Policy/policy/strategies/dtmf/selected_output_devices/mask/aux_line = 0
diff --git a/common/audio/stub/parameter-framework/Settings/device_for_strategy_enforced_audible.pfw b/common/audio/stub/parameter-framework/Settings/device_for_strategy_enforced_audible.pfw
deleted file mode 100644
index b71c7ab9e..000000000
--- a/common/audio/stub/parameter-framework/Settings/device_for_strategy_enforced_audible.pfw
+++ /dev/null
@@ -1,368 +0,0 @@
-supDomain: DeviceForStrategy
-
-	supDomain: EnforcedAudible
-
-		domain: UnreachableDevices
-			conf: Calibration
-				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
-					# no enforced_audible on remote submix (e.g. WFD)
-					hdmi_arc = 0
-					spdif = 0
-					aux_line = 0
-					speaker_safe = 0
-					ip = 0
-					bus = 0
-					fm = 0
-
-		domain: Speaker
-			conf: Selected
-				#
-				# strategy STRATEGY_ENFORCED_AUDIBLE uses same routing policy as STRATEGY_SONIFICATION
-				# except:
-				#    - when in call where it doesn't default to STRATEGY_PHONE behavior
-				#    - in countries where not enforced in which case it follows STRATEGY_MEDIA
-				#
-				AvailableOutputDevices Includes Speaker
-				ANY
-					ForceUseForSystem Is ForceSystemEnforced
-					ALL
-						ForceUseForMedia Is ForceSpeaker
-						AvailableOutputDevices Excludes RemoteSubmix
-						ANY
-							ForceUseForMedia IsNot ForceNoBtA2dp
-							AvailableOutputDevices Excludes BluetoothA2dp
-							AvailableOutputDevices Excludes BluetoothA2dpHeadphones
-							AvailableOutputDevices Excludes BluetoothA2dpSpeaker
-					#
-					# Speaker is also the fallback device if any of the device from Device2 domain
-					# is selected.
-					#
-					ALL
-						AvailableOutputDevices Excludes RemoteSubmix
-						AvailableOutputDevices Excludes WiredHeadphone
-						AvailableOutputDevices Excludes Line
-						AvailableOutputDevices Excludes WiredHeadset
-						AvailableOutputDevices Excludes UsbAccessory
-						AvailableOutputDevices Excludes UsbDevice
-						AvailableOutputDevices Excludes DgtlDockHeadset
-						AvailableOutputDevices Excludes Hdmi
-						ANY
-							AvailableOutputDevices Excludes AnlgDockHeadset
-							ForceUseForDock IsNot ForceAnalogDock
-
-				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
-					speaker = 1
-
-			conf: NotSelected
-				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
-					speaker = 0
-
-		domain: Device2
-			conf: RemoteSubmix
-				AvailableOutputDevices Includes RemoteSubmix
-
-				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
-					remote_submix = 1
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					stub = 0
-
-			conf: BluetoothA2dp
-				AvailableOutputDevices Includes BluetoothA2dp
-				ForceUseForMedia IsNot ForceNoBtA2dp
-
-				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 1
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					stub = 0
-
-			conf: BluetoothA2dpHeadphones
-				AvailableOutputDevices Includes BluetoothA2dpHeadphones
-				ForceUseForMedia IsNot ForceNoBtA2dp
-
-				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 1
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					stub = 0
-
-			conf: BluetoothA2dpSpeaker
-				AvailableOutputDevices Includes BluetoothA2dpSpeaker
-				ForceUseForMedia IsNot ForceNoBtA2dp
-
-				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 1
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					stub = 0
-
-			conf: WiredHeadphone
-				ForceUseForMedia IsNot ForceSpeaker
-				AvailableOutputDevices Includes WiredHeadphone
-
-				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 1
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					stub = 0
-
-			conf: Line
-				ForceUseForMedia IsNot ForceSpeaker
-				AvailableOutputDevices Includes Line
-
-				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 1
-					stub = 0
-
-			conf: WiredHeadset
-				ForceUseForMedia IsNot ForceSpeaker
-				AvailableOutputDevices Includes WiredHeadset
-
-				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 1
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					stub = 0
-
-			conf: UsbAccessory
-				ForceUseForMedia IsNot ForceSpeaker
-				AvailableOutputDevices Includes UsbAccessory
-
-				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 1
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					stub = 0
-
-			conf: UsbDevice
-				ForceUseForMedia IsNot ForceSpeaker
-				AvailableOutputDevices Includes UsbDevice
-
-				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 1
-					telephony_tx = 0
-					line = 0
-					stub = 0
-
-			conf: DgtlDockHeadset
-				ForceUseForMedia IsNot ForceSpeaker
-				AvailableOutputDevices Includes DgtlDockHeadset
-
-				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 1
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					stub = 0
-
-			conf: Hdmi
-				ForceUseForMedia IsNot ForceSpeaker
-				AvailableOutputDevices Includes Hdmi
-
-				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 1
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					stub = 0
-
-			conf: AnlgDockHeadset
-				ForceUseForMedia IsNot ForceSpeaker
-				ForceUseForDock Is ForceAnalogDock
-				AvailableOutputDevices Includes AnlgDockHeadset
-
-				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 1
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					stub = 0
-
-			conf: NoDevice
-				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
-					remote_submix = 0
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					stub = 1
diff --git a/common/audio/stub/parameter-framework/Settings/device_for_strategy_media.pfw b/common/audio/stub/parameter-framework/Settings/device_for_strategy_media.pfw
deleted file mode 100644
index ee9df0de8..000000000
--- a/common/audio/stub/parameter-framework/Settings/device_for_strategy_media.pfw
+++ /dev/null
@@ -1,352 +0,0 @@
-domainGroup: DeviceForStrategy
-
-	domainGroup: Media
-
-		domain: UnreachableDevices
-			conf: Calibration
-				component: /Policy/policy/strategies/media/selected_output_devices/mask
-					fm = 0
-					speaker_safe = 0
-					earpiece = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					telephony_tx = 0
-					ip = 0
-					bus = 0
-
-		domain: Device2
-			conf: RemoteSubmix
-				AvailableOutputDevices Includes RemoteSubmix
-
-				component: /Policy/policy/strategies/media/selected_output_devices/mask
-					speaker = 0
-					hdmi = 0
-					dgtl_dock_headset = 0
-					angl_dock_headset = 0
-					usb_device = 0
-					usb_accessory = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp = 0
-					remote_submix = 1
-					line = 0
-					stub = 0
-
-			conf: BluetoothA2dp
-				ForceUseForMedia IsNot ForceNoBtA2dp
-				ForceUseForCommunication IsNot ForceBtSco
-				AvailableOutputDevices Includes BluetoothA2dp
-
-				component: /Policy/policy/strategies/media/selected_output_devices/mask
-					speaker = 0
-					hdmi = 0
-					dgtl_dock_headset = 0
-					angl_dock_headset = 0
-					usb_device = 0
-					usb_accessory = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp = 1
-					remote_submix = 0
-					line = 0
-					stub = 0
-
-			conf: BluetoothA2dpHeadphone
-				ForceUseForMedia IsNot ForceNoBtA2dp
-				ForceUseForCommunication IsNot ForceBtSco
-				AvailableOutputDevices Includes BluetoothA2dpHeadphones
-
-				component: /Policy/policy/strategies/media/selected_output_devices/mask
-					speaker = 0
-					hdmi = 0
-					dgtl_dock_headset = 0
-					angl_dock_headset = 0
-					usb_device = 0
-					usb_accessory = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp_headphones = 1
-					bluetooth_a2dp = 0
-					remote_submix = 0
-					line = 0
-					stub = 0
-
-			conf: BluetoothA2dpSpeaker
-				ForceUseForMedia IsNot ForceNoBtA2dp
-				ForceUseForCommunication IsNot ForceBtSco
-				AvailableOutputDevices Includes BluetoothA2dpSpeaker
-
-				component: /Policy/policy/strategies/media/selected_output_devices/mask
-					speaker = 0
-					hdmi = 0
-					dgtl_dock_headset = 0
-					angl_dock_headset = 0
-					usb_device = 0
-					usb_accessory = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_a2dp_speaker = 1
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp = 0
-					remote_submix = 0
-					line = 0
-					stub = 0
-
-			conf: ForceSpeaker
-				ForceUseForMedia Is ForceSpeaker
-				AvailableOutputDevices Includes Speaker
-				#
-				# If hdmi system audio mode is on, remove speaker out of output list.
-				#
-				ForceUseForHdmiSystemAudio IsNot ForceHdmiSystemEnforced
-
-				component: /Policy/policy/strategies/media/selected_output_devices/mask
-					speaker = 1
-					hdmi = 0
-					dgtl_dock_headset = 0
-					angl_dock_headset = 0
-					usb_device = 0
-					usb_accessory = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp = 0
-					remote_submix = 0
-					line = 0
-					stub = 0
-
-			conf: WiredHeadphone
-				AvailableOutputDevices Includes WiredHeadphone
-
-				component: /Policy/policy/strategies/media/selected_output_devices/mask
-					speaker = 0
-					hdmi = 0
-					dgtl_dock_headset = 0
-					angl_dock_headset = 0
-					usb_device = 0
-					usb_accessory = 0
-					wired_headset = 0
-					wired_headphone = 1
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp = 0
-					remote_submix = 0
-					line = 0
-					stub = 0
-
-			conf: Line
-				AvailableOutputDevices Includes Line
-
-				component: /Policy/policy/strategies/media/selected_output_devices/mask
-					speaker = 0
-					hdmi = 0
-					dgtl_dock_headset = 0
-					angl_dock_headset = 0
-					usb_device = 0
-					usb_accessory = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp = 0
-					remote_submix = 0
-					line = 1
-					stub = 0
-
-			conf: WiredHeadset
-				AvailableOutputDevices Includes WiredHeadset
-
-				component: /Policy/policy/strategies/media/selected_output_devices/mask
-					speaker = 0
-					hdmi = 0
-					dgtl_dock_headset = 0
-					angl_dock_headset = 0
-					usb_device = 0
-					usb_accessory = 0
-					wired_headset = 1
-					wired_headphone = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp = 0
-					remote_submix = 0
-					line = 0
-					stub = 0
-
-			conf: UsbAccessory
-				AvailableOutputDevices Includes UsbAccessory
-
-				component: /Policy/policy/strategies/media/selected_output_devices/mask
-					speaker = 0
-					hdmi = 0
-					dgtl_dock_headset = 0
-					angl_dock_headset = 0
-					usb_device = 0
-					usb_accessory = 1
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp = 0
-					remote_submix = 0
-					line = 0
-					stub = 0
-
-			conf: UsbDevice
-				AvailableOutputDevices Includes UsbDevice
-
-				component: /Policy/policy/strategies/media/selected_output_devices/mask
-					speaker = 0
-					hdmi = 0
-					dgtl_dock_headset = 0
-					angl_dock_headset = 0
-					usb_device = 1
-					usb_accessory = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp = 0
-					remote_submix = 0
-					line = 0
-					stub = 0
-
-			conf: DgtlDockHeadset
-				AvailableOutputDevices Includes DgtlDockHeadset
-
-				component: /Policy/policy/strategies/media/selected_output_devices/mask
-					speaker = 0
-					hdmi = 0
-					dgtl_dock_headset = 1
-					angl_dock_headset = 0
-					usb_device = 0
-					usb_accessory = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp = 0
-					remote_submix = 0
-					line = 0
-					stub = 0
-
-			conf: AuxDigital
-				AvailableOutputDevices Includes Hdmi
-
-				component: /Policy/policy/strategies/media/selected_output_devices/mask
-					speaker = 0
-					hdmi = 1
-					dgtl_dock_headset = 0
-					angl_dock_headset = 0
-					usb_device = 0
-					usb_accessory = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp = 0
-					remote_submix = 0
-					line = 0
-					stub = 0
-
-			conf: AnlgDockHeadset
-				AvailableOutputDevices Includes AnlgDockHeadset
-				ForceUseForDock Is ForceAnalogDock
-
-				component: /Policy/policy/strategies/media/selected_output_devices/mask
-					speaker = 0
-					hdmi = 0
-					dgtl_dock_headset = 0
-					angl_dock_headset = 1
-					usb_device = 0
-					usb_accessory = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp = 0
-					remote_submix = 0
-					line = 0
-					stub = 0
-
-			conf: Speaker
-				AvailableOutputDevices Includes Speaker
-				#
-				# If hdmi system audio mode is on, remove speaker out of output list.
-				#
-				ForceUseForHdmiSystemAudio IsNot ForceHdmiSystemEnforced
-				ForceUseForCommunication IsNot ForceBtSco
-
-				component: /Policy/policy/strategies/media/selected_output_devices/mask
-					speaker = 1
-					hdmi = 0
-					dgtl_dock_headset = 0
-					angl_dock_headset = 0
-					usb_device = 0
-					usb_accessory = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp = 0
-					remote_submix = 0
-					line = 0
-					stub = 0
-
-			conf: Default
-				component: /Policy/policy/strategies/media/selected_output_devices/mask
-					speaker = 0
-					hdmi = 0
-					dgtl_dock_headset = 0
-					angl_dock_headset = 0
-					usb_device = 0
-					usb_accessory = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp = 0
-					remote_submix = 0
-					line = 0
-					stub = 1
-
-		domain: Arc
-			#
-			# these following domains consists in device(s) that can co-exist with others
-			# e.g. ARC, SPDIF, AUX_LINE
-			#
-			conf: Selected
-				AvailableOutputDevices Includes HdmiArc
-
-				/Policy/policy/strategies/media/selected_output_devices/mask/hdmi_arc = 1
-
-			conf: NotSelected
-				/Policy/policy/strategies/media/selected_output_devices/mask/hdmi_arc = 0
-
-		domain: Spdif
-			#
-			# these following domains consists in device(s) that can co-exist with others
-			# e.g. ARC, SPDIF, AUX_LINE
-			#
-			conf: Selected
-				AvailableOutputDevices Includes Spdif
-
-				/Policy/policy/strategies/media/selected_output_devices/mask/spdif = 1
-
-			conf: NotSelected
-				/Policy/policy/strategies/media/selected_output_devices/mask/spdif = 0
-
-		domain: AuxLine
-			conf: Selected
-				AvailableOutputDevices Includes AuxLine
-
-				/Policy/policy/strategies/media/selected_output_devices/mask/aux_line = 1
-
-			conf: NotSelected
-				/Policy/policy/strategies/media/selected_output_devices/mask/aux_line = 0
diff --git a/common/audio/stub/parameter-framework/Settings/device_for_strategy_phone.pfw b/common/audio/stub/parameter-framework/Settings/device_for_strategy_phone.pfw
deleted file mode 100644
index e8f54a54e..000000000
--- a/common/audio/stub/parameter-framework/Settings/device_for_strategy_phone.pfw
+++ /dev/null
@@ -1,497 +0,0 @@
-supDomain: DeviceForStrategy
-
-	supDomain: Phone
-
-		domain: UnreachableDevices
-			conf: Calibration
-				component: /Policy/policy/strategies/phone/selected_output_devices/mask
-					# no sonification on remote submix (e.g. WFD)
-					remote_submix = 0
-					hdmi_arc = 0
-					aux_line = 0
-					spdif = 0
-					fm = 0
-					speaker_safe = 0
-					ip = 0
-					bus = 0
-
-		domain: Device
-			conf: ScoCarkit
-				AvailableOutputDevices Includes BluetoothScoCarkit
-				ForceUseForCommunication Is ForceBtSco
-
-				component: /Policy/policy/strategies/phone/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 1
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: BluetoothScoHeadset
-				AvailableOutputDevices Includes BluetoothScoHeadset
-				ForceUseForCommunication Is ForceBtSco
-
-				component: /Policy/policy/strategies/phone/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 1
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: BluetoothSco
-				AvailableOutputDevices Includes BluetoothSco
-				ForceUseForCommunication Is ForceBtSco
-
-				component: /Policy/policy/strategies/phone/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 1
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: BluetoothA2dp
-				#
-				# Fallback BT Sco devices in case of FORCE_BT_SCO
-				# or FORCE_NONE
-				#
-				AvailableOutputDevices Includes BluetoothA2dp
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				ForceUseForMedia IsNot ForceNoBtA2dp
-				ForceUseForCommunication Is ForceNone
-
-				component: /Policy/policy/strategies/phone/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 1
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: BluetoothA2dpHeadphones
-				#
-				# Fallback BT Sco devices in case of FORCE_BT_SCO
-				# or FORCE_NONE
-				#
-				AvailableOutputDevices Includes BluetoothA2dpHeadphones
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				ForceUseForMedia IsNot ForceNoBtA2dp
-				ForceUseForCommunication Is ForceNone
-
-				component: /Policy/policy/strategies/phone/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 1
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: BluetoothA2dpSpeaker
-				#
-				# Fallback BT Sco devices in case of FORCE_BT_SCO
-				# or FORCE_NONE
-				#
-				AvailableOutputDevices Includes BluetoothA2dpSpeaker
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				ForceUseForMedia IsNot ForceNoBtA2dp
-				ForceUseForCommunication Is ForceSpeaker
-
-				component: /Policy/policy/strategies/phone/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 1
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: WiredHeadphone
-				#
-				# Fallback BT Sco devices in case of FORCE_BT_SCO
-				# or FORCE_NONE
-				#
-				AvailableOutputDevices Includes WiredHeadphone
-				ForceUseForCommunication IsNot ForceSpeaker
-
-				component: /Policy/policy/strategies/phone/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 1
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: WiredHeadset
-				#
-				# Fallback BT Sco devices in case of FORCE_BT_SCO
-				# or FORCE_NONE
-				#
-				AvailableOutputDevices Includes WiredHeadset
-				ForceUseForCommunication IsNot ForceSpeaker
-
-				component: /Policy/policy/strategies/phone/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 1
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: Line
-				AvailableOutputDevices Includes Line
-				ForceUseForCommunication IsNot ForceSpeaker
-
-				component: /Policy/policy/strategies/phone/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 1
-					speaker = 0
-					stub = 0
-
-			conf: UsbDevice
-				#
-				# Fallback BT Sco devices in case of FORCE_BT_SCO
-				# or FORCE_NONE
-				#
-				AvailableOutputDevices Includes UsbDevice
-				ANY
-					ForceUseForCommunication Is ForceBtSco
-					ForceUseForCommunication Is ForceNone
-					ALL
-						ForceUseForCommunication Is ForceSpeaker
-						#
-						# In case of Force Speaker, priority between device and accessory are
-						# inverted compared to Force None or Bt Sco
-						#
-						AvailableOutputDevices Excludes UsbAccessory
-						TelephonyMode IsNot InCall
-						TelephonyMode IsNot InCommunication
-
-				component: /Policy/policy/strategies/phone/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 1
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: UsbAccessory
-				#
-				# Fallback BT Sco devices in case of FORCE_BT_SCO
-				# or FORCE_NONE
-				#
-				AvailableOutputDevices Includes UsbAccessory
-				TelephonyMode IsNot InCommunication
-				TelephonyMode IsNot InCall
-
-				component: /Policy/policy/strategies/phone/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 1
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: DgtlDockHeadset
-				#
-				# Fallback BT Sco devices in case of FORCE_BT_SCO
-				# or FORCE_NONE
-				#
-				AvailableOutputDevices Includes DgtlDockHeadset
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-
-				component: /Policy/policy/strategies/phone/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 1
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: Hdmi
-				#
-				# Fallback BT Sco devices in case of FORCE_BT_SCO
-				# or FORCE_NONE
-				#
-				AvailableOutputDevices Includes Hdmi
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-
-				component: /Policy/policy/strategies/phone/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 1
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: AnlgDockHeadset
-				#
-				# Fallback BT Sco devices in case of FORCE_BT_SCO
-				# or FORCE_NONE
-				#
-				AvailableOutputDevices Includes AnlgDockHeadset
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-
-				component: /Policy/policy/strategies/phone/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 1
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: Earpiece
-				#
-				# Fallback BT Sco devices in case of FORCE_BT_SCO
-				# or FORCE_NONE
-				#
-				AvailableOutputDevices Includes Earpiece
-				ForceUseForCommunication IsNot ForceSpeaker
-
-				component: /Policy/policy/strategies/phone/selected_output_devices/mask
-					earpiece = 1
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 0
-
-			conf: Speaker
-				#
-				# Fallback BT Sco devices in case of FORCE_BT_SCO
-				# or FORCE_NONE
-				#
-				AvailableOutputDevices Includes Speaker
-				ForceUseForCommunication Is ForceSpeaker
-
-				component: /Policy/policy/strategies/phone/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 1
-					stub = 0
-
-			conf: Default
-				#
-				# Fallback on default output device which can be speaker for example
-				#
-				component: /Policy/policy/strategies/phone/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					speaker = 0
-					stub = 1
diff --git a/common/audio/stub/parameter-framework/Settings/device_for_strategy_rerouting.pfw b/common/audio/stub/parameter-framework/Settings/device_for_strategy_rerouting.pfw
deleted file mode 100644
index 71c5a2310..000000000
--- a/common/audio/stub/parameter-framework/Settings/device_for_strategy_rerouting.pfw
+++ /dev/null
@@ -1,313 +0,0 @@
-domainGroup: DeviceForStrategy
-
-	domainGroup: Rerouting
-		#
-		# Falls through media strategy
-		#
-		domain: UnreachableDevices
-			conf: Calibration
-				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
-					hdmi_arc = 0
-					spdif = 0
-					aux_line = 0
-					fm = 0
-					speaker_safe = 0
-					earpiece = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					telephony_tx = 0
-					ip = 0
-					bus = 0
-
-		domain: Device2
-			conf: RemoteSubmix
-				AvailableOutputDevices Includes RemoteSubmix
-
-				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
-					remote_submix = 1
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: BluetoothA2dp
-				ForceUseForMedia IsNot ForceNoBtA2dp
-				AvailableOutputDevices Includes BluetoothA2dp
-
-				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
-					remote_submix = 0
-					bluetooth_a2dp = 1
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: BluetoothA2dpHeadphone
-				ForceUseForMedia IsNot ForceNoBtA2dp
-				AvailableOutputDevices Includes BluetoothA2dpHeadphones
-
-				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
-					remote_submix = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 1
-					bluetooth_a2dp_speaker = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: BluetoothA2dpSpeaker
-				ForceUseForMedia IsNot ForceNoBtA2dp
-				AvailableOutputDevices Includes BluetoothA2dpSpeaker
-
-				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
-					remote_submix = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 1
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: ForceSpeaker
-				ForceUseForMedia Is ForceSpeaker
-				AvailableOutputDevices Includes Speaker
-
-				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
-					remote_submix = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					speaker = 1
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: WiredHeadphone
-				AvailableOutputDevices Includes WiredHeadphone
-
-				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
-					remote_submix = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 1
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: Line
-				AvailableOutputDevices Includes Line
-
-				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
-					remote_submix = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 1
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: WiredHeadset
-				AvailableOutputDevices Includes WiredHeadset
-
-				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
-					remote_submix = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					speaker = 0
-					wired_headset = 1
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: UsbAccessory
-				AvailableOutputDevices Includes UsbAccessory
-
-				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
-					remote_submix = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 1
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: UsbDevice
-				AvailableOutputDevices Includes UsbDevice
-
-				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
-					remote_submix = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 1
-					hdmi = 0
-					stub = 0
-
-			conf: DgtlDockHeadset
-				AvailableOutputDevices Includes DgtlDockHeadset
-
-				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
-					remote_submix = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 1
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: AuxDigital
-				#
-				# Rerouting is similar to media and sonification (exept here: sonification is not allowed on HDMI)
-				#
-				AvailableOutputDevices Includes Hdmi
-
-				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
-					remote_submix = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 1
-					stub = 0
-
-			conf: AnlgDockHeadset
-				AvailableOutputDevices Includes AnlgDockHeadset
-				ForceUseForDock Is ForceAnalogDock
-
-				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
-					remote_submix = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 1
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: Speaker
-				AvailableOutputDevices Includes Speaker
-
-				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
-					remote_submix = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					speaker = 1
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: Default
-				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
-					remote_submix = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					speaker = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 1
diff --git a/common/audio/stub/parameter-framework/Settings/device_for_strategy_sonification.pfw b/common/audio/stub/parameter-framework/Settings/device_for_strategy_sonification.pfw
deleted file mode 100644
index 0e0e465f0..000000000
--- a/common/audio/stub/parameter-framework/Settings/device_for_strategy_sonification.pfw
+++ /dev/null
@@ -1,504 +0,0 @@
-supDomain: DeviceForStrategy
-
-	supDomain: Sonification
-
-		domain: UnreachableDevices
-			conf: Calibration
-				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
-					# no sonification on remote submix (e.g. WFD)
-					remote_submix = 0
-					hdmi_arc = 0
-					spdif = 0
-					fm = 0
-					speaker_safe = 0
-					aux_line = 0
-					#
-					# Sonification follows phone strategy if in call but HDMI is not reachable
-					#
-					hdmi = 0
-					ip = 0
-					bus = 0
-
-		domain: Speaker
-
-			conf: Selected
-				AvailableOutputDevices Includes Speaker
-				ANY
-					#
-					# Sonification falls through ENFORCED_AUDIBLE if not in call (widely speaking)
-					#
-					ALL
-						TelephonyMode IsNot InCall
-						TelephonyMode IsNot InCommunication
-					ALL
-						#
-						# Sonification follows phone strategy if in call (widely speaking)
-						#
-						ForceUseForCommunication Is ForceSpeaker
-						ANY
-							TelephonyMode Is InCall
-							TelephonyMode Is InCommunication
-						AvailableOutputDevices Excludes Line
-
-				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
-					speaker = 1
-
-			conf: NotSelected
-				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
-					speaker = 0
-
-		domain: Device2
-
-			conf: BluetoothA2dp
-				#
-				# Sonification falls through media strategy if not in call (widely speaking)
-				#
-				AvailableOutputDevices Includes BluetoothA2dp
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				ForceUseForMedia IsNot ForceNoBtA2dp
-
-				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 1
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					stub = 0
-
-			conf: BluetoothA2dpHeadphones
-				#
-				# Sonification falls through media strategy if not in call (widely speaking)
-				#
-				AvailableOutputDevices Includes BluetoothA2dpHeadphones
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				ForceUseForMedia IsNot ForceNoBtA2dp
-
-				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 1
-					bluetooth_a2dp_speaker = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					stub = 0
-
-			conf: BluetoothA2dpSpeaker
-				#
-				# Sonification falls through media strategy if not in call (widely speaking)
-				#
-				AvailableOutputDevices Includes BluetoothA2dpSpeaker
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				ForceUseForMedia IsNot ForceNoBtA2dp
-
-				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 1
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					stub = 0
-
-			conf: ScoCarkit
-				#
-				# Sonification follows phone strategy if in call (widely speaking)
-				#
-				ANY
-					TelephonyMode Is InCall
-					TelephonyMode Is InCommunication
-				ForceUseForCommunication Is ForceBtSco
-				AvailableOutputDevices Includes BluetoothScoCarkit
-
-				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 1
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					stub = 0
-
-			conf: ScoHeadset
-				#
-				# Sonification follows phone strategy if in call (widely speaking)
-				#
-				ANY
-					TelephonyMode Is InCall
-					TelephonyMode Is InCommunication
-				ForceUseForCommunication Is ForceBtSco
-				AvailableOutputDevices Includes BluetoothScoHeadset
-
-				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 1
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					stub = 0
-
-			conf: Sco
-				#
-				# Sonification follows phone strategy if in call (widely speaking)
-				#
-				ANY
-					TelephonyMode Is InCall
-					TelephonyMode Is InCommunication
-				ForceUseForCommunication Is ForceBtSco
-				AvailableOutputDevices Includes BluetoothSco
-
-				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 1
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					stub = 0
-
-			conf: WiredHeadphone
-				AvailableOutputDevices Includes WiredHeadphone
-				ANY
-					#
-					# Sonification falls through media strategy if not in call (widely speaking)
-					#
-					ALL
-						TelephonyMode IsNot InCall
-						TelephonyMode IsNot InCommunication
-						ForceUseForMedia IsNot ForceSpeaker
-					#
-					# Sonification follows Phone strategy if in call (widely speaking)
-					#
-					ALL
-						ANY
-							TelephonyMode Is InCall
-							TelephonyMode Is InCommunication
-						ForceUseForCommunication IsNot ForceSpeaker
-
-				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 1
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					stub = 0
-
-			conf: Line
-				AvailableOutputDevices Includes Line
-				ANY
-					#
-					# Sonification follows Phone strategy if in call (widely speaking)
-					# but Line has a lower priority than WiredHeadset in this case.
-					#
-					ALL
-						ANY
-							TelephonyMode Is InCall
-							TelephonyMode Is InCommunication
-						ForceUseForCommunication IsNot ForceSpeaker
-						AvailableOutputDevices Excludes WiredHeadset
-					#
-					# Sonification falls through media strategy if not in call (widely speaking)
-					#
-					ALL
-						TelephonyMode IsNot InCall
-						TelephonyMode IsNot InCommunication
-						ForceUseForMedia IsNot ForceSpeaker
-
-				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 1
-					stub = 0
-
-			conf: WiredHeadset
-				AvailableOutputDevices Includes WiredHeadset
-				ANY
-					#
-					# Sonification falls through media strategy if not in call (widely speaking)
-					#
-					ALL
-						TelephonyMode IsNot InCall
-						TelephonyMode IsNot InCommunication
-						ForceUseForMedia IsNot ForceSpeaker
-					ALL
-						#
-						# Sonification Follows Phone Strategy if in call (widely speaking)
-						#
-						ANY
-							TelephonyMode Is InCall
-							TelephonyMode Is InCommunication
-						ForceUseForCommunication IsNot ForceSpeaker
-
-				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 1
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					stub = 0
-
-			conf: UsbDevice
-				AvailableOutputDevices Includes UsbDevice
-				ANY
-					#
-					# Sonification falls through media strategy if not in call (widely speaking)
-					#
-					ALL
-						AvailableOutputDevices Excludes UsbAccessory
-						TelephonyMode IsNot InCall
-						TelephonyMode IsNot InCommunication
-						ForceUseForMedia IsNot ForceSpeaker
-					ALL
-						#
-						# Sonification Follows Phone Strategy if in call (widely speaking)
-						#
-						ANY
-							TelephonyMode Is InCall
-							TelephonyMode Is InCommunication
-						ForceUseForCommunication IsNot ForceSpeaker
-
-				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 1
-					telephony_tx = 0
-					line = 0
-					stub = 0
-
-			conf: UsbAccessory
-				AvailableOutputDevices Includes UsbAccessory
-				#
-				# Sonification falls through media strategy if not in call (widely speaking)
-				#
-				# Sonification Follows Phone Strategy if in call (widely speaking)
-				# but USB Accessory not reachable in call.
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				ForceUseForMedia IsNot ForceSpeaker
-
-				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 1
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					stub = 0
-
-			conf: DgtlDockHeadset
-				AvailableOutputDevices Includes DgtlDockHeadset
-				#
-				# Sonification falls through media strategy if not in call
-				#
-				# Sonification Follows Phone Strategy if in call (widely speaking)
-				# but DgtlDockHeadset not reachable in call.
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				ForceUseForMedia IsNot ForceSpeaker
-
-				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 1
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					stub = 0
-
-			conf: AnlgDockHeadset
-				AvailableOutputDevices Includes AnlgDockHeadset
-				#
-				# Sonification falls through media strategy if not in call
-				#
-				# Sonification Follows Phone Strategy if in call (widely speaking)
-				# but AnlgDockHeadset not reachable in call.
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				ForceUseForMedia IsNot ForceSpeaker
-				ForceUseForDock Is ForceAnalogDock
-
-				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					angl_dock_headset = 1
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					stub = 0
-
-			conf: Earpiece
-				#
-				# Sonification Follows Phone Strategy if in call
-				#
-				ANY
-					TelephonyMode Is InCall
-					TelephonyMode Is InCommunication
-				ForceUseForCommunication IsNot ForceSpeaker
-				AvailableOutputDevices Includes Earpiece
-
-				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
-					earpiece = 1
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					stub = 0
-
-			conf: None
-				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
-					earpiece = 0
-					wired_headset = 0
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					stub = 1
diff --git a/common/audio/stub/parameter-framework/Settings/device_for_strategy_sonification_respectful.pfw b/common/audio/stub/parameter-framework/Settings/device_for_strategy_sonification_respectful.pfw
deleted file mode 100644
index 4614bd913..000000000
--- a/common/audio/stub/parameter-framework/Settings/device_for_strategy_sonification_respectful.pfw
+++ /dev/null
@@ -1,549 +0,0 @@
-domainGroup: DeviceForStrategy
-
-	domainGroup: SonificationRespectful
-		#
-		# Sonificiation Respectful follows:
-		#	- If in call: Strategy sonification (that follows phone strategy in call also...)
-		#	- If not in call AND a music stream is active remotely: Strategy sonification (that
-		#     follows enforced audible, which follows media)
-		#	- if not in call and no music stream active remotely and music stream active): strategy
-		#     media
-		#   - Otherwise follows sonification by replacing speaker with speaker safe if speaker is
-		#	  selected.
-		#
-		# Case of stream active handled programmatically
-
-		domain: UnreachableDevices
-			conf: Calibration
-				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
-					remote_submix = 0
-					hdmi_arc = 0
-					aux_line = 0
-					spdif = 0
-					fm = 0
-					telephony_tx = 0
-					ip = 0
-					bus = 0
-
-		domain: Speakers
-
-			conf: SpeakerSafe
-				AvailableOutputDevices Includes Speaker
-				AvailableOutputDevices Includes SpeakerSafe
-				#
-				# Follows sonification strategy if not in call and replace speaker by speaker safe
-				# if and only if speaker only selected
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-
-				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
-					speaker_safe = 1
-					speaker = 0
-
-			conf: Speaker
-				AvailableOutputDevices Includes Speaker
-				ANY
-					#
-					# Follows sonification strategy if not in call
-					#
-					ALL
-						TelephonyMode IsNot InCall
-						TelephonyMode IsNot InCommunication
-					ALL
-						#
-						# Follows Phone Strategy if call
-						#
-						ForceUseForCommunication Is ForceSpeaker
-						ANY
-							TelephonyMode Is InCall
-							TelephonyMode Is InCommunication
-						AvailableOutputDevices Excludes Line
-
-				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
-					speaker_safe = 0
-					speaker = 1
-
-			conf: None
-				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
-					speaker_safe = 0
-					speaker = 0
-
-		domain: Device2
-			conf: BluetoothA2dp
-				#
-				# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
-				# SonificationRespectful follows media if music stream is active
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				ForceUseForMedia Is ForceNoBtA2dp
-				AvailableOutputDevices Includes BluetoothA2dp
-
-				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
-					earpiece = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp = 1
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: BluetoothA2dpHeadphones
-				#
-				# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
-				# SonificationRespectful follows media if music stream is active
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				ForceUseForMedia Is ForceNoBtA2dp
-				AvailableOutputDevices Includes BluetoothA2dpHeadphones
-
-				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
-					earpiece = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp_headphones = 1
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: BluetoothA2dpSpeaker
-				#
-				# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
-				# SonificationRespectful follows media if music stream is active
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				ForceUseForMedia Is ForceNoBtA2dp
-				AvailableOutputDevices Includes BluetoothA2dpSpeaker
-
-				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
-					earpiece = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 1
-					bluetooth_a2dp = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: BluetoothScoCarkit
-				#
-				# SonificationRespectful Follows Phone strategy if in call
-				#
-				ANY
-					TelephonyMode Is InCall
-					TelephonyMode Is InCommunication
-				ForceUseForCommunication Is ForceBtSco
-				AvailableOutputDevices Includes BluetoothScoCarkit
-
-				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
-					earpiece = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 1
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: BluetoothScoHeadset
-				#
-				# SonificationRespectful Follows Phone strategy if in call
-				#
-				ANY
-					TelephonyMode Is InCall
-					TelephonyMode Is InCommunication
-				ForceUseForCommunication Is ForceBtSco
-				AvailableOutputDevices Includes BluetoothScoHeadset
-
-				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
-					earpiece = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 1
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: BluetoothSco
-				#
-				# SonificationRespectful Follows Phone strategy if in call
-				#
-				ANY
-					TelephonyMode Is InCall
-					TelephonyMode Is InCommunication
-				ForceUseForCommunication Is ForceBtSco
-				AvailableOutputDevices Includes BluetoothSco
-
-				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
-					earpiece = 0
-					bluetooth_sco = 1
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: WiredHeadphone
-				ANY
-					ALL
-						#
-						# SonificationRespectful Follows Phone strategy if in call
-						#
-						ANY
-							TelephonyMode Is InCall
-							TelephonyMode Is InCommunication
-						ForceUseForCommunication IsNot ForceSpeaker
-					ALL
-						#
-						# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
-						# SonificationRespectful follows media if music stream is active
-						#
-						TelephonyMode IsNot InCall
-						TelephonyMode IsNot InCommunication
-						ForceUseForMedia IsNot ForceSpeaker
-				AvailableOutputDevices Includes WiredHeadphone
-
-				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
-					earpiece = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp = 0
-					wired_headset = 0
-					wired_headphone = 1
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: Line
-				ANY
-					#
-					# SonificationRespectful Follows Phone strategy if in call
-					# but Line has a lower priority than WiredHeadset in this case.
-					#
-					#
-					ALL
-						ANY
-							TelephonyMode Is InCall
-							TelephonyMode Is InCommunication
-						ForceUseForCommunication IsNot ForceSpeaker
-						AvailableOutputDevices Excludes WiredHeadset
-					#
-					# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
-					# SonificationRespectful follows media if music stream is active
-					#
-					ALL
-						TelephonyMode IsNot InCall
-						TelephonyMode IsNot InCommunication
-						AvailableOutputDevices Includes WiredHeadphone
-						ForceUseForMedia IsNot ForceSpeaker
-				AvailableOutputDevices Includes Line
-
-				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
-					earpiece = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 1
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: WiredHeadset
-				ANY
-					ALL
-						#
-						# SonificationRespectful Follows Phone strategy if in call
-						#
-						ANY
-							TelephonyMode Is InCall
-							TelephonyMode Is InCommunication
-						ForceUseForCommunication IsNot ForceSpeaker
-					ALL
-						#
-						# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
-						# SonificationRespectful follows media if music stream is active
-						#
-						TelephonyMode IsNot InCall
-						TelephonyMode IsNot InCommunication
-						ForceUseForMedia IsNot ForceSpeaker
-				AvailableOutputDevices Includes WiredHeadset
-
-				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
-					earpiece = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp = 0
-					wired_headset = 1
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: UsbDevice
-				ANY
-					ALL
-						#
-						# SonificationRespectful Follows Phone strategy if in call
-						#
-						ANY
-							TelephonyMode Is InCall
-							TelephonyMode Is InCommunication
-						ForceUseForCommunication IsNot ForceSpeaker
-					ALL
-						#
-						# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
-						# SonificationRespectful follows media if music stream is active
-						#
-						TelephonyMode IsNot InCall
-						TelephonyMode IsNot InCommunication
-						ForceUseForMedia IsNot ForceSpeaker
-						AvailableOutputDevices Excludes UsbAccessory
-				AvailableOutputDevices Includes UsbDevice
-
-				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
-					earpiece = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 1
-					hdmi = 0
-					stub = 0
-
-			conf: UsbAccessory
-				#
-				# SonificationRespectful Follows Phone strategy if in call (widely speaking)
-				# but UsbAccessory not reachable in call.
-				#
-				# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
-				# SonificationRespectful follows media if music stream is active
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				ForceUseForMedia IsNot ForceSpeaker
-				AvailableOutputDevices Includes UsbAccessory
-
-				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
-					earpiece = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 1
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: DgtlDockHeadset
-				#
-				# SonificationRespectful Follows Phone strategy if in call (widely speaking)
-				# but DgtlDockHeadset not reachable in call.
-				#
-				# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
-				# SonificationRespectful follows media if music stream is active
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				ForceUseForMedia IsNot ForceSpeaker
-				AvailableOutputDevices Includes DgtlDockHeadset
-
-				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
-					earpiece = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 1
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: AuxDigital
-				#
-				# SonificationRespectful Follows Phone strategy if in call (widely speaking)
-				# but HDMI not reachable in call.
-				#
-				# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
-				# SonificationRespectful follows media if music stream is active
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				ForceUseForMedia IsNot ForceSpeaker
-				AvailableOutputDevices Includes Hdmi
-
-				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
-					earpiece = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 1
-					stub = 0
-
-			conf: AnlgDockHeadset
-				#
-				# SonificationRespectful Follows Phone strategy if in call (widely speaking)
-				# but AnlgDockHeadset not reachable in call.
-				#
-				# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
-				# SonificationRespectful follows media if music stream is active
-				#
-				TelephonyMode IsNot InCall
-				TelephonyMode IsNot InCommunication
-				ForceUseForMedia IsNot ForceSpeaker
-				ForceUseForDock Is ForceAnalogDock
-				AvailableOutputDevices Includes AnlgDockHeadset
-
-				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
-					earpiece = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 1
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
-
-			conf: Earpiece
-				#
-				# SonificationRespectful Follows Phone strategy if in call
-				#
-				ANY
-					TelephonyMode Is InCall
-					TelephonyMode Is InCommunication
-				ForceUseForCommunication IsNot ForceSpeaker
-				AvailableOutputDevices Includes Earpiece
-
-				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
-					earpiece = 1
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					bluetooth_a2dp = 0
-					wired_headset = 0
-					wired_headphone = 0
-					line = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					hdmi = 0
-					stub = 0
diff --git a/common/audio/stub/parameter-framework/Settings/device_for_strategy_transmitted_through_speaker.pfw b/common/audio/stub/parameter-framework/Settings/device_for_strategy_transmitted_through_speaker.pfw
deleted file mode 100644
index cd745c484..000000000
--- a/common/audio/stub/parameter-framework/Settings/device_for_strategy_transmitted_through_speaker.pfw
+++ /dev/null
@@ -1,42 +0,0 @@
-supDomain: DeviceForStrategy
-
-	supDomain: TransmittedThroughSpeaker
-		domain: UnreacheableDevices
-			conf: Calibration
-				component: /Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask
-					remote_submix = 0
-					hdmi_arc = 0
-					spdif = 0
-					aux_line = 0
-					fm = 0
-					speaker_safe = 0
-					earpiece = 0
-					wired_headset = 1
-					wired_headphone = 0
-					bluetooth_sco = 0
-					bluetooth_sco_headset = 0
-					bluetooth_sco_carkit = 0
-					bluetooth_a2dp = 0
-					bluetooth_a2dp_headphones = 0
-					bluetooth_a2dp_speaker = 0
-					hdmi = 0
-					angl_dock_headset = 0
-					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 0
-					telephony_tx = 0
-					line = 0
-					ip = 0
-					bus = 0
-					stub = 0
-
-		domain: Speaker
-			conf: Selected
-				AvailableOutputDevices Includes Speaker
-
-				component: /Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask
-					speaker = 1
-
-			conf: NotSelected
-				component: /Policy/policy/strategies/transmitted_through_speaker/selected_output_devices/mask
-					speaker = 0
diff --git a/common/audio/stub/parameter-framework/Settings/strategy_for_stream.pfw b/common/audio/stub/parameter-framework/Settings/strategy_for_stream.pfw
deleted file mode 100644
index 0cd729271..000000000
--- a/common/audio/stub/parameter-framework/Settings/strategy_for_stream.pfw
+++ /dev/null
@@ -1,19 +0,0 @@
-domain: StrategyForStream
-
-	conf: Calibration
-		/Policy/policy/streams/voice_call/applicable_strategy/strategy = phone
-		#
-		# NOTE: SYSTEM stream uses MEDIA strategy because muting music and switching outputs
-		# while key clicks are played produces a poor result
-		#
-		/Policy/policy/streams/system/applicable_strategy/strategy = media
-		/Policy/policy/streams/ring/applicable_strategy/strategy = sonification
-		/Policy/policy/streams/music/applicable_strategy/strategy = media
-		/Policy/policy/streams/alarm/applicable_strategy/strategy = sonification
-		/Policy/policy/streams/notification/applicable_strategy/strategy = sonification_respectful
-		/Policy/policy/streams/bluetooth_sco/applicable_strategy/strategy = phone
-		/Policy/policy/streams/enforced_audible/applicable_strategy/strategy = enforced_audible
-		/Policy/policy/streams/dtmf/applicable_strategy/strategy = dtmf
-		/Policy/policy/streams/tts/applicable_strategy/strategy = transmitted_through_speaker
-		/Policy/policy/streams/accessibility/applicable_strategy/strategy = accessibility
-		/Policy/policy/streams/rerouting/applicable_strategy/strategy = rerouting
diff --git a/common/audio/stub/parameter-framework/Settings/strategy_for_usage.pfw b/common/audio/stub/parameter-framework/Settings/strategy_for_usage.pfw
deleted file mode 100644
index bd807608b..000000000
--- a/common/audio/stub/parameter-framework/Settings/strategy_for_usage.pfw
+++ /dev/null
@@ -1,38 +0,0 @@
-supDomain: SelectedStrategyForUsages
-
-	domain: Calibration
-		conf: Calibration
-			/Policy/policy/usages/unknown/applicable_strategy/strategy = media
-			/Policy/policy/usages/media/applicable_strategy/strategy = media
-			/Policy/policy/usages/voice_communication/applicable_strategy/strategy = phone
-			/Policy/policy/usages/voice_communication_signalling/applicable_strategy/strategy = dtmf
-			/Policy/policy/usages/alarm/applicable_strategy/strategy = sonification
-			/Policy/policy/usages/notification/applicable_strategy/strategy = sonification_respectful
-			/Policy/policy/usages/notification_telephony_ringtone/applicable_strategy/strategy = sonification
-			/Policy/policy/usages/notification_communication_request/applicable_strategy/strategy = sonification_respectful
-			/Policy/policy/usages/notification_communication_instant/applicable_strategy/strategy = sonification_respectful
-			/Policy/policy/usages/notification_communication_delayed/applicable_strategy/strategy = sonification_respectful
-			/Policy/policy/usages/notification_event/applicable_strategy/strategy = sonification_respectful
-			/Policy/policy/usages/assistance_navigation_guidance/applicable_strategy/strategy = media
-			/Policy/policy/usages/assistance_sonification/applicable_strategy/strategy = media
-			/Policy/policy/usages/game/applicable_strategy/strategy = media
-
-	domain: AssistanceAccessibility
-		conf: Sonification
-			#
-			# In case of Ring or Alarm stream type active, switching to sonification
-			# @todo: handle this dynamic case. As a WA, using Ringtone mode...
-			#
-			TelephonyMode Is RingTone
-
-			/Policy/policy/usages/assistance_accessibility/applicable_strategy/strategy = sonification
-
-		conf: Phone
-			ANY
-				TelephonyMode Is InCall
-				TelephonyMode Is InCommunication
-
-			/Policy/policy/usages/assistance_accessibility/applicable_strategy/strategy = phone
-
-		conf: Accessibility
-			/Policy/policy/usages/assistance_accessibility/applicable_strategy/strategy = accessibility
diff --git a/common/audio/stub/parameter-framework/Settings/volumes.pfw b/common/audio/stub/parameter-framework/Settings/volumes.pfw
deleted file mode 100644
index b7edfa179..000000000
--- a/common/audio/stub/parameter-framework/Settings/volumes.pfw
+++ /dev/null
@@ -1,26 +0,0 @@
-supDomain: VolumeProfilesForStream
-	domain: Calibration
-		conf: Calibration
-			/Policy/policy/streams/voice_call/applicable_volume_profile/volume_profile = voice_call
-			/Policy/policy/streams/system/applicable_volume_profile/volume_profile = system
-			/Policy/policy/streams/ring/applicable_volume_profile/volume_profile = ring
-			/Policy/policy/streams/music/applicable_volume_profile/volume_profile = music
-			/Policy/policy/streams/alarm/applicable_volume_profile/volume_profile = alarm
-			/Policy/policy/streams/notification/applicable_volume_profile/volume_profile = notification
-			/Policy/policy/streams/bluetooth_sco/applicable_volume_profile/volume_profile = bluetooth_sco
-			/Policy/policy/streams/enforced_audible/applicable_volume_profile/volume_profile = enforced_audible
-			/Policy/policy/streams/tts/applicable_volume_profile/volume_profile = tts
-			/Policy/policy/streams/accessibility/applicable_volume_profile/volume_profile = accessibility
-			/Policy/policy/streams/rerouting/applicable_volume_profile/volume_profile = rerouting
-			/Policy/policy/streams/patch/applicable_volume_profile/volume_profile = patch
-
-	domain: Dtmf
-		conf: InCall
-			ANY
-				TelephonyMode Is InCall
-				TelephonyMode Is InCommunication
-
-			/Policy/policy/streams/dtmf/applicable_volume_profile/volume_profile = voice_call
-
-		conf: OutOfCall
-			/Policy/policy/streams/dtmf/applicable_volume_profile/volume_profile = dtmf
diff --git a/common/audio/stub/parameter-framework/SettingsNoInput/device_for_input_source.pfw b/common/audio/stub/parameter-framework/SettingsNoInput/device_for_input_source.pfw
deleted file mode 100644
index 986864d22..000000000
--- a/common/audio/stub/parameter-framework/SettingsNoInput/device_for_input_source.pfw
+++ /dev/null
@@ -1,283 +0,0 @@
-supDomain: DeviceForInputSource
-	domain: Calibration
-		conf: Calibration
-			#
-			# Note that ALL input devices must have the sign bit set to 1.
-			# As the devices is a mask, use the "in" bit as a direction indicator.
-			#
-			component: /Policy/policy/input_sources/default/applicable_input_device/mask
-				communication = 0
-				ambient = 0
-				builtin_mic = 0
-				bluetooth_sco_headset = 0
-				wired_headset = 0
-				hdmi = 0
-				telephony_rx = 0
-				back_mic = 0
-				remote_submix = 0
-				anlg_dock_headset = 0
-				dgtl_dock_headset = 0>
-				usb_accessory = 0
-				usb_device = 0
-				fm_tuner = 0
-				tv_tuner = 0
-				line = 0
-				spdif = 0
-				bluetooth_a2dp = 0
-				loopback = 0
-				ip = 0
-				bus = 0
-				stub = 1
-			component: /Policy/policy/input_sources/mic/applicable_input_device/mask
-				communication = 0
-				ambient = 0
-				builtin_mic = 0
-				bluetooth_sco_headset = 0
-				wired_headset = 0
-				hdmi = 0
-				telephony_rx = 0
-				back_mic = 0
-				remote_submix = 0
-				anlg_dock_headset = 0
-				dgtl_dock_headset = 0>
-				usb_accessory = 0
-				usb_device = 0
-				fm_tuner = 0
-				tv_tuner = 0
-				line = 0
-				spdif = 0
-				bluetooth_a2dp = 0
-				loopback = 0
-				ip = 0
-				bus = 0
-				stub = 1
-			component: /Policy/policy/input_sources/voice_downlink/applicable_input_device/mask
-				communication = 0
-				ambient = 0
-				builtin_mic = 0
-				bluetooth_sco_headset = 0
-				wired_headset = 0
-				hdmi = 0
-				telephony_rx = 0
-				back_mic = 0
-				remote_submix = 0
-				anlg_dock_headset = 0
-				dgtl_dock_headset = 0>
-				usb_accessory = 0
-				usb_device = 0
-				fm_tuner = 0
-				tv_tuner = 0
-				line = 0
-				spdif = 0
-				bluetooth_a2dp = 0
-				loopback = 0
-				ip = 0
-				bus = 0
-				stub = 1
-			component: /Policy/policy/input_sources/voice_call/applicable_input_device/mask
-				communication = 0
-				ambient = 0
-				builtin_mic = 0
-				bluetooth_sco_headset = 0
-				wired_headset = 0
-				hdmi = 0
-				telephony_rx = 0
-				back_mic = 0
-				remote_submix = 0
-				anlg_dock_headset = 0
-				dgtl_dock_headset = 0>
-				usb_accessory = 0
-				usb_device = 0
-				fm_tuner = 0
-				tv_tuner = 0
-				line = 0
-				spdif = 0
-				bluetooth_a2dp = 0
-				loopback = 0
-				ip = 0
-				bus = 0
-				stub = 1
-			component: /Policy/policy/input_sources/voice_uplink/applicable_input_device/mask
-				communication = 0
-				ambient = 0
-				builtin_mic = 0
-				bluetooth_sco_headset = 0
-				wired_headset = 0
-				hdmi = 0
-				telephony_rx = 0
-				back_mic = 0
-				remote_submix = 0
-				anlg_dock_headset = 0
-				dgtl_dock_headset = 0>
-				usb_accessory = 0
-				usb_device = 0
-				fm_tuner = 0
-				tv_tuner = 0
-				line = 0
-				spdif = 0
-				bluetooth_a2dp = 0
-				loopback = 0
-				ip = 0
-				bus = 0
-				stub = 1
-			component: /Policy/policy/input_sources/camcorder/applicable_input_device/mask
-				communication = 0
-				ambient = 0
-				builtin_mic = 0
-				bluetooth_sco_headset = 0
-				wired_headset = 0
-				hdmi = 0
-				telephony_rx = 0
-				back_mic = 0
-				remote_submix = 0
-				anlg_dock_headset = 0
-				dgtl_dock_headset = 0>
-				usb_accessory = 0
-				usb_device = 0
-				fm_tuner = 0
-				tv_tuner = 0
-				line = 0
-				spdif = 0
-				bluetooth_a2dp = 0
-				loopback = 0
-				ip = 0
-				bus = 0
-				stub = 1
-			component: /Policy/policy/input_sources/voice_recognition/applicable_input_device/mask
-				communication = 0
-				ambient = 0
-				builtin_mic = 0
-				bluetooth_sco_headset = 0
-				wired_headset = 0
-				hdmi = 0
-				telephony_rx = 0
-				back_mic = 0
-				remote_submix = 0
-				anlg_dock_headset = 0
-				dgtl_dock_headset = 0>
-				usb_accessory = 0
-				usb_device = 0
-				fm_tuner = 0
-				tv_tuner = 0
-				line = 0
-				spdif = 0
-				bluetooth_a2dp = 0
-				loopback = 0
-				ip = 0
-				bus = 0
-				stub = 1
-			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
-				communication = 0
-				ambient = 0
-				builtin_mic = 0
-				bluetooth_sco_headset = 0
-				wired_headset = 0
-				hdmi = 0
-				telephony_rx = 0
-				back_mic = 0
-				remote_submix = 0
-				anlg_dock_headset = 0
-				dgtl_dock_headset = 0>
-				usb_accessory = 0
-				usb_device = 0
-				fm_tuner = 0
-				tv_tuner = 0
-				line = 0
-				spdif = 0
-				bluetooth_a2dp = 0
-				loopback = 0
-				ip = 0
-				bus = 0
-				stub = 1
-			component: /Policy/policy/input_sources/remote_submix/applicable_input_device/mask
-				communication = 0
-				ambient = 0
-				builtin_mic = 0
-				bluetooth_sco_headset = 0
-				wired_headset = 0
-				hdmi = 0
-				telephony_rx = 0
-				back_mic = 0
-				remote_submix = 0
-				anlg_dock_headset = 0
-				dgtl_dock_headset = 0>
-				usb_accessory = 0
-				usb_device = 0
-				fm_tuner = 0
-				tv_tuner = 0
-				line = 0
-				spdif = 0
-				bluetooth_a2dp = 0
-				loopback = 0
-				ip = 0
-				bus = 0
-				stub = 1
-			component: /Policy/policy/input_sources/hotword/applicable_input_device/mask
-				communication = 0
-				ambient = 0
-				builtin_mic = 0
-				bluetooth_sco_headset = 0
-				wired_headset = 0
-				hdmi = 0
-				telephony_rx = 0
-				back_mic = 0
-				remote_submix = 0
-				anlg_dock_headset = 0
-				dgtl_dock_headset = 0>
-				usb_accessory = 0
-				usb_device = 0
-				fm_tuner = 0
-				tv_tuner = 0
-				line = 0
-				spdif = 0
-				bluetooth_a2dp = 0
-				loopback = 0
-				ip = 0
-				bus = 0
-				stub = 1
-			component: /Policy/policy/input_sources/unprocessed/applicable_input_device/mask
-				communication = 0
-				ambient = 0
-				builtin_mic = 0
-				bluetooth_sco_headset = 0
-				wired_headset = 0
-				hdmi = 0
-				telephony_rx = 0
-				back_mic = 0
-				remote_submix = 0
-				anlg_dock_headset = 0
-				dgtl_dock_headset = 0>
-				usb_accessory = 0
-				usb_device = 0
-				fm_tuner = 0
-				tv_tuner = 0
-				line = 0
-				spdif = 0
-				bluetooth_a2dp = 0
-				loopback = 0
-				ip = 0
-				bus = 0
-				stub = 1
-			component: /Policy/policy/input_sources/fm_tuner/applicable_input_device/mask
-				communication = 0
-				ambient = 0
-				builtin_mic = 0
-				bluetooth_sco_headset = 0
-				wired_headset = 0
-				hdmi = 0
-				telephony_rx = 0
-				back_mic = 0
-				remote_submix = 0
-				anlg_dock_headset = 0
-				dgtl_dock_headset = 0>
-				usb_accessory = 0
-				usb_device = 0
-				fm_tuner = 0
-				tv_tuner = 0
-				line = 0
-				spdif = 0
-				bluetooth_a2dp = 0
-				loopback = 0
-				ip = 0
-				bus = 0
-				stub = 1
diff --git a/common/audio/stub/parameter-framework/SettingsNoOutput/device_for_strategies.pfw b/common/audio/stub/parameter-framework/SettingsNoOutput/device_for_strategies.pfw
deleted file mode 100644
index 8b8faa3a2..000000000
--- a/common/audio/stub/parameter-framework/SettingsNoOutput/device_for_strategies.pfw
+++ /dev/null
@@ -1,254 +0,0 @@
-domain: DeviceForStrategy
-	conf: Calibration
-		component: /Policy/policy/strategies
-			component: media/selected_output_devices/mask
-				earpiece = 0
-				speaker = 0
-				wired_headset = 0
-				wired_headphone = 0
-				bluetooth_sco = 0
-				bluetooth_sco_headset = 0
-				bluetooth_sco_carkit = 0
-				bluetooth_a2dp = 0>
-				bluetooth_a2dp_headphones = 0
-				bluetooth_a2dp_speaker = 0
-				hdmi = 0
-				angl_dock_headset = 0
-				dgtl_dock_headset = 0
-				usb_accessory = 0
-				usb_device = 0
-				remote_submix = 0
-				telephony_tx = 0
-				line = 0
-				hdmi_arc = 0
-				spdif = 0
-				fm = 0
-				aux_line = 0
-				speaker_safe = 0
-				ip = 0
-				bus = 0
-				stub = 1
-
-			component: phone/selected_output_devices/mask
-				earpiece = 0
-				speaker = 0
-				wired_headset = 0
-				wired_headphone = 0
-				bluetooth_sco = 0
-				bluetooth_sco_headset = 0
-				bluetooth_sco_carkit = 0
-				bluetooth_a2dp = 0>
-				bluetooth_a2dp_headphones = 0
-				bluetooth_a2dp_speaker = 0
-				hdmi = 0
-				angl_dock_headset = 0
-				dgtl_dock_headset = 0
-				usb_accessory = 0
-				usb_device = 0
-				remote_submix = 0
-				telephony_tx = 0
-				line = 0
-				hdmi_arc = 0
-				spdif = 0
-				fm = 0
-				aux_line = 0
-				speaker_safe = 0
-				ip = 0
-				bus = 0
-				stub = 1
-
-			component: sonification/selected_output_devices/mask
-				earpiece = 0
-				speaker = 0
-				wired_headset = 0
-				wired_headphone = 0
-				bluetooth_sco = 0
-				bluetooth_sco_headset = 0
-				bluetooth_sco_carkit = 0
-				bluetooth_a2dp = 0>
-				bluetooth_a2dp_headphones = 0
-				bluetooth_a2dp_speaker = 0
-				hdmi = 0
-				angl_dock_headset = 0
-				dgtl_dock_headset = 0
-				usb_accessory = 0
-				usb_device = 0
-				remote_submix = 0
-				telephony_tx = 0
-				line = 0
-				hdmi_arc = 0
-				spdif = 0
-				fm = 0
-				aux_line = 0
-				speaker_safe = 0
-				ip = 0
-				bus = 0
-				stub = 1
-
-			component: sonification_respectful/selected_output_devices/mask
-				earpiece = 0
-				speaker = 0
-				wired_headset = 0
-				wired_headphone = 0
-				bluetooth_sco = 0
-				bluetooth_sco_headset = 0
-				bluetooth_sco_carkit = 0
-				bluetooth_a2dp = 0>
-				bluetooth_a2dp_headphones = 0
-				bluetooth_a2dp_speaker = 0
-				hdmi = 0
-				angl_dock_headset = 0
-				dgtl_dock_headset = 0
-				usb_accessory = 0
-				usb_device = 0
-				remote_submix = 0
-				telephony_tx = 0
-				line = 0
-				hdmi_arc = 0
-				spdif = 0
-				fm = 0
-				aux_line = 0
-				speaker_safe = 0
-				ip = 0
-				bus = 0
-				stub = 1
-
-			component: dtmf/selected_output_devices/mask
-				earpiece = 0
-				speaker = 0
-				wired_headset = 0
-				wired_headphone = 0
-				bluetooth_sco = 0
-				bluetooth_sco_headset = 0
-				bluetooth_sco_carkit = 0
-				bluetooth_a2dp = 0>
-				bluetooth_a2dp_headphones = 0
-				bluetooth_a2dp_speaker = 0
-				hdmi = 0
-				angl_dock_headset = 0
-				dgtl_dock_headset = 0
-				usb_accessory = 0
-				usb_device = 0
-				remote_submix = 0
-				telephony_tx = 0
-				line = 0
-				hdmi_arc = 0
-				spdif = 0
-				fm = 0
-				aux_line = 0
-				speaker_safe = 0
-				ip = 0
-				bus = 0
-				stub = 1
-
-			component: enforced_audible/selected_output_devices/mask
-				earpiece = 0
-				speaker = 0
-				wired_headset = 0
-				wired_headphone = 0
-				bluetooth_sco = 0
-				bluetooth_sco_headset = 0
-				bluetooth_sco_carkit = 0
-				bluetooth_a2dp = 0>
-				bluetooth_a2dp_headphones = 0
-				bluetooth_a2dp_speaker = 0
-				hdmi = 0
-				angl_dock_headset = 0
-				dgtl_dock_headset = 0
-				usb_accessory = 0
-				usb_device = 0
-				remote_submix = 0
-				telephony_tx = 0
-				line = 0
-				hdmi_arc = 0
-				spdif = 0
-				fm = 0
-				aux_line = 0
-				speaker_safe = 0
-				ip = 0
-				bus = 0
-				stub = 1
-
-			component: transmitted_through_speaker/selected_output_devices/mask
-				earpiece = 0
-				speaker = 0
-				wired_headset = 0
-				wired_headphone = 0
-				bluetooth_sco = 0
-				bluetooth_sco_headset = 0
-				bluetooth_sco_carkit = 0
-				bluetooth_a2dp = 0>
-				bluetooth_a2dp_headphones = 0
-				bluetooth_a2dp_speaker = 0
-				hdmi = 0
-				angl_dock_headset = 0
-				dgtl_dock_headset = 0
-				usb_accessory = 0
-				usb_device = 0
-				remote_submix = 0
-				telephony_tx = 0
-				line = 0
-				hdmi_arc = 0
-				spdif = 0
-				fm = 0
-				aux_line = 0
-				speaker_safe = 0
-				ip = 0
-				bus = 0
-				stub = 1
-
-			component: accessibility/selected_output_devices/mask
-				earpiece = 0
-				speaker = 0
-				wired_headset = 0
-				wired_headphone = 0
-				bluetooth_sco = 0
-				bluetooth_sco_headset = 0
-				bluetooth_sco_carkit = 0
-				bluetooth_a2dp = 0>
-				bluetooth_a2dp_headphones = 0
-				bluetooth_a2dp_speaker = 0
-				hdmi = 0
-				angl_dock_headset = 0
-				dgtl_dock_headset = 0
-				usb_accessory = 0
-				usb_device = 0
-				remote_submix = 0
-				telephony_tx = 0
-				line = 0
-				hdmi_arc = 0
-				spdif = 0
-				fm = 0
-				aux_line = 0
-				speaker_safe = 0
-				ip = 0
-				bus = 0
-				stub = 1
-
-			component: rerouting/selected_output_devices/mask
-				earpiece = 0
-				speaker = 0
-				wired_headset = 0
-				wired_headphone = 0
-				bluetooth_sco = 0
-				bluetooth_sco_headset = 0
-				bluetooth_sco_carkit = 0
-				bluetooth_a2dp = 0>
-				bluetooth_a2dp_headphones = 0
-				bluetooth_a2dp_speaker = 0
-				hdmi = 0
-				angl_dock_headset = 0
-				dgtl_dock_headset = 0
-				usb_accessory = 0
-				usb_device = 0
-				remote_submix = 0
-				telephony_tx = 0
-				line = 0
-				hdmi_arc = 0
-				spdif = 0
-				fm = 0
-				aux_line = 0
-				speaker_safe = 0
-				ip = 0
-				bus = 0
-				stub = 1
diff --git a/common/audio/stub/parameter-framework/Structure/PolicyClass.xml b/common/audio/stub/parameter-framework/Structure/PolicyClass.xml
deleted file mode 100644
index 296879f31..000000000
--- a/common/audio/stub/parameter-framework/Structure/PolicyClass.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemClass xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="../../Schemas/SystemClass.xsd" Name="Policy">
-    <SubsystemInclude Path="PolicySubsystem.xml"/>
-</SystemClass>
diff --git a/common/audio/stub/parameter-framework/Structure/PolicySubsystem-CommonTypes.xml b/common/audio/stub/parameter-framework/Structure/PolicySubsystem-CommonTypes.xml
deleted file mode 100644
index 461e44a7c..000000000
--- a/common/audio/stub/parameter-framework/Structure/PolicySubsystem-CommonTypes.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ComponentTypeSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xmlns:xi="http://www.w3.org/2001/XInclude"
-              xsi:noNamespaceSchemaLocation="Schemas/ComponentTypeSet.xsd">
-    <!-- Output devices definition as a bitfield for the supported devices per output
-    profile. It must match with the output device enum parameter.
-    -->
-     <!--#################### GLOBAL COMPONENTS BEGIN ####################-->
-
-     <!--#################### GLOBAL COMPONENTS END ####################-->
-
-    <ComponentType Name="OutputDevicesMask" Description="32th bit is not allowed as dedicated
-                                                     for input devices detection">
-        <BitParameterBlock Name="mask" Size="32">
-            <BitParameter Name="earpiece" Size="1" Pos="0"/>
-            <BitParameter Name="speaker" Size="1" Pos="1"/>
-            <BitParameter Name="wired_headset" Size="1" Pos="2"/>
-            <BitParameter Name="wired_headphone" Size="1" Pos="3"/>
-            <BitParameter Name="bluetooth_sco" Size="1" Pos="4"/>
-            <BitParameter Name="bluetooth_sco_headset" Size="1" Pos="5"/>
-            <BitParameter Name="bluetooth_sco_carkit" Size="1" Pos="6"/>
-            <BitParameter Name="bluetooth_a2dp" Size="1" Pos="7"/>
-            <BitParameter Name="bluetooth_a2dp_headphones" Size="1" Pos="8"/>
-            <BitParameter Name="bluetooth_a2dp_speaker" Size="1" Pos="9"/>
-            <BitParameter Name="hdmi" Size="1" Pos="10"/>
-            <BitParameter Name="angl_dock_headset" Size="1" Pos="11"/>
-            <BitParameter Name="dgtl_dock_headset" Size="1" Pos="12"/>
-            <BitParameter Name="usb_accessory" Size="1" Pos="13"/>
-            <BitParameter Name="usb_device" Size="1" Pos="14"/>
-            <BitParameter Name="remote_submix" Size="1" Pos="15"/>
-            <BitParameter Name="telephony_tx" Size="1" Pos="16"/>
-            <BitParameter Name="line" Size="1" Pos="17"/>
-            <BitParameter Name="hdmi_arc" Size="1" Pos="18"/>
-            <BitParameter Name="spdif" Size="1" Pos="19"/>
-            <BitParameter Name="fm" Size="1" Pos="20"/>
-            <BitParameter Name="aux_line" Size="1" Pos="21"/>
-            <BitParameter Name="speaker_safe" Size="1" Pos="22"/>
-            <BitParameter Name="ip" Size="1" Pos="23"/>
-            <BitParameter Name="bus" Size="1" Pos="24"/>
-            <BitParameter Name="stub" Size="1" Pos="30"/>
-        </BitParameterBlock>
-    </ComponentType>
-
-    <!-- Input devices definition as a bitfield for the supported devices per Input
-    profile. It must match with the Input device enum parameter.
-    -->
-    <ComponentType Name="InputDevicesMask">
-        <BitParameterBlock Name="mask" Size="32">
-            <BitParameter Name="communication" Size="1" Pos="0"/>
-            <BitParameter Name="ambient" Size="1" Pos="1"/>
-            <BitParameter Name="builtin_mic" Size="1" Pos="2"/>
-            <BitParameter Name="bluetooth_sco_headset" Size="1" Pos="3"/>
-            <BitParameter Name="wired_headset" Size="1" Pos="4"/>
-            <BitParameter Name="hdmi" Size="1" Pos="5"/>
-            <BitParameter Name="telephony_rx" Size="1" Pos="6"/>
-            <BitParameter Name="back_mic" Size="1" Pos="7"/>
-            <BitParameter Name="remote_submix" Size="1" Pos="8"/>
-            <BitParameter Name="anlg_dock_headset" Size="1" Pos="9"/>
-            <BitParameter Name="dgtl_dock_headset" Size="1" Pos="10"/>
-            <BitParameter Name="usb_accessory" Size="1" Pos="11"/>
-            <BitParameter Name="usb_device" Size="1" Pos="12"/>
-            <BitParameter Name="fm_tuner" Size="1" Pos="13"/>
-            <BitParameter Name="tv_tuner" Size="1" Pos="14"/>
-            <BitParameter Name="line" Size="1" Pos="15"/>
-            <BitParameter Name="spdif" Size="1" Pos="16"/>
-            <BitParameter Name="bluetooth_a2dp" Size="1" Pos="17"/>
-            <BitParameter Name="loopback" Size="1" Pos="18"/>
-            <BitParameter Name="ip" Size="1" Pos="19"/>
-            <BitParameter Name="bus" Size="1" Pos="20"/>
-            <BitParameter Name="stub" Size="1" Pos="30"/>
-        </BitParameterBlock>
-    </ComponentType>
-
-    <ComponentType Name="OutputFlags"
-                   Description="the audio output flags serve two purposes:
-                    - when an AudioTrack is created they indicate a wish to be connected to an
-                      output stream with attributes corresponding to the specified flags.
-                    - when present in an output profile descriptor listed for a particular audio
-                      hardware module, they indicate that an output stream can be opened that
-                      supports the attributes indicated by the flags.
-                    The audio policy manager will try to match the flags in the request
-                    (when getOuput() is called) to an available output stream.">
-        <BitParameterBlock Name="mask" Size="32">
-            <BitParameter Name="direct" Size="1" Pos="0"/>
-            <BitParameter Name="primary" Size="1" Pos="1"/>
-            <BitParameter Name="fast" Size="1" Pos="2"/>
-            <BitParameter Name="deep_buffer" Size="1" Pos="3"/>
-            <BitParameter Name="compress_offload" Size="1" Pos="4"/>
-            <BitParameter Name="non_blocking" Size="1" Pos="5"/>
-            <BitParameter Name="hw_av_sync" Size="1" Pos="6"/>
-            <BitParameter Name="tts" Size="1" Pos="7"/>
-            <BitParameter Name="raw" Size="1" Pos="8"/>
-            <BitParameter Name="sync" Size="1" Pos="9"/>
-            <BitParameter Name="iec958_nonaudio" Size="1" Pos="10"/>
-        </BitParameterBlock>
-    </ComponentType>
-
-    <ComponentType Name="InputFlags"
-                   Description="The audio input flags are analogous to audio output flags.
-                                Currently they are used only when an AudioRecord is created,
-                                to indicate a preference to be connected to an input stream with
-                                attributes corresponding to the specified flags.">
-        <BitParameterBlock Name="mask" Size="32">
-            <BitParameter Name="fast" Size="1" Pos="0"/>
-            <BitParameter Name="hw_hotword" Size="1" Pos="2"/>
-            <BitParameter Name="raw" Size="1" Pos="3"/>
-            <BitParameter Name="sync" Size="1" Pos="4"/>
-        </BitParameterBlock>
-    </ComponentType>
-
-    <ComponentType Name="InputSourcesMask" Description="The audio input source is also known
-                                                        as the use case.">
-        <BitParameterBlock Name="mask" Size="32">
-            <BitParameter Name="default" Size="1" Pos="0"/>
-            <BitParameter Name="mic" Size="1" Pos="1"/>
-            <BitParameter Name="voice_uplink" Size="1" Pos="2"/>
-            <BitParameter Name="voice_downlink" Size="1" Pos="3"/>
-            <BitParameter Name="voice_call" Size="1" Pos="4"/>
-            <BitParameter Name="camcorder" Size="1" Pos="5"/>
-            <BitParameter Name="voice_recognition" Size="1" Pos="6"/>
-            <BitParameter Name="voice_communication" Size="1" Pos="7"/>
-            <BitParameter Name="remote_submix" Size="1" Pos="8"/>
-            <BitParameter Name="unprocessed" Size="1" Pos="9"/>
-            <BitParameter Name="fm_tuner" Size="1" Pos="10"/>
-            <BitParameter Name="hotword" Size="1" Pos="11"/>
-        </BitParameterBlock>
-    </ComponentType>
-
-    <!-- Routing Strategy definition as an enumeration. Numerical value must match the value
-         of the routing strategy in policy header file. -->
-    <ComponentType Name="Strategy">
-        <EnumParameter Name="strategy" Size="32">
-            <ValuePair Literal="media" Numerical="0"/>
-            <ValuePair Literal="phone" Numerical="1"/>
-            <ValuePair Literal="sonification" Numerical="2"/>
-            <ValuePair Literal="sonification_respectful" Numerical="3"/>
-            <ValuePair Literal="dtmf" Numerical="4"/>
-            <ValuePair Literal="enforced_audible" Numerical="5"/>
-            <ValuePair Literal="transmitted_through_speaker" Numerical="6"/>
-            <ValuePair Literal="accessibility" Numerical="7"/>
-            <ValuePair Literal="rerouting" Numerical="8"/>
-        </EnumParameter>
-    </ComponentType>
-
-    <!--#################### STRATEGY COMMON TYPES BEGIN ####################-->
-
-    <ComponentType Name="StrategyConfig" Mapping="Strategy:'%1'">
-        <Component Name="selected_output_devices" Type="OutputDevicesMask"/>
-    </ComponentType>
-
-    <!--#################### STRATEGY COMMON TYPES END ####################-->
-
-    <!--#################### STREAM COMMON TYPES BEGIN ####################-->
-
-    <ComponentType Name="VolumeProfileType">
-        <EnumParameter Name="volume_profile" Size="32">
-            <ValuePair Literal="voice_call" Numerical="0"/>
-            <ValuePair Literal="system" Numerical="1"/>
-            <ValuePair Literal="ring" Numerical="2"/>
-            <ValuePair Literal="music" Numerical="3"/>
-            <ValuePair Literal="alarm" Numerical="4"/>
-            <ValuePair Literal="notification" Numerical="5"/>
-            <ValuePair Literal="bluetooth_sco" Numerical="6"/>
-            <ValuePair Literal="enforced_audible" Numerical="7"/>
-            <ValuePair Literal="dtmf" Numerical="8"/>
-            <ValuePair Literal="tts" Numerical="9"/>
-            <ValuePair Literal="accessibility" Numerical="10"/>
-            <ValuePair Literal="rerouting" Numerical="11"/>
-            <ValuePair Literal="patch" Numerical="12"/>
-        </EnumParameter>
-    </ComponentType>
-
-    <ComponentType Name="Stream">
-        <Component Name="applicable_strategy" Type="Strategy"/>
-        <Component Name="applicable_volume_profile" Type="VolumeProfileType"
-                   Description="Volume profile followed by a given stream type."/>
-    </ComponentType>
-
-    <!--#################### STREAM COMMON TYPES END ####################-->
-
-    <!--#################### USAGE COMMON TYPES BEGIN ####################-->
-
-    <ComponentType Name="Usage">
-        <Component Name="applicable_strategy" Type="Strategy" Mapping="Usage:'%1'"/>
-    </ComponentType>
-
-    <!--#################### USAGE COMMON TYPES END ####################-->
-
-    <!--#################### INPUT SOURCE COMMON TYPES BEGIN ####################-->
-
-    <ComponentType Name="InputSource">
-        <Component Name="applicable_input_device" Type="InputDevicesMask"
-                   Mapping="InputSource:'%1'" Description="Selected Input device"/>
-    </ComponentType>
-
-    <!--#################### INPUT SOURCE COMMON TYPES END ####################-->
-
-</ComponentTypeSet>
diff --git a/common/audio/stub/parameter-framework/Structure/PolicySubsystem.xml b/common/audio/stub/parameter-framework/Structure/PolicySubsystem.xml
deleted file mode 100644
index 71b2b6238..000000000
--- a/common/audio/stub/parameter-framework/Structure/PolicySubsystem.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Subsystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xmlns:xi="http://www.w3.org/2001/XInclude"
-           xsi:noNamespaceSchemaLocation="Schemas/Subsystem.xsd"
-           Name="policy" Type="Policy">
-
-    <ComponentLibrary>
-        <!--#################### GLOBAL COMPONENTS BEGIN ####################-->
-        <!-- Common Types defintion -->
-        <xi:include href="PolicySubsystem-CommonTypes.xml"/>
-
-        <!--#################### GLOBAL COMPONENTS END ####################-->
-
-        <!--#################### STRATEGY BEGIN ####################-->
-
-        <ComponentType Name="Strategies" Description="Identifier must match the enum value to make
-                             the link between the PolicyManager and PFW">
-            <Component Name="media" Type="StrategyConfig" Mapping="Amend1:Media,Identifier:0"/>
-            <Component Name="phone" Type="StrategyConfig" Mapping="Amend1:Phone,Identifier:1"/>
-            <Component Name="sonification" Type="StrategyConfig"
-                                           Mapping="Amend1:Sonification,Identifier:2"/>
-            <Component Name="sonification_respectful" Type="StrategyConfig"
-                       Mapping="Amend1:SonificationRespectful,Identifier:3"/>
-            <Component Name="dtmf" Type="StrategyConfig" Mapping="Amend1:Dtmf,Identifier:4"/>
-            <Component Name="enforced_audible" Type="StrategyConfig"
-                                               Mapping="Amend1:EnforcedAudible,Identifier:5"/>
-            <Component Name="transmitted_through_speaker" Type="StrategyConfig"
-                       Mapping="Amend1:TransmittedThroughSpeaker,Identifier:6"/>
-            <Component Name="accessibility" Type="StrategyConfig"
-                                            Mapping="Amend1:Accessibility,Identifier:7"/>
-            <Component Name="rerouting" Type="StrategyConfig"
-                                        Mapping="Amend1:Rerouting,Identifier:8"/>
-        </ComponentType>
-
-        <!--#################### STRATEGY END ####################-->
-
-        <!--#################### STREAM BEGIN ####################-->
-
-        <ComponentType Name="Streams" Description="associated to audio_stream_type_t definition,
-                             identifier mapping must match the value of the enum">
-            <Component Name="voice_call" Type="Stream" Mapping="Stream:VoiceCall,Identifier:0"/>
-            <Component Name="system" Type="Stream" Mapping="Stream:System,Identifier:1"/>
-            <Component Name="ring" Type="Stream" Mapping="Stream:Ring,Identifier:2"/>
-            <Component Name="music" Type="Stream" Mapping="Stream:Music,Identifier:3"/>
-            <Component Name="alarm" Type="Stream" Mapping="Stream:Alarm,Identifier:4"/>
-            <Component Name="notification" Type="Stream"
-                                           Mapping="Stream:Notification,Identifier:5"/>
-            <Component Name="bluetooth_sco" Type="Stream"
-                                            Mapping="Stream:BluetoothSco,Identifier:6"/>
-            <Component Name="enforced_audible" Type="Stream"
-                                               Mapping="Stream:EnforceAudible,Identifier:7"
-                       Description="Sounds that cannot be muted by user and must
-                                    be routed to speaker"/>
-            <Component Name="dtmf" Type="Stream" Mapping="Stream:Dtmf,Identifier:8"/>
-            <Component Name="tts" Type="Stream" Mapping="Stream:Tts,Identifier:9"
-                             Description="Transmitted Through Speaker.
-                                          Plays over speaker only, silent on other devices"/>
-            <Component Name="accessibility" Type="Stream"
-                                            Mapping="Stream:Accessibility,Identifier:10"
-                             Description="For accessibility talk back prompts"/>
-            <Component Name="rerouting" Type="Stream" Mapping="Stream:Rerouting,Identifier:11"
-                             Description="For dynamic policy output mixes"/>
-            <Component Name="patch" Type="Stream" Mapping="Stream:Patch,Identifier:12"
-                             Description="For internal audio flinger tracks. Fixed volume"/>
-        </ComponentType>
-
-        <!--#################### STREAM END ####################-->
-
-        <!--#################### USAGE BEGIN ####################-->
-
-        <ComponentType Name="Usages" Description="associated to audio_stream_type_t definition,
-                             identifier mapping must match the value of the enum">
-            <Component Name="unknown" Type="Usage" Mapping="Amend1:Unknown,Identifier:0"/>
-            <Component Name="media" Type="Usage" Mapping="Amend1:Media,Identifier:1"/>
-            <Component Name="voice_communication" Type="Usage"
-                                                  Mapping="Amend1:VoiceCommunication,Identifier:2"/>
-            <Component Name="voice_communication_signalling" Type="Usage"
-                       Mapping="Amend1:VoiceCommunicationSignalling,Identifier:3"/>
-            <Component Name="alarm" Type="Usage" Mapping="Amend1:Alarm,Identifier:4"/>
-            <Component Name="notification" Type="Usage" Mapping="Amend1:Notification,Identifier:5"/>
-            <Component Name="notification_telephony_ringtone" Type="Usage"
-                       Mapping="Amend1:NotificationTelephonyRingtone,Identifier:6"/>
-            <Component Name="notification_communication_request" Type="Usage"
-                       Mapping="Amend1:NotificationCommunicationRequest,Identifier:7"/>
-            <Component Name="notification_communication_instant" Type="Usage"
-                       Mapping="Amend1:NotificationCommunicationInstant,Identifier:8"/>
-            <Component Name="notification_communication_delayed" Type="Usage"
-                       Mapping="Amend1:NotificationCommunicationDelated,Identifier:9"/>
-            <Component Name="notification_event" Type="Usage"
-                                                 Mapping="Amend1:NotificationEvent,Identifier:10"/>
-            <Component Name="assistance_accessibility" Type="Usage"
-                       Mapping="Amend1:AssistanceAccessibility,Identifier:11"/>
-            <Component Name="assistance_navigation_guidance" Type="Usage"
-                       Mapping="Amend1:AssistanceNavigationGuidance,Identifier:12"/>
-            <Component Name="assistance_sonification" Type="Usage"
-                       Mapping="Amend1:AssistanceSonification,Identifier:13"/>
-            <Component Name="game" Type="Usage" Mapping="Amend1:BluetoothSco,Identifier:14"/>
-            <Component Name="virtual_source" Type="Usage"
-                                             Mapping="Amend1:VirtualSource,Identifier:15"/>
-        </ComponentType>
-
-        <!--#################### USAGE END ####################-->
-
-        <!--#################### INPUT SOURCE BEGIN ####################-->
-
-        <ComponentType Name="InputSources" Description="associated to audio_source_t definition,
-                             identifier mapping must match the value of the enum">
-            <Component Name="default" Type="InputSource" Mapping="Amend1:Default,Identifier:0"/>
-            <Component Name="mic" Type="InputSource" Mapping="Amend1:Mic,Identifier:1"/>
-            <Component Name="voice_uplink" Type="InputSource"
-                                           Mapping="Amend1:VoiceUplink,Identifier:2"/>
-            <Component Name="voice_downlink" Type="InputSource"
-                                             Mapping="Amend1:VoiceDownlink,Identifier:3"/>
-            <Component Name="voice_call" Type="InputSource"
-                                         Mapping="Amend1:VoiceCall,Identifier:4"/>
-            <Component Name="camcorder" Type="InputSource" Mapping="Amend1:Camcorder,Identifier:5"/>
-            <Component Name="voice_recognition" Type="InputSource"
-                                                Mapping="Amend1:VoiceRecognition,Identifier:6"/>
-            <Component Name="voice_communication" Type="InputSource"
-                                                  Mapping="Amend1:VoiceCommunication,Identifier:7"/>
-            <Component Name="remote_submix" Type="InputSource"
-                                            Mapping="Amend1:RemoteSubmix,Identifier:8"/>
-            <Component Name="unprocessed" Type="InputSource"
-                                            Mapping="Amend1:Unprocessed,Identifier:9"/>
-            <Component Name="fm_tuner" Type="InputSource" Mapping="Amend1:FmTuner,Identifier:1998"/>
-            <Component Name="hotword" Type="InputSource" Mapping="Amend1:Hotword,Identifier:1999"/>
-        </ComponentType>
-
-        <!--#################### INPUT SOURCE END ####################-->
-
-    </ComponentLibrary>
-
-    <InstanceDefinition>
-        <Component Name="streams" Type="Streams"/>
-        <Component Name="strategies" Type="Strategies"/>
-        <Component Name="input_sources" Type="InputSources"/>
-        <Component Name="usages" Type="Usages"/>
-    </InstanceDefinition>
-</Subsystem>
diff --git a/common/audio/stub/parameter-framework/policy_criteria.txt b/common/audio/stub/parameter-framework/policy_criteria.txt
deleted file mode 100644
index 480cbe1cd..000000000
--- a/common/audio/stub/parameter-framework/policy_criteria.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ExclusiveCriterion TelephonyMode                :   Normal          RingTone                InCall              InCommunication
-InclusiveCriterion AvailableInputDevices        :   Communication Ambient BuiltinMic BluetoothScoHeadset WiredHeadset Hdmi TelephonyRx BackMic RemoteSubmix AnlgDockHeadset DgtlDockHeadset UsbAccessory UsbDevice FmTuner TvTuner Line Spdif BluetoothA2dp Loopback Ip Bus Stub
-InclusiveCriterion AvailableOutputDevices       :   Earpiece Speaker WiredSpeaker WiredHeadset WiredHeadphone BluetoothSco BluetoothScoHeadset BluetoothScoCarkit BluetoothA2dp BluetoothA2dpHeadphones BluetoothA2dpSpeaker Hdmi AnlgDockHeadset DgtlDockHeadset UsbAccessory UsbDevice RemoteSubmix TelephonyTx Line HdmiArc Spdif Fm AuxLine SpeakerSafe Ip Bus Stub
-ExclusiveCriterion ForceUseForCommunication     :   ForceNone       ForceSpeaker            ForceBtSco
-ExclusiveCriterion ForceUseForMedia             :   ForceNone       ForceSpeaker			ForceHeadphones         ForceBtA2dp         ForceWiredAccessory ForceAnalogDock ForceDigitalDock    ForceNoBtA2dp       ForceSystemEnforced
-ExclusiveCriterion ForceUseForRecord            :   ForceNone       ForceBtSco              ForceWiredAccessory
-ExclusiveCriterion ForceUseForDock              :   ForceNone       ForceWiredAccessory     ForceBtCarDock      ForceBtDeskDock     ForceAnalogDock ForceDigitalDock
-ExclusiveCriterion ForceUseForSystem            :   ForceNone       ForceSystemEnforced
-ExclusiveCriterion ForceUseForHdmiSystemAudio   :   ForceNone       ForceHdmiSystemEnforced
-ExclusiveCriterion ForceUseForEncodedSurround   :   ForceNone       ForceEncodedSurroundNever   ForceEncodedSurroundAlways

From bf8f1344214cde5ff77ba04f48741a9a9324430c Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Fri, 16 Jun 2017 14:04:54 -0700
Subject: [PATCH 110/427] Enable Gralloc 1.0 by default.

All needed changes in Mesa, HWC, MiniGBM are merged.

Jira: None.
Test: We boot up to home screen.
---
 androidia_64/BoardConfig.mk | 2 +-
 androidia_64/mixins.spec    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 8c8220772..cfddfc900 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -48,8 +48,8 @@ BOARD_ENABLE_EXPLICIT_SYNC := true
 INTEL_MINIGBM := external/minigbm
 
 
+BOARD_USES_GRALLOC1 := true
 
-BOARD_USES_GRALLOC1 := false
 ##############################################################
 # Source: device/intel/mixins/groups/device-type/tablet/BoardConfig.mk
 ##############################################################
diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index 4e1506255..d06e1a41c 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -8,7 +8,7 @@ product.mk: device.mk
 2ndstage: oemvars
 android_ia: default
 sepolicy: enforcing
-graphics: android_ia(gen9+=true,hwc2=true,vulkan=true,drmhwc=false,minigbm=true,gralloc1=false)
+graphics: android_ia(gen9+=true,hwc2=true,vulkan=true,drmhwc=false,minigbm=true,gralloc1=true)
 media: android_ia
 device-type: tablet
 ethernet: dhcp

From 6fb76403fed698c9bb97c1f7263a783a039a9640 Mon Sep 17 00:00:00 2001
From: Abhilash K V <abhilash.k.v@intel.com>
Date: Fri, 16 Jun 2017 02:59:42 +0530
Subject: [PATCH 111/427] Add kernel config for enabling USB-tethering/RNDIS

JIRA: AIA-425
Test: Verify USB tethering/ see in Win device mgr &
      able to ping both ways.

Signed-off-by: Bhagoji, KaranX <karanx.bhagoji@intel.com>
Signed-off-by: Abhilash K V <abhilash.k.v@intel.com>
---
 kernel_config/kernel_64_defconfig | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index b8c03f32c..da9c10bcb 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -2224,7 +2224,7 @@ CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
 CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
+# CONFIG_USB_NET_RNDIS_HOST=m
 CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
 CONFIG_USB_NET_CDC_SUBSET=m
 CONFIG_USB_ALI_M5632=y
@@ -2490,7 +2490,7 @@ CONFIG_ZD1211RW=m
 CONFIG_PCMCIA_RAYCS=m
 CONFIG_PCMCIA_WL3501=m
 CONFIG_MAC80211_HWSIM=m
-CONFIG_USB_NET_RNDIS_WLAN=m
+# CONFIG_USB_NET_RNDIS_WLAN=m
 
 #
 # WiMAX Wireless Broadband devices
@@ -5190,6 +5190,8 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_GADGET_XILINX is not set
 # CONFIG_USB_DUMMY_HCD is not set
 CONFIG_USB_LIBCOMPOSITE=y
+CONFIG_USB_U_ETHER=y
+CONFIG_USB_F_RNDIS=y
 CONFIG_USB_F_UVC=m
 CONFIG_USB_F_FS=y
 CONFIG_USB_CONFIGFS=y
@@ -7083,3 +7085,4 @@ CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
 CONFIG_USB_CONFIGFS_UEVENT=y
 CONFIG_USB_CONFIGFS_F_MIDI=y
 CONFIG_USB_OTG_WAKELOCK=y
+CONFIG_USB_CONFIGFS_RNDIS=y

From 881118b6de7b151df28e50f1f8aaa4e9d882d0c4 Mon Sep 17 00:00:00 2001
From: Abhilash K V <abhilash.k.v@intel.com>
Date: Sat, 17 Jun 2017 03:28:08 +0530
Subject: [PATCH 112/427] Add kernel config for enabling USB-accessory mode

JIRA: AIA-426
Test: Verify CTS Verifier (USB_Accessory Test)

Signed-off-by: Abhilash K V abhilash.k.v@intel.com
---
 kernel_config/kernel_64_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index da9c10bcb..98c614b90 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -5194,6 +5194,7 @@ CONFIG_USB_U_ETHER=y
 CONFIG_USB_F_RNDIS=y
 CONFIG_USB_F_UVC=m
 CONFIG_USB_F_FS=y
+CONFIG_USB_F_ACC=y
 CONFIG_USB_CONFIGFS=y
 CONFIG_USB_CONFIGFS_F_FS=y
 # CONFIG_USB_ZERO is not set

From 24407d61480545fdfa681520de0ce74b27ba3e63 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Sat, 17 Jun 2017 07:36:40 +0530
Subject: [PATCH 113/427] [AIA] Update mixin

- Usb tethering/RNDIS
- Usb accessory mode

Jira : None
Test : Device boots to homescreen
---
 androidia_64/init.rc | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index b29c7f067..3e11b9c24 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -180,6 +180,8 @@ on boot
     mkdir /config/usb_gadget/g1/functions/ffs.adb
     mkdir /config/usb_gadget/g1/functions/mtp.gs0
     mkdir /config/usb_gadget/g1/functions/ptp.gs1
+    mkdir /config/usb_gadget/g1/functions/accessory.gs2
+    mkdir /config/usb_gadget/g1/functions/rndis.gs4
     mkdir /config/usb_gadget/g1/functions/midi.gs5
 
     mkdir /config/usb_gadget/g1/configs/b.1
@@ -236,6 +238,15 @@ on property:sys.usb.config=ptp,adb && property:sys.usb.configfs=1
     write /config/usb_gadget/g1/idVendor 0x8087
     write /config/usb_gadget/g1/idProduct 0x0a61
 
+on property:sys.usb.config=rndis && property:sys.usb.configfs=1
+    write /config/usb_gadget/g1/idVendor 0x8087
+    write /config/usb_gadget/g1/idProduct 0x0a62
+
+on property:sys.usb.config=rndis,adb && property:sys.usb.configfs=1
+    write /config/usb_gadget/g1/bcdUSB 0x310
+    write /config/usb_gadget/g1/idVendor 0x8087
+    write /config/usb_gadget/g1/idProduct 0x0a63
+
 on property:sys.usb.config=midi && property:sys.usb.configfs=1
     write /config/usb_gadget/g1/idVendor 0x8087
     write /config/usb_gadget/g1/idProduct 0x0a65
@@ -244,6 +255,13 @@ on property:sys.usb.config=midi,adb && property:sys.usb.configfs=1
     write /config/usb_gadget/g1/idVendor 0x8087
     write /config/usb_gadget/g1/idProduct 0x0a67
 
+on property:sys.usb.config=accessory && property:sys.usb.configfs=1
+    write /config/usb_gadget/g1/idVendor 0x18d1
+    write /config/usb_gadget/g1/idProduct 0x2d00
+
+on property:sys.usb.config=accessory,adb && property:sys.usb.configfs=1
+    write /config/usb_gadget/g1/idVendor 0x18d1
+    write /config/usb_gadget/g1/idProduct 0x2d01
 ##############################################################
 # Source: device/intel/mixins/groups/adb_net/true/init.rc
 ##############################################################

From 17cc3302a966de366e07c9be8205e4893a917e0c Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Sat, 17 Jun 2017 07:43:17 +0530
Subject: [PATCH 114/427] [AIA] Enable FDE back again.

Revert "Revert "Enable default full disk encryption(FDE)" to fix"

This reverts commit e0a87ba099fa574324a9befcf7b1f3be94773f8e.

JIRA : None
Test : Encryption / Decryption happens seamless
---
 androidia_64/fstab                |  2 +-
 androidia_64/init.rc              | 12 +++++++++++-
 kernel_config/kernel_64_defconfig | 12 ++++++------
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/androidia_64/fstab b/androidia_64/fstab
index 072e9888b..7a2830242 100644
--- a/androidia_64/fstab
+++ b/androidia_64/fstab
@@ -19,7 +19,7 @@
 
 /dev/block/mmcblk1p7	/system         ext4    ro															wait
 /dev/block/mmcblk1p8	/cache          ext4    noatime,nosuid,nodev,errors=panic                           wait,check
-/dev/block/mmcblk1p13	/data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable
+/dev/block/mmcblk1p13	/data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,forceencrypt=/dev/block/mmcblk1p6
 /dev/block/mmcblk1p3	/boot           emmc    defaults                                                    defaults
 /dev/block/mmcblk1p4	/recovery       emmc    defaults                                                    defaults
 /dev/block/mmcblk1p5	/misc           emmc    defaults                                                    defaults
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 3e11b9c24..06da604b7 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -3,7 +3,7 @@
 ##############################################################
 # Source: device/intel/mixins/groups/android_ia/default/init.rc
 ##############################################################
-on early-init
+on fs
     mount_all /fstab.${ro.hardware}
 
 on init
@@ -557,6 +557,16 @@ on property:sys.usb.config=midi,adb
 # Source: device/intel/mixins/groups/debug-kernel/default/init.rc
 ##############################################################
 import /init.kernel.rc
+##############################################################
+# Source: device/intel/mixins/groups/disk-encryption/default/init.rc
+##############################################################
+# This _should_ be the very last thing that happens in
+# the device's 'on post-fs-data' sections.  Since we compose
+# init scripts from various snippets with mixins, we need to
+# ensure this is included last in the mixin-update by listing
+# disk-encryption as LAST in the mixin spec file.
+on post-fs-data
+    setprop vold.post_fs_data_done 1
 # ------------------ END MIX-IN DEFINITIONS ------------------
 # Enable native bridge for target executables
 on early-init
diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 98c614b90..65fbc1fcd 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -6682,9 +6682,9 @@ CONFIG_X86_DEBUG_FPU=y
 #
 # Security options
 #
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
-# CONFIG_SECURITYFS is not set
+CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
 CONFIG_LSM_MMAP_MIN_ADDR=65536
@@ -6769,8 +6769,8 @@ CONFIG_CRYPTO_XCBC=m
 # Digest
 #
 CONFIG_CRYPTO_CRC32C=y
-# CONFIG_CRYPTO_CRC32C_INTEL is not set
-# CONFIG_CRYPTO_CRC32 is not set
+CONFIG_CRYPTO_CRC32C_INTEL=y
+CONFIG_CRYPTO_CRC32=y
 # CONFIG_CRYPTO_CRC32_PCLMUL is not set
 # CONFIG_CRYPTO_CRCT10DIF is not set
 CONFIG_CRYPTO_GHASH=m
@@ -6801,8 +6801,8 @@ CONFIG_CRYPTO_WP512=m
 # Ciphers
 #
 CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_AES_X86_64=m
-CONFIG_CRYPTO_AES_NI_INTEL=m
+CONFIG_CRYPTO_AES_X86_64=y
+CONFIG_CRYPTO_AES_NI_INTEL=y
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=y
 CONFIG_CRYPTO_BLOWFISH=m

From 0c374e786858703930b3fd738db37ccbfe4fdffe Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Tue, 20 Jun 2017 01:31:52 +0530
Subject: [PATCH 115/427] Add some new selinux rules Because some new features
 were added to androidia recently, so the previously SELinux rules are not
 enough, need add some new SELinux rules.

JIRA: AIA-422
Test: The system can boot to UI successfully and there are no obvious regressions observed.

Signed-off-by: ji, zhenlong z <zhenlong.z.ji@intel.com>
---
 sepolicy/appdomain.te     | 1 +
 sepolicy/bootanim.te      | 2 ++
 sepolicy/file_contexts    | 5 ++++-
 sepolicy/init.te          | 3 ++-
 sepolicy/mediacodec.te    | 3 ++-
 sepolicy/netd.te          | 1 +
 sepolicy/system_app.te    | 1 +
 sepolicy/system_server.te | 1 +
 sepolicy/ueventd.te       | 2 ++
 sepolicy/vold.te          | 1 +
 10 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/sepolicy/appdomain.te b/sepolicy/appdomain.te
index 5ab909e46..0baa517e7 100644
--- a/sepolicy/appdomain.te
+++ b/sepolicy/appdomain.te
@@ -1,2 +1,3 @@
 allow appdomain surfaceflinger:fifo_file rw_file_perms;
 allow appdomain sysfs_app_readable:file r_file_perms;
+allow appdomain surfaceflinger_tmpfs:file { read write };
diff --git a/sepolicy/bootanim.te b/sepolicy/bootanim.te
index d6e355642..1abc1fce9 100644
--- a/sepolicy/bootanim.te
+++ b/sepolicy/bootanim.te
@@ -1,3 +1,5 @@
 allow bootanim tmpfs:lnk_file read;
 allow bootanim debugfs_tracing:file { read open write };
 allow bootanim surfaceflinger:fifo_file rw_file_perms;
+allow bootanim device:dir r_dir_perms;
+allow bootanim sysfs_app_readable:file r_file_perms;
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index f0c617c6c..86351dcce 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -1,7 +1,8 @@
 /dev/block/mmcblk1p8        u:object_r:cache_block_device:s0
-/dev/block/mmcblk1p12        u:object_r:userdata_block_device:s0
+/dev/block/mmcblk1p13        u:object_r:userdata_block_device:s0
 /dev/block/mmcblk1p3        u:object_r:boot_block_device:s0
 /dev/block/mmcblk1p4        u:object_r:recovery_block_device:s0
+/dev/block/mmcblk1p5        u:object_r:misc_block_device:s0
 /dev/block/mmcblk1p9        u:object_r:frp_block_device:s0
 /dev/block/mmcblk1p6        u:object_r:metadata_block_device:s0
 /dev/block/mmcblk1p11       u:object_r:config_block_device:s0
@@ -20,3 +21,5 @@
 /sys/devices/pci0000\:00/0000\:00\:02.0/subsystem_device u:object_r:sysfs_app_readable:s0
 /sys/devices/pci0000\:00/0000\:00\:02.0/config u:object_r:sysfs_app_readable:s0
 /sys/devices/pci0000\:00/0000\:00\:02.0/resource0 u:object_r:sysfs_app_readable:s0
+
+/dev/trusty-ipc-dev0 u:object_r:tee_device:s0
diff --git a/sepolicy/init.te b/sepolicy/init.te
index 5e4f19943..826a41f58 100644
--- a/sepolicy/init.te
+++ b/sepolicy/init.te
@@ -16,7 +16,7 @@ allow init tmpfs:lnk_file create_file_perms;
 allow init sysfs:lnk_file setattr;
 allow init sysfs:dir { write add_name };
 # userspace cannot create files in sys. ignore denial
-dontaudit init sysfs_devices_system_cpu:dir write;
+allow init sysfs_devices_system_cpu:dir write;
 allow init { cache_file storage_file }:dir mounton;
 # /config
 allow init configfs:{ file lnk_file } create_file_perms;
@@ -29,4 +29,5 @@ allow init platform_app:unix_stream_socket { read };
 
 allow init debugfs_pstate:file w_file_perms;
 allow init userdata_block_device:blk_file write;
+allow init misc_block_device:blk_file write;
 allow init kernel:key search;
diff --git a/sepolicy/mediacodec.te b/sepolicy/mediacodec.te
index 73eab1943..5883b19cc 100644
--- a/sepolicy/mediacodec.te
+++ b/sepolicy/mediacodec.te
@@ -1,7 +1,8 @@
 allow mediacodec tmpfs:lnk_file read;
-dontaudit mediacodec graphics_device:dir search;
+allow mediacodec graphics_device:dir search;
 allow mediacodec surfaceflinger:fifo_file { read write };
 allow mediacodec sysfs:file r_file_perms;
 allow mediacodec system_file:dir r_dir_perms;
 allow mediacodec device:dir r_dir_perms;
 allow mediacodec host1x_device:chr_file rw_file_perms;
+allow mediacodec sysfs_app_readable:file r_file_perms;
diff --git a/sepolicy/netd.te b/sepolicy/netd.te
index 4f26c860b..bf206e3f2 100644
--- a/sepolicy/netd.te
+++ b/sepolicy/netd.te
@@ -1,2 +1,3 @@
 allow netd netd:capability { sys_module };
 allow netd kernel:system { module_request };
+allow netd proc_net:dir rw_dir_perms;
diff --git a/sepolicy/system_app.te b/sepolicy/system_app.te
index 573c2f7ae..a08e4bb64 100644
--- a/sepolicy/system_app.te
+++ b/sepolicy/system_app.te
@@ -2,3 +2,4 @@ allow system_app surfaceflinger_tmpfs:file { read write };
 allow system_app sysfs_thermal_writable:file rw_file_perms;
 allow system_app sysfs_coretemp:file rw_file_perms;
 allow system_app self:netlink_kobject_uevent_socket {create read bind connect getopt setopt shutdown};
+allow system_app radio_data_file:dir r_dir_perms;
diff --git a/sepolicy/system_server.te b/sepolicy/system_server.te
index 26ce5a630..b36911916 100644
--- a/sepolicy/system_server.te
+++ b/sepolicy/system_server.te
@@ -19,4 +19,5 @@ allow system_server init:tcp_socket { getopt setopt read write };
 allow system_server init:udp_socket { getopt setopt read write };
 allow system_server init:process { getattr getpgid };
 allow system_server sysfs_app_readable:file r_file_perms;
+allow system_server self:capability2 wake_alarm;
 get_prop(system_server, wifi_region_prop)
diff --git a/sepolicy/ueventd.te b/sepolicy/ueventd.te
index 3952bd686..51de650e1 100644
--- a/sepolicy/ueventd.te
+++ b/sepolicy/ueventd.te
@@ -14,3 +14,5 @@ allow ueventd sysfs_socinfo:file w_file_perms;
 allow ueventd system_file:system { module_load };
 allow ueventd hidraw_device:chr_file { relabelfrom relabelto };
 allow ueventd kernel:key search;
+allow ueventd sysfs_app_readable:file rw_file_perms;
+allow ueventd kmsg_device:chr_file rw_file_perms;
diff --git a/sepolicy/vold.te b/sepolicy/vold.te
index 29c7818e1..abf227130 100644
--- a/sepolicy/vold.te
+++ b/sepolicy/vold.te
@@ -1,2 +1,3 @@
 allow vold tmpfs:file open;
 allow vold config_file:dir r_dir_perms;
+allow vold kernel:system module_request;

From 4e2b81e41006dfb2233203c715379326ec7d42ba Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Tue, 20 Jun 2017 01:33:18 +0530
Subject: [PATCH 116/427] [AIA] Update mixinspec.

Jira : None
Test : Device boots to home screen
---
 androidia_64/BoardConfig.mk | 2 +-
 androidia_64/init.rc        | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index cfddfc900..e428f5e1b 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -72,7 +72,7 @@ TARGET_NO_KERNEL ?= false
 KERNEL_LOGLEVEL ?= 3
 SERIAL_PARAMETER := console=tty0 console=ttyS2,115200n8
 
-BOARD_KERNEL_CMDLINE += root=/dev/ram0  androidboot.hardware=$(TARGET_PRODUCT) androidboot.selinux=permissive firmware_class.path=/vendor/firmware loglevel=$(KERNEL_LOGLEVEL)
+BOARD_KERNEL_CMDLINE += root=/dev/ram0  androidboot.hardware=$(TARGET_PRODUCT) firmware_class.path=/vendor/firmware loglevel=$(KERNEL_LOGLEVEL)
 
 ifneq ($(TARGET_BUILD_VARIANT),user)
 ifeq ($(SPARSE_IMG),true)
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 06da604b7..c9d81a1a2 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -103,7 +103,6 @@ on fs
 on init
     chown system system /sys/class/backlight/intel_backlight/brightness
     chown system system /sys/class/backlight/acpi_video0/brightness
-    write /sys/fs/selinux/enforce 0
 
 on post-fs
    #setprop debug.sf.nobootanimation 1
@@ -512,7 +511,7 @@ on boot
 ##############################################################
 # Enable SELinux labeling
 on post-fs
-    restorecon_recursive /config
+    restorecon_recursive /oem_config
 ##############################################################
 # Source: device/intel/mixins/groups/factory-partition/true/init.rc
 ##############################################################

From df26ddedf50224e3103da77b991909b5fd86388f Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Tue, 20 Jun 2017 07:41:19 +0530
Subject: [PATCH 117/427] Revert "Add some new selinux rules"

This reverts commit 0c374e786858703930b3fd738db37ccbfe4fdffe.

Jira : None
Test : Device boots to home screen
---
 sepolicy/appdomain.te     | 1 -
 sepolicy/bootanim.te      | 2 --
 sepolicy/file_contexts    | 5 +----
 sepolicy/init.te          | 3 +--
 sepolicy/mediacodec.te    | 3 +--
 sepolicy/netd.te          | 1 -
 sepolicy/system_app.te    | 1 -
 sepolicy/system_server.te | 1 -
 sepolicy/ueventd.te       | 2 --
 sepolicy/vold.te          | 1 -
 10 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/sepolicy/appdomain.te b/sepolicy/appdomain.te
index 0baa517e7..5ab909e46 100644
--- a/sepolicy/appdomain.te
+++ b/sepolicy/appdomain.te
@@ -1,3 +1,2 @@
 allow appdomain surfaceflinger:fifo_file rw_file_perms;
 allow appdomain sysfs_app_readable:file r_file_perms;
-allow appdomain surfaceflinger_tmpfs:file { read write };
diff --git a/sepolicy/bootanim.te b/sepolicy/bootanim.te
index 1abc1fce9..d6e355642 100644
--- a/sepolicy/bootanim.te
+++ b/sepolicy/bootanim.te
@@ -1,5 +1,3 @@
 allow bootanim tmpfs:lnk_file read;
 allow bootanim debugfs_tracing:file { read open write };
 allow bootanim surfaceflinger:fifo_file rw_file_perms;
-allow bootanim device:dir r_dir_perms;
-allow bootanim sysfs_app_readable:file r_file_perms;
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 86351dcce..f0c617c6c 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -1,8 +1,7 @@
 /dev/block/mmcblk1p8        u:object_r:cache_block_device:s0
-/dev/block/mmcblk1p13        u:object_r:userdata_block_device:s0
+/dev/block/mmcblk1p12        u:object_r:userdata_block_device:s0
 /dev/block/mmcblk1p3        u:object_r:boot_block_device:s0
 /dev/block/mmcblk1p4        u:object_r:recovery_block_device:s0
-/dev/block/mmcblk1p5        u:object_r:misc_block_device:s0
 /dev/block/mmcblk1p9        u:object_r:frp_block_device:s0
 /dev/block/mmcblk1p6        u:object_r:metadata_block_device:s0
 /dev/block/mmcblk1p11       u:object_r:config_block_device:s0
@@ -21,5 +20,3 @@
 /sys/devices/pci0000\:00/0000\:00\:02.0/subsystem_device u:object_r:sysfs_app_readable:s0
 /sys/devices/pci0000\:00/0000\:00\:02.0/config u:object_r:sysfs_app_readable:s0
 /sys/devices/pci0000\:00/0000\:00\:02.0/resource0 u:object_r:sysfs_app_readable:s0
-
-/dev/trusty-ipc-dev0 u:object_r:tee_device:s0
diff --git a/sepolicy/init.te b/sepolicy/init.te
index 826a41f58..5e4f19943 100644
--- a/sepolicy/init.te
+++ b/sepolicy/init.te
@@ -16,7 +16,7 @@ allow init tmpfs:lnk_file create_file_perms;
 allow init sysfs:lnk_file setattr;
 allow init sysfs:dir { write add_name };
 # userspace cannot create files in sys. ignore denial
-allow init sysfs_devices_system_cpu:dir write;
+dontaudit init sysfs_devices_system_cpu:dir write;
 allow init { cache_file storage_file }:dir mounton;
 # /config
 allow init configfs:{ file lnk_file } create_file_perms;
@@ -29,5 +29,4 @@ allow init platform_app:unix_stream_socket { read };
 
 allow init debugfs_pstate:file w_file_perms;
 allow init userdata_block_device:blk_file write;
-allow init misc_block_device:blk_file write;
 allow init kernel:key search;
diff --git a/sepolicy/mediacodec.te b/sepolicy/mediacodec.te
index 5883b19cc..73eab1943 100644
--- a/sepolicy/mediacodec.te
+++ b/sepolicy/mediacodec.te
@@ -1,8 +1,7 @@
 allow mediacodec tmpfs:lnk_file read;
-allow mediacodec graphics_device:dir search;
+dontaudit mediacodec graphics_device:dir search;
 allow mediacodec surfaceflinger:fifo_file { read write };
 allow mediacodec sysfs:file r_file_perms;
 allow mediacodec system_file:dir r_dir_perms;
 allow mediacodec device:dir r_dir_perms;
 allow mediacodec host1x_device:chr_file rw_file_perms;
-allow mediacodec sysfs_app_readable:file r_file_perms;
diff --git a/sepolicy/netd.te b/sepolicy/netd.te
index bf206e3f2..4f26c860b 100644
--- a/sepolicy/netd.te
+++ b/sepolicy/netd.te
@@ -1,3 +1,2 @@
 allow netd netd:capability { sys_module };
 allow netd kernel:system { module_request };
-allow netd proc_net:dir rw_dir_perms;
diff --git a/sepolicy/system_app.te b/sepolicy/system_app.te
index a08e4bb64..573c2f7ae 100644
--- a/sepolicy/system_app.te
+++ b/sepolicy/system_app.te
@@ -2,4 +2,3 @@ allow system_app surfaceflinger_tmpfs:file { read write };
 allow system_app sysfs_thermal_writable:file rw_file_perms;
 allow system_app sysfs_coretemp:file rw_file_perms;
 allow system_app self:netlink_kobject_uevent_socket {create read bind connect getopt setopt shutdown};
-allow system_app radio_data_file:dir r_dir_perms;
diff --git a/sepolicy/system_server.te b/sepolicy/system_server.te
index b36911916..26ce5a630 100644
--- a/sepolicy/system_server.te
+++ b/sepolicy/system_server.te
@@ -19,5 +19,4 @@ allow system_server init:tcp_socket { getopt setopt read write };
 allow system_server init:udp_socket { getopt setopt read write };
 allow system_server init:process { getattr getpgid };
 allow system_server sysfs_app_readable:file r_file_perms;
-allow system_server self:capability2 wake_alarm;
 get_prop(system_server, wifi_region_prop)
diff --git a/sepolicy/ueventd.te b/sepolicy/ueventd.te
index 51de650e1..3952bd686 100644
--- a/sepolicy/ueventd.te
+++ b/sepolicy/ueventd.te
@@ -14,5 +14,3 @@ allow ueventd sysfs_socinfo:file w_file_perms;
 allow ueventd system_file:system { module_load };
 allow ueventd hidraw_device:chr_file { relabelfrom relabelto };
 allow ueventd kernel:key search;
-allow ueventd sysfs_app_readable:file rw_file_perms;
-allow ueventd kmsg_device:chr_file rw_file_perms;
diff --git a/sepolicy/vold.te b/sepolicy/vold.te
index abf227130..29c7818e1 100644
--- a/sepolicy/vold.te
+++ b/sepolicy/vold.te
@@ -1,3 +1,2 @@
 allow vold tmpfs:file open;
 allow vold config_file:dir r_dir_perms;
-allow vold kernel:system module_request;

From 617e6ec6180550cdb947696f30ddf06055ee06e5 Mon Sep 17 00:00:00 2001
From: "ji, zhenlong z" <zhenlong.z.ji@intel.com>
Date: Wed, 14 Jun 2017 22:18:09 +0800
Subject: [PATCH 118/427] Add some new selinux rules

Because some new features were added to androidia recently,
so the previously SELinux rules are not enough, need add some
new SELinux rules.

JIRA: AIA-422
Test: The system can boot to UI successfully and there are no obvious regressions observed.

Signed-off-by: ji, zhenlong z <zhenlong.z.ji@intel.com>
---
 sepolicy/bootanim.te      | 2 ++
 sepolicy/file_contexts    | 3 ++-
 sepolicy/init.te          | 1 +
 sepolicy/mediacodec.te    | 1 +
 sepolicy/netd.te          | 1 +
 sepolicy/system_app.te    | 1 +
 sepolicy/system_server.te | 1 +
 sepolicy/ueventd.te       | 2 ++
 sepolicy/vold.te          | 1 +
 9 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/sepolicy/bootanim.te b/sepolicy/bootanim.te
index d6e355642..1abc1fce9 100644
--- a/sepolicy/bootanim.te
+++ b/sepolicy/bootanim.te
@@ -1,3 +1,5 @@
 allow bootanim tmpfs:lnk_file read;
 allow bootanim debugfs_tracing:file { read open write };
 allow bootanim surfaceflinger:fifo_file rw_file_perms;
+allow bootanim device:dir r_dir_perms;
+allow bootanim sysfs_app_readable:file r_file_perms;
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index f0c617c6c..9911f1417 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -1,7 +1,8 @@
 /dev/block/mmcblk1p8        u:object_r:cache_block_device:s0
-/dev/block/mmcblk1p12        u:object_r:userdata_block_device:s0
+/dev/block/mmcblk1p13        u:object_r:userdata_block_device:s0
 /dev/block/mmcblk1p3        u:object_r:boot_block_device:s0
 /dev/block/mmcblk1p4        u:object_r:recovery_block_device:s0
+/dev/block/mmcblk1p5        u:object_r:misc_block_device:s0
 /dev/block/mmcblk1p9        u:object_r:frp_block_device:s0
 /dev/block/mmcblk1p6        u:object_r:metadata_block_device:s0
 /dev/block/mmcblk1p11       u:object_r:config_block_device:s0
diff --git a/sepolicy/init.te b/sepolicy/init.te
index 5e4f19943..b459b0661 100644
--- a/sepolicy/init.te
+++ b/sepolicy/init.te
@@ -29,4 +29,5 @@ allow init platform_app:unix_stream_socket { read };
 
 allow init debugfs_pstate:file w_file_perms;
 allow init userdata_block_device:blk_file write;
+allow init misc_block_device:blk_file write;
 allow init kernel:key search;
diff --git a/sepolicy/mediacodec.te b/sepolicy/mediacodec.te
index 73eab1943..69a69f408 100644
--- a/sepolicy/mediacodec.te
+++ b/sepolicy/mediacodec.te
@@ -5,3 +5,4 @@ allow mediacodec sysfs:file r_file_perms;
 allow mediacodec system_file:dir r_dir_perms;
 allow mediacodec device:dir r_dir_perms;
 allow mediacodec host1x_device:chr_file rw_file_perms;
+allow mediacodec sysfs_app_readable:file r_file_perms;
diff --git a/sepolicy/netd.te b/sepolicy/netd.te
index 4f26c860b..bf206e3f2 100644
--- a/sepolicy/netd.te
+++ b/sepolicy/netd.te
@@ -1,2 +1,3 @@
 allow netd netd:capability { sys_module };
 allow netd kernel:system { module_request };
+allow netd proc_net:dir rw_dir_perms;
diff --git a/sepolicy/system_app.te b/sepolicy/system_app.te
index 573c2f7ae..a08e4bb64 100644
--- a/sepolicy/system_app.te
+++ b/sepolicy/system_app.te
@@ -2,3 +2,4 @@ allow system_app surfaceflinger_tmpfs:file { read write };
 allow system_app sysfs_thermal_writable:file rw_file_perms;
 allow system_app sysfs_coretemp:file rw_file_perms;
 allow system_app self:netlink_kobject_uevent_socket {create read bind connect getopt setopt shutdown};
+allow system_app radio_data_file:dir r_dir_perms;
diff --git a/sepolicy/system_server.te b/sepolicy/system_server.te
index 26ce5a630..b36911916 100644
--- a/sepolicy/system_server.te
+++ b/sepolicy/system_server.te
@@ -19,4 +19,5 @@ allow system_server init:tcp_socket { getopt setopt read write };
 allow system_server init:udp_socket { getopt setopt read write };
 allow system_server init:process { getattr getpgid };
 allow system_server sysfs_app_readable:file r_file_perms;
+allow system_server self:capability2 wake_alarm;
 get_prop(system_server, wifi_region_prop)
diff --git a/sepolicy/ueventd.te b/sepolicy/ueventd.te
index 3952bd686..51de650e1 100644
--- a/sepolicy/ueventd.te
+++ b/sepolicy/ueventd.te
@@ -14,3 +14,5 @@ allow ueventd sysfs_socinfo:file w_file_perms;
 allow ueventd system_file:system { module_load };
 allow ueventd hidraw_device:chr_file { relabelfrom relabelto };
 allow ueventd kernel:key search;
+allow ueventd sysfs_app_readable:file rw_file_perms;
+allow ueventd kmsg_device:chr_file rw_file_perms;
diff --git a/sepolicy/vold.te b/sepolicy/vold.te
index 29c7818e1..abf227130 100644
--- a/sepolicy/vold.te
+++ b/sepolicy/vold.te
@@ -1,2 +1,3 @@
 allow vold tmpfs:file open;
 allow vold config_file:dir r_dir_perms;
+allow vold kernel:system module_request;

From e24e04ef42c6fcbd102fe3faa9364d15609c4a4f Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Mon, 19 Jun 2017 14:08:04 +0530
Subject: [PATCH 119/427] [Android-IA] Add mixin changes for mediasdk
 integration

Jira : None
Test : Device boots to homescreen
       Audio / Video playback, recording, capturing should be fine

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/BoardConfig.mk | 3 +++
 androidia_64/device.mk      | 1 +
 androidia_64/mixins.spec    | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index e428f5e1b..d5b9d6866 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -50,6 +50,9 @@ INTEL_MINIGBM := external/minigbm
 
 BOARD_USES_GRALLOC1 := true
 
+##############################################################
+# Source: device/intel/mixins/groups/media/android_ia/BoardConfig.mk
+##############################################################
 ##############################################################
 # Source: device/intel/mixins/groups/device-type/tablet/BoardConfig.mk
 ##############################################################
diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index e0767c4ef..b2b52b0da 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -262,6 +262,7 @@ PRODUCT_PROPERTY_OVERRIDES += media.stagefright.audio.deep=true
 # Enable AAC 5.1 output
 PRODUCT_PROPERTY_OVERRIDES += \
     media.aac_51_output_enabled=true
+
 ##############################################################
 # Source: device/intel/mixins/groups/device-type/tablet/product.mk
 ##############################################################
diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index d06e1a41c..bdbda9745 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -9,7 +9,7 @@ product.mk: device.mk
 android_ia: default
 sepolicy: enforcing
 graphics: android_ia(gen9+=true,hwc2=true,vulkan=true,drmhwc=false,minigbm=true,gralloc1=true)
-media: android_ia
+media: android_ia(mediasdk=false,media_sdk_source=false)
 device-type: tablet
 ethernet: dhcp
 debugfs: default

From 9fcccaafe41bad36d0147afd367a16b78d68dc70 Mon Sep 17 00:00:00 2001
From: Xu Guangxin <guangxin.xu@intel.com>
Date: Tue, 20 Jun 2017 10:25:06 +0530
Subject: [PATCH 120/427] Enable h264dec,h264enc and h265dec on BXT

Jira : None
Test : 1. play h264 or h265 video on Gallery
       2. Recoder video using android built in video recoder cmd tool

Signed-off-by: Xu Guangxin <guangxin.xu@intel.com>
---
 common/media/media_codecs.xml    | 35 +++++++++++++++++++++++++++++++-
 common/media/mfx_omxil_core.conf |  3 +++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 common/media/mfx_omxil_core.conf

diff --git a/common/media/media_codecs.xml b/common/media/media_codecs.xml
index ba1fbdb96..2a8c26be6 100644
--- a/common/media/media_codecs.xml
+++ b/common/media/media_codecs.xml
@@ -78,6 +78,39 @@ Only the three quirks included above are recognized at this point:
 -->
 
 <MediaCodecs>
-    <Include href="media_codecs_google_audio.xml" />
+    <Encoders>
+        <MediaCodec name="OMX.Intel.hw_ve.h264" type="video/avc" >
+            <Limit name="size" min="176x144" max="3840x2160" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" range="1-243000" />
+            <Limit name="bitrate" range="1-15000000" />
+        </MediaCodec>
+    </Encoders>
+    <Decoders>
+        <MediaCodec name="OMX.Intel.hw_vd.h264" type="video/avc" >
+            <!-- profiles and levels:  ProfileBaseline : Level51 -->
+            <Limit name="size" min="64x64" max="3840x2160" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" range="1-972000" />
+            <Limit name="bitrate" range="1-40000000" />
+            <Feature name="adaptive-playback" />
+        </MediaCodec>
+        <MediaCodec name="OMX.Intel.hw_vd.h265" type="video/hevc" >
+            <Limit name="size" min="64x64" max="3840x2160" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" range="1-972000" />
+            <Limit name="bitrate" range="1-40000000" />
+            <Feature name="adaptive-playback" />
+        </MediaCodec>
+    </Decoders>
+
+
     <Include href="media_codecs_google_video.xml" />
+    <Include href="media_codecs_google_audio.xml" />
+    <Settings>
+        <Setting name="max-video-encoder-input-buffers" value="9" />
+    </Settings>
 </MediaCodecs>
diff --git a/common/media/mfx_omxil_core.conf b/common/media/mfx_omxil_core.conf
new file mode 100644
index 000000000..ae9a65a91
--- /dev/null
+++ b/common/media/mfx_omxil_core.conf
@@ -0,0 +1,3 @@
+OMX.Intel.hw_vd.h264 : libmfx_omx_components_hw.so
+OMX.Intel.hw_ve.h264 : libmfx_omx_components_hw.so
+OMX.Intel.hw_vd.h265 : libmfx_omx_components_hw.so

From ab186e5fb4a1ee59027bfb67a951600dea0a77e6 Mon Sep 17 00:00:00 2001
From: Kalyan Kondapally <kalyan.kondapally@intel.com>
Date: Tue, 20 Jun 2017 11:54:20 -0700
Subject: [PATCH 121/427] Revert "[AIA] Update mixinspec."

Grub builds are compeletely broken.

This reverts commit 4e2b81e41006dfb2233203c715379326ec7d42ba.
---
 androidia_64/BoardConfig.mk | 2 +-
 androidia_64/init.rc        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index d5b9d6866..0e68fef75 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -75,7 +75,7 @@ TARGET_NO_KERNEL ?= false
 KERNEL_LOGLEVEL ?= 3
 SERIAL_PARAMETER := console=tty0 console=ttyS2,115200n8
 
-BOARD_KERNEL_CMDLINE += root=/dev/ram0  androidboot.hardware=$(TARGET_PRODUCT) firmware_class.path=/vendor/firmware loglevel=$(KERNEL_LOGLEVEL)
+BOARD_KERNEL_CMDLINE += root=/dev/ram0  androidboot.hardware=$(TARGET_PRODUCT) androidboot.selinux=permissive firmware_class.path=/vendor/firmware loglevel=$(KERNEL_LOGLEVEL)
 
 ifneq ($(TARGET_BUILD_VARIANT),user)
 ifeq ($(SPARSE_IMG),true)
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index c9d81a1a2..06da604b7 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -103,6 +103,7 @@ on fs
 on init
     chown system system /sys/class/backlight/intel_backlight/brightness
     chown system system /sys/class/backlight/acpi_video0/brightness
+    write /sys/fs/selinux/enforce 0
 
 on post-fs
    #setprop debug.sf.nobootanimation 1
@@ -511,7 +512,7 @@ on boot
 ##############################################################
 # Enable SELinux labeling
 on post-fs
-    restorecon_recursive /oem_config
+    restorecon_recursive /config
 ##############################################################
 # Source: device/intel/mixins/groups/factory-partition/true/init.rc
 ##############################################################

From 0d9322ff7cdf3afcb5da9257adcdf2ef53f69fbb Mon Sep 17 00:00:00 2001
From: Karan <karanx.bhagoji@intel.com>
Date: Fri, 16 Jun 2017 20:53:09 +0530
Subject: [PATCH 122/427] Fix to enable PMIC for TYPE C connector

This patch adds the power configurations
needed by the Type C W-cove

Jira : None
Test : 1:USB host and device mode tests.
       2:USB host to device mode and vice
         versa switching.

Signed-off-by Karan <karanx.bhagoji@intel.com>
---
 kernel_config/kernel_64_defconfig | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 65fbc1fcd..730b05c3b 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -580,12 +580,14 @@ CONFIG_ACPI_HED=m
 # CONFIG_ACPI_NFIT is not set
 CONFIG_HAVE_ACPI_APEI=y
 CONFIG_HAVE_ACPI_APEI_NMI=y
-# CONFIG_ACPI_APEI is not set
+CONFIG_ACPI_APEI=y
 # CONFIG_DPTF_POWER is not set
 # CONFIG_ACPI_EXTLOG is not set
-# CONFIG_PMIC_OPREGION is not set
-# CONFIG_ACPI_CONFIGFS is not set
-CONFIG_SFI=y
+CONFIG_PMIC_OPREGION=y
+CONFIG_CRC_PMIC_OPREGION=y
+CONFIG_XPOWER_PMIC_OPREGION=y
+CONFIG_BXT_WC_PMIC_OPREGION=y
+# CONFIG_SFI is not set
 
 #
 # CPU Frequency scaling
@@ -3463,6 +3465,7 @@ CONFIG_INTEL_SOC_PMIC=y
 CONFIG_MFD_INTEL_LPSS=y
 CONFIG_MFD_INTEL_LPSS_ACPI=m
 CONFIG_MFD_INTEL_LPSS_PCI=y
+CONFIG_BXT_WC_PMIC_OPREGION=y
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
 CONFIG_MFD_88PM800=m
@@ -7087,3 +7090,4 @@ CONFIG_USB_CONFIGFS_UEVENT=y
 CONFIG_USB_CONFIGFS_F_MIDI=y
 CONFIG_USB_OTG_WAKELOCK=y
 CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_BXT_WC_PMIC_OPREGION=y

From a61dfac50d6d06ed363ff84598edc4c8276b001e Mon Sep 17 00:00:00 2001
From: "Tang, FuweiX" <fuweix.tang@intel.com>
Date: Sat, 17 Jun 2017 14:24:45 +0800
Subject: [PATCH 123/427] AIA: Expose AAC-ELD and AAC-HE audio encoder in
 media_profiles.xml

AAC-ELD and AAC-HE encoder are supported by AOSP by default, but not exposed to
application in media_profiles.xml. So exposing it in media_profiles.xml will
enable the application to pick up the encoder. However, it's up to vendor to
include it or not.

Signed-off-by: Tang, FuweiX <fuweix.tang@intel.com>
Signed-off-by: G K Deepa <g.k.deepa@intel.com>
---
 common/media/media_profiles.xml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/common/media/media_profiles.xml b/common/media/media_profiles.xml
index 8f4155c5e..b289f74a5 100644
--- a/common/media/media_profiles.xml
+++ b/common/media/media_profiles.xml
@@ -32,7 +32,7 @@
 <!ATTLIST Video height CDATA #REQUIRED>
 <!ATTLIST Video frameRate CDATA #REQUIRED>
 <!ELEMENT Audio EMPTY>
-<!ATTLIST Audio codec (amrnb|amrwb|aac) #REQUIRED>
+<!ATTLIST Audio codec (amrnb|amrwb|aac|heaac|aaceld) #REQUIRED>
 <!ATTLIST Audio bitRate CDATA #REQUIRED>
 <!ATTLIST Audio sampleRate CDATA #REQUIRED>
 <!ATTLIST Audio channels (1|2) #REQUIRED>
@@ -56,7 +56,7 @@
 <!ATTLIST VideoEncoderCap minFrameRate CDATA #REQUIRED>
 <!ATTLIST VideoEncoderCap maxFrameRate CDATA #REQUIRED>
 <!ELEMENT AudioEncoderCap EMPTY>
-<!ATTLIST AudioEncoderCap name (amrnb|amrwb|aac|wma) #REQUIRED>
+<!ATTLIST AudioEncoderCap name (amrnb|amrwb|aac|heaac|aacled|wma) #REQUIRED>
 <!ATTLIST AudioEncoderCap enabled (true|false) #REQUIRED>
 <!ATTLIST AudioEncoderCap minBitRate CDATA #REQUIRED>
 <!ATTLIST AudioEncoderCap maxBitRate CDATA #REQUIRED>
@@ -457,6 +457,16 @@
         minSampleRate="8000" maxSampleRate="44100"
         minChannels="1" maxChannels="1" />
 
+    <AudioEncoderCap name="heaac" enabled="true"
+        minBitRate="8000" maxBitRate="64000"
+        minSampleRate="16000" maxSampleRate="48000"
+        minChannels="1" maxChannels="1" />
+
+    <AudioEncoderCap name="aaceld" enabled="true"
+        minBitRate="16000" maxBitRate="192000"
+        minSampleRate="16000" maxSampleRate="48000"
+        minChannels="1" maxChannels="1" />
+
     <!--
         FIXME:
         We do not check decoder capabilities at present

From ef560955085c1e6214fe0291ebe9437101dfc479 Mon Sep 17 00:00:00 2001
From: "xihua.chen" <xihua.chen@intel.com>
Date: Thu, 22 Jun 2017 09:24:43 +0800
Subject: [PATCH 124/427] [AIA] Mixin update iOTA

mixin & add sepolicy for iota update

Signed-off-by: xihua.chen <xihua.chen@intel.com>
---
 androidia_64/AndroidBoard.mk | 9 ++++++++-
 sepolicy/recovery.te         | 5 +++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/androidia_64/AndroidBoard.mk b/androidia_64/AndroidBoard.mk
index c8da4d748..7f855ad10 100644
--- a/androidia_64/AndroidBoard.mk
+++ b/androidia_64/AndroidBoard.mk
@@ -101,7 +101,14 @@ $(PRODUCT_OUT)/efi/startup.nsh:
 	$(ACP) $(TARGET_DEVICE_DIR)/$(@F) $@
 	sed -i '/#/d' $@
 
-$(out_flashfiles): $(BOARD_FLASHFILES) | $(ACP)
+$(out_flashfiles): $(BOARD_FLASHFILES) | $(ACP) | otapackage
+	$(hide) if [[ -e $(DIST_DIR)/system.img ]] ; then \
+	echo "copying system.img and vendor.img from out/dist first" ; \
+	mv $(PRODUCT_OUT)/system.img $(PRODUCT_OUT)/system.org.img ; \
+	mv $(PRODUCT_OUT)/vendor.img $(PRODUCT_OUT)/vendor.org.img ; \
+	$(ACP) $(DIST_DIR)/system.img $(PRODUCT_OUT)/system.img ; \
+	$(ACP) $(DIST_DIR)/vendor.img $(PRODUCT_OUT)/vendor.img ; \
+	echo "copying done" ; fi;
 	$(call generate_flashfiles,$@, $^)
 
 .PHONY: flashfiles
diff --git a/sepolicy/recovery.te b/sepolicy/recovery.te
index 769712e1b..57225482c 100644
--- a/sepolicy/recovery.te
+++ b/sepolicy/recovery.te
@@ -6,6 +6,11 @@ recovery_only(`
   allow recovery host1x_device:chr_file rw_file_perms;
 
   set_prop(recovery, ffs_prop)
+  allow recovery rootfs:dir { write create add_name };
+  allow recovery block_device:dir { write remove_name add_name search };
+  allow recovery block_device:blk_file { create unlink };
+  allow recovery vfat:dir create_dir_perms;
+  allow recovery vfat:file create_file_perms;
 
   # for operations in recovery/updater/flash_mtd.c
   allow recovery mtd_device:dir search;

From 97185cd22626cb8d737e702ada44db7cd9dc2767 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Tue, 27 Jun 2017 23:37:05 +0530
Subject: [PATCH 125/427] Revert "[AIA] Mixin update iOTA"

This reverts commit ef560955085c1e6214fe0291ebe9437101dfc479.
---
 androidia_64/AndroidBoard.mk | 9 +--------
 sepolicy/recovery.te         | 5 -----
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/androidia_64/AndroidBoard.mk b/androidia_64/AndroidBoard.mk
index 7f855ad10..c8da4d748 100644
--- a/androidia_64/AndroidBoard.mk
+++ b/androidia_64/AndroidBoard.mk
@@ -101,14 +101,7 @@ $(PRODUCT_OUT)/efi/startup.nsh:
 	$(ACP) $(TARGET_DEVICE_DIR)/$(@F) $@
 	sed -i '/#/d' $@
 
-$(out_flashfiles): $(BOARD_FLASHFILES) | $(ACP) | otapackage
-	$(hide) if [[ -e $(DIST_DIR)/system.img ]] ; then \
-	echo "copying system.img and vendor.img from out/dist first" ; \
-	mv $(PRODUCT_OUT)/system.img $(PRODUCT_OUT)/system.org.img ; \
-	mv $(PRODUCT_OUT)/vendor.img $(PRODUCT_OUT)/vendor.org.img ; \
-	$(ACP) $(DIST_DIR)/system.img $(PRODUCT_OUT)/system.img ; \
-	$(ACP) $(DIST_DIR)/vendor.img $(PRODUCT_OUT)/vendor.img ; \
-	echo "copying done" ; fi;
+$(out_flashfiles): $(BOARD_FLASHFILES) | $(ACP)
 	$(call generate_flashfiles,$@, $^)
 
 .PHONY: flashfiles
diff --git a/sepolicy/recovery.te b/sepolicy/recovery.te
index 57225482c..769712e1b 100644
--- a/sepolicy/recovery.te
+++ b/sepolicy/recovery.te
@@ -6,11 +6,6 @@ recovery_only(`
   allow recovery host1x_device:chr_file rw_file_perms;
 
   set_prop(recovery, ffs_prop)
-  allow recovery rootfs:dir { write create add_name };
-  allow recovery block_device:dir { write remove_name add_name search };
-  allow recovery block_device:blk_file { create unlink };
-  allow recovery vfat:dir create_dir_perms;
-  allow recovery vfat:file create_file_perms;
 
   # for operations in recovery/updater/flash_mtd.c
   allow recovery mtd_device:dir search;

From ced88a84d8e5fec1d952a678c2e2ce160136f904 Mon Sep 17 00:00:00 2001
From: XXinSun <xinx.sun@intel.com>
Date: Tue, 27 Jun 2017 14:47:11 +0800
Subject: [PATCH 126/427] [AIA] Add sepolicy for dptf

Joule met a avc denied issue in dmesg log,
when reading and writing powercap sysfs.
So add sepolicy for dptf to fix this issue.

Jira: AIA-421
Test: After boot-up, run "cat /sys/class/powercap/intel-rapl:0/constraint_0_power_limit_uw",
      PL1 should be 13W when temperature < 65C.

Signed-off-by: Sun Xinx xinx.sun@intel.com
---
 sepolicy/thermal/dptf/dptf.te | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sepolicy/thermal/dptf/dptf.te b/sepolicy/thermal/dptf/dptf.te
index 2ca1b5cb5..e31ce0f3b 100644
--- a/sepolicy/thermal/dptf/dptf.te
+++ b/sepolicy/thermal/dptf/dptf.te
@@ -48,6 +48,9 @@ allow dptf sysfs_thermal_management:file rw_file_perms;
 # /sys/class/backlight/intel_backlight/brigthness
 # /sys/class/power_supply/bq*/max_charge_current
 allow dptf sysfs:file rw_file_perms;
+allow dptf sysfs:dir r_dir_perms;
+allow dptf system_file:dir r_dir_perms;
+allow dptf sysfs_thermal_file:file r_file_perms;
 
 # Set properties
 set_prop(dptf, powerctl_prop)

From 23d98d32f683942e80c155202f28c276b9d5a982 Mon Sep 17 00:00:00 2001
From: XXinSun <xinx.sun@intel.com>
Date: Tue, 27 Jun 2017 15:03:20 +0800
Subject: [PATCH 127/427] KERNEL: Add the x86_pkg_temp_thermal into kernel by
 default

DPTF need to get CPU temperature from thermal sysfs node,
the sysfs node should get ready before initing service esif_ufd.
So compile x86_pkg_temp_thermal into the kernel instead of a module.

Jira: AIA-421
Test: Run "lsmod | grep x86_pkg_temp_thermal" to get module driver,
x86_pkg_temp_thermal module should not be shown.

Signed-off-by: Sun Xinx xinx.sun@intel.com
---
 kernel_config/kernel_64_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 730b05c3b..e8cc43f5b 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -3321,7 +3321,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y
 # CONFIG_CPU_THERMAL is not set
 # CONFIG_THERMAL_EMULATION is not set
 CONFIG_INTEL_POWERCLAMP=m
-CONFIG_X86_PKG_TEMP_THERMAL=m
+CONFIG_X86_PKG_TEMP_THERMAL=y
 CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
 CONFIG_INTEL_SOC_DTS_THERMAL=m
 

From 49c85011295418dc4421cb745b82b5df129b21ab Mon Sep 17 00:00:00 2001
From: "Baofeng, Tian" <baofeng.tian@intel.com>
Date: Tue, 4 Jul 2017 08:35:51 +0800
Subject: [PATCH 128/427] [AIA] Add sepolicy for aplog generation

add debug log sepolicy permission to android ia code base
make all crashlogs show up in /data/logs folder

Jira : AIA-428
Test : Check aplogs are generated in /data/logs/
       in adb shell

Signed-off-by: baofeng, tian baofeng.tian@intel.com
---
 sepolicy/debug-logs/dumpstate.te  |  5 +++++
 sepolicy/debug-logs/file.te       |  1 +
 sepolicy/debug-logs/file_contexts | 14 +++++++++++++
 sepolicy/debug-logs/logsvc.te     | 34 +++++++++++++++++++++++++++++++
 sepolicy/debug-logs/nfc.te        |  5 +++++
 sepolicy/debug-logs/system_app.te |  7 +++++++
 sepolicy/debug-logs/vdc.te        |  2 ++
 7 files changed, 68 insertions(+)
 create mode 100644 sepolicy/debug-logs/dumpstate.te
 create mode 100644 sepolicy/debug-logs/file.te
 create mode 100644 sepolicy/debug-logs/file_contexts
 create mode 100644 sepolicy/debug-logs/logsvc.te
 create mode 100644 sepolicy/debug-logs/nfc.te
 create mode 100644 sepolicy/debug-logs/system_app.te
 create mode 100644 sepolicy/debug-logs/vdc.te

diff --git a/sepolicy/debug-logs/dumpstate.te b/sepolicy/debug-logs/dumpstate.te
new file mode 100644
index 000000000..84a6ae548
--- /dev/null
+++ b/sepolicy/debug-logs/dumpstate.te
@@ -0,0 +1,5 @@
+#
+# dumpstate
+#
+
+allow dumpstate log_file:file r_file_perms;
diff --git a/sepolicy/debug-logs/file.te b/sepolicy/debug-logs/file.te
new file mode 100644
index 000000000..0e3c0d2f3
--- /dev/null
+++ b/sepolicy/debug-logs/file.te
@@ -0,0 +1 @@
+type log_file, mlstrustedobject, file_type;
diff --git a/sepolicy/debug-logs/file_contexts b/sepolicy/debug-logs/file_contexts
new file mode 100644
index 000000000..3ed4b3c94
--- /dev/null
+++ b/sepolicy/debug-logs/file_contexts
@@ -0,0 +1,14 @@
+# earlylogs entry point script
+(/system)?/vendor/bin/elogs.sh     u:object_r:logsvc_exec:s0
+
+(/system)?/vendor/bin/start_log_srv.sh  u:object_r:logsvc_exec:s0
+
+# ap[k]_logfs entry point script
+# this is also used by debug-npk, which is dependent on debug-logs
+(/system)?/vendor/bin/logcat_ep.sh      u:object_r:logsvc_exec:s0
+
+# earlylogs logs target
+/cache/elogs(/.*)?              u:object_r:log_file:s0
+
+# Logs
+/data/logs(/.*)?                u:object_r:log_file:s0
diff --git a/sepolicy/debug-logs/logsvc.te b/sepolicy/debug-logs/logsvc.te
new file mode 100644
index 000000000..2ca07f367
--- /dev/null
+++ b/sepolicy/debug-logs/logsvc.te
@@ -0,0 +1,34 @@
+# Rules for debug-logs specific services
+type logsvc, domain;
+type logsvc_exec, exec_type, file_type;
+
+init_daemon_domain(logsvc);
+
+allow logsvc system_file:file x_file_perms;
+allow logsvc shell_exec:file rx_file_perms;
+
+allow logsvc self:capability { dac_override sys_nice };
+allow logsvc self:capability2 syslog;
+
+allow logsvc log_file:file create_file_perms;
+allow logsvc log_file:dir rw_dir_perms;
+
+allow logsvc logdr_socket:sock_file write;
+allow logsvc logd:unix_stream_socket connectto;
+
+allow logsvc kmsg_device:chr_file { open read };
+allow logsvc kernel:system syslog_read;
+
+set_prop(logsvc, system_prop)
+set_prop(logsvc, ctl_default_prop)
+
+allow logsvc logsvc_exec:file execute_no_trans;
+
+allow logsvc logcat_exec:file execute_no_trans;
+allow logsvc logcat_exec:file rx_file_perms;
+
+# Execute toolbox/toybox commands
+allow logsvc toolbox_exec:file rx_file_perms;
+ 
+allow logsvc cache_file:dir r_dir_perms;
+allow logsvc cache_file:file r_file_perms;
diff --git a/sepolicy/debug-logs/nfc.te b/sepolicy/debug-logs/nfc.te
new file mode 100644
index 000000000..ef12e4a32
--- /dev/null
+++ b/sepolicy/debug-logs/nfc.te
@@ -0,0 +1,5 @@
+#
+# nfc
+#
+
+allow nfc log_file:file write;
diff --git a/sepolicy/debug-logs/system_app.te b/sepolicy/debug-logs/system_app.te
new file mode 100644
index 000000000..806ee693c
--- /dev/null
+++ b/sepolicy/debug-logs/system_app.te
@@ -0,0 +1,7 @@
+#
+# system_app
+#
+
+allow system_app log_file:dir create_dir_perms;
+allow system_app log_file:file create_file_perms;
+allow system_app log_file:filesystem getattr;
diff --git a/sepolicy/debug-logs/vdc.te b/sepolicy/debug-logs/vdc.te
new file mode 100644
index 000000000..d0a33993f
--- /dev/null
+++ b/sepolicy/debug-logs/vdc.te
@@ -0,0 +1,2 @@
+allow vdc log_file:dir r_dir_perms;
+allow vdc log_file:file r_file_perms;

From 2d3b4253716b6a936f46a820116a251731bba554 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Tue, 4 Jul 2017 14:47:51 +0530
Subject: [PATCH 129/427] [AIA] Mixin update

- aplog [debug-logs] sepolicy changes

Jira : None
Test : Device boots to homescreen
---
 androidia_64/device.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index b2b52b0da..5b792c865 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -429,7 +429,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.intel.logger=/system/bin/logcat
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += logd.kernel.raw_message=False
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.intel.logger.rot_cnt=20
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.intel.logger.rot_size=5000
-BOARD_SEPOLICY_DIRS += device/intel/sepolicy/debug-logs
+BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/debug-logs
 BOARD_SEPOLICY_M4DEFS += module_debug_logs=true
 endif
 ##############################################################

From 11a8ae0a44c8ad754da9176aab3a8c3a571f0b01 Mon Sep 17 00:00:00 2001
From: "Yue, VincentX" <vincentx.yue@intel.com>
Date: Fri, 7 Jul 2017 14:32:35 +0800
Subject: [PATCH 130/427] Fix when run gts or cts case, can't be screenshots

Jira: none
Test:
run gts -m GtsHomeHostTestCases -t com.google.android.home.gts.ScreenshotTest#testHomeScreen
run cts -m CtsAadbHostTestCases -t android.aadb.cts.TestDeviceFuncTest#testGetScreenshot

Signed-off-by: Yue, VincentX <vincentx.yue@intel.com>
---
 sepolicy/adbd.te | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sepolicy/adbd.te b/sepolicy/adbd.te
index 3322f18db..76a3f80fc 100644
--- a/sepolicy/adbd.te
+++ b/sepolicy/adbd.te
@@ -2,3 +2,4 @@ allow adbd tmpfs:file {entrypoint read };
 allow adbd graphics_device:dir search;
 allow adbd surfaceflinger:fifo_file rw_file_perms;
 allow adbd host1x_device:chr_file rw_file_perms;
+allow adbd surfaceflinger_tmpfs:file { read write };

From c6b08cb0b2dd3cd73d29f7dc215ae254a7d6ad2b Mon Sep 17 00:00:00 2001
From: "ji, zhenlong z" <zhenlong.z.ji@intel.com>
Date: Wed, 5 Jul 2017 16:43:39 +0800
Subject: [PATCH 131/427] [AIA][SELINUX] Let surfaceflinger_tmpfs override MLS
 restrictions

Cts apks run as untrusted_app with specific security level, some of them
 need to access files with the type of surfaceflinger_tmpfs, so surfaceflinger_tmpfs
need override MLS restrictions, or Cts apks cannot access it.

Jira : None
Test : Cts apks can access files with type of surfaceflinger_tmpfs

Signed-off-by: ji, zhenlong z <zhenlong.z.ji@intel.com>
---
 sepolicy/surfaceflinger.te | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sepolicy/surfaceflinger.te b/sepolicy/surfaceflinger.te
index e4bbc5e80..c4c918c0b 100644
--- a/sepolicy/surfaceflinger.te
+++ b/sepolicy/surfaceflinger.te
@@ -1,3 +1,8 @@
+#
+# surfaceflinger
+#
+typeattribute surfaceflinger_tmpfs mlstrustedobject;
+
 allow surfaceflinger graphics_device:chr_file ioctl;
 allow surfaceflinger device:chr_file ioctl;
 

From 32d8df95184d7c51076b06fe42e58f3429dfc22c Mon Sep 17 00:00:00 2001
From: "Yue, VincentX" <vincentx.yue@intel.com>
Date: Thu, 20 Jul 2017 16:08:47 +0800
Subject: [PATCH 132/427] Due to IA don't support GPS, need to delete the
 statement that support GPS features

Jira: none
Test:
run cts -m CtsLocationTestCases -t android.location.cts.LocationManagerTest#testGetProvider
run cts -m CtsLocationTestCases -t android.location.cts.LocationManagerTest#testGetProviders

Signed-off-by: Yue, VincentX <vincentx.yue@intel.com>
---
 androidia_64/device.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 5b792c865..52178a53c 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -69,7 +69,6 @@ PRODUCT_COPY_FILES += \
 # Gps
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.location.xml:system/etc/permissions/android.hardware.location.xml \
-    frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \
 
 # Touch
 PRODUCT_COPY_FILES += \

From f798d009772b0cb6ff04d3261b14f593318d7729 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Mon, 14 Aug 2017 15:45:30 +0530
Subject: [PATCH 133/427] [AIA] Mixin update

Add graphics flags LIBDRM_VER

Jira : None
Test : Device boots to homescreen
---
 androidia_64/BoardConfig.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 0e68fef75..a86c69237 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -28,6 +28,7 @@ INTEL_VA := true
 BOARD_GRAPHIC_IS_GEN := true
 BOARD_GPU_DRIVERS := i965
 BOARD_USE_MESA := true
+LIBDRM_VER := intel
 
 # System's VSYNC phase offsets in nanoseconds
 VSYNC_EVENT_PHASE_OFFSET_NS := 7500000
@@ -36,7 +37,6 @@ SF_VSYNC_EVENT_PHASE_OFFSET_NS := 5000000
 BOARD_GPU_DRIVERS ?= i965 swrast
 ifneq ($(strip $(BOARD_GPU_DRIVERS)),)
 TARGET_HARDWARE_3D := true
-TARGET_USES_HWC2 := true
 endif
 
 
@@ -50,6 +50,9 @@ INTEL_MINIGBM := external/minigbm
 
 BOARD_USES_GRALLOC1 := true
 
+
+TARGET_USES_HWC2 := true
+
 ##############################################################
 # Source: device/intel/mixins/groups/media/android_ia/BoardConfig.mk
 ##############################################################

From 1e1b99eccd02dbacdaa11dbc6c5470b6847836fd Mon Sep 17 00:00:00 2001
From: karanx <karanx.bhagoji@intel.com>
Date: Tue, 5 Sep 2017 20:55:38 +0530
Subject: [PATCH 134/427] SE Linux policy for Wakelock USB

This patch is enables the SE permission for
init.rc files to enable wakelock capture when
USB is connected.

Signed-off-by: Karan Bhagoji <karanx.bhagoji@intel.com>
Reviewed-by: Abhilash KV <abhilash.k.v@intel.com>
---
 sepolicy/init.te | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sepolicy/init.te b/sepolicy/init.te
index b459b0661..a0da4eaef 100644
--- a/sepolicy/init.te
+++ b/sepolicy/init.te
@@ -31,3 +31,4 @@ allow init debugfs_pstate:file w_file_perms;
 allow init userdata_block_device:blk_file write;
 allow init misc_block_device:blk_file write;
 allow init kernel:key search;
+allow init init:capability2 block_suspend;

From 92c1c230b19008e14fdb693401ef00c0f00af0ce Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 7 Sep 2017 10:06:23 +0530
Subject: [PATCH 135/427] [AIA] Mixin update

Jira : None
Test : Device boots to home screen

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/device.mk | 2 +-
 androidia_64/init.rc   | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 52178a53c..5fd34d886 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -221,7 +221,7 @@ PRODUCT_COPY_FILES += \
 
 # GLES version
 PRODUCT_PROPERTY_OVERRIDES += \
-   ro.opengles.version=196609
+   ro.opengles.version=196610
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:system/etc/permissions/android.hardware.vulkan.level.xml
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 06da604b7..41d825b2b 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -210,6 +210,10 @@ on boot
 on property:sys.usb.config=none && property:sys.usb.configfs=1
     write /config/usb_gadget/g1/os_desc/use 0
     setprop sys.usb.ffs.ready 0
+    write /sys/power/wake_unlock mylock
+
+on property:sys.usb.config=adb && property:sys.usb.configfs=1
+    write /sys/power/wake_lock mylock
 
 on property:init.svc.adbd=stopped
     setprop sys.usb.ffs.ready 0
@@ -225,6 +229,7 @@ on property:sys.usb.config=mtp,adb && property:sys.usb.configfs=1
     # write /config/usb_gadget/g1/os_desc/use 1
     write /config/usb_gadget/g1/idVendor 0x8087
     write /config/usb_gadget/g1/idProduct 0x0a5f
+    write /sys/power/wake_lock mylock
 
 on property:sys.usb.config=ptp && property:sys.usb.configfs=1
     write /config/usb_gadget/g1/functions/ptp.gs1/os_desc/interface.MTP/compatible_id "PTP"
@@ -237,6 +242,7 @@ on property:sys.usb.config=ptp,adb && property:sys.usb.configfs=1
     # write /config/usb_gadget/g1/os_desc/use 1
     write /config/usb_gadget/g1/idVendor 0x8087
     write /config/usb_gadget/g1/idProduct 0x0a61
+    write /sys/power/wake_lock mylock
 
 on property:sys.usb.config=rndis && property:sys.usb.configfs=1
     write /config/usb_gadget/g1/idVendor 0x8087
@@ -246,6 +252,7 @@ on property:sys.usb.config=rndis,adb && property:sys.usb.configfs=1
     write /config/usb_gadget/g1/bcdUSB 0x310
     write /config/usb_gadget/g1/idVendor 0x8087
     write /config/usb_gadget/g1/idProduct 0x0a63
+    write /sys/power/wake_lock mylock
 
 on property:sys.usb.config=midi && property:sys.usb.configfs=1
     write /config/usb_gadget/g1/idVendor 0x8087
@@ -254,6 +261,7 @@ on property:sys.usb.config=midi && property:sys.usb.configfs=1
 on property:sys.usb.config=midi,adb && property:sys.usb.configfs=1
     write /config/usb_gadget/g1/idVendor 0x8087
     write /config/usb_gadget/g1/idProduct 0x0a67
+    write /sys/power/wake_lock mylock
 
 on property:sys.usb.config=accessory && property:sys.usb.configfs=1
     write /config/usb_gadget/g1/idVendor 0x18d1
@@ -262,6 +270,7 @@ on property:sys.usb.config=accessory && property:sys.usb.configfs=1
 on property:sys.usb.config=accessory,adb && property:sys.usb.configfs=1
     write /config/usb_gadget/g1/idVendor 0x18d1
     write /config/usb_gadget/g1/idProduct 0x2d01
+    write /sys/power/wake_lock mylock
 ##############################################################
 # Source: device/intel/mixins/groups/adb_net/true/init.rc
 ##############################################################

From 7491cd6afec2ecbd0e66a6918ccd0913339bbd37 Mon Sep 17 00:00:00 2001
From: Jeevaka Prabu Badrappan <jeevaka.badrappan@intel.com>
Date: Mon, 10 Jul 2017 14:01:12 +0530
Subject: [PATCH 136/427] Set CONFIG_ANDROID_BINDER_DEVICES value

CONFIG_ANDROID_BINDER_DEVICES needs to be set to binder,
hwbinder, vndbinder for android o.

Jira : None
Test : Device boots to homescreen

Signed-off-by: Jeevaka Prabu Badrappan <jeevaka.badrappan@intel.com>
---
 kernel_config/kernel_64_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index e8cc43f5b..b2425f92b 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -6172,6 +6172,7 @@ CONFIG_THUNDERBOLT=m
 #
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 # CONFIG_LIBNVDIMM is not set
 CONFIG_NVMEM=m
 # CONFIG_STM is not set

From 15d703cca787ae931e8f684d55aee4e76c816ebf Mon Sep 17 00:00:00 2001
From: Jeevaka Prabu Badrappan <jeevaka.badrappan@intel.com>
Date: Mon, 10 Jul 2017 18:22:10 +0530
Subject: [PATCH 137/427] Remove feature specific changes from default mixins
 group

Feature specific changes should go into feature specific
mixin groups.

Jira : None
Test : Device boots to home screen

Signed-off-by: Jeevaka Prabu Badrappan <jeevaka.badrappan@intel.com>
---
 androidia_64/device.mk | 57 ------------------------------------------
 1 file changed, 57 deletions(-)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 5fd34d886..39d37918d 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -40,51 +40,22 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/tablet_core_hardware.xml:system/etc/permissions/tablet_core_hardware.xml
 
-# Camera: Device-specific configuration files.
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.camera.full.xml:system/etc/permissions/android.hardware.camera.full.xml \
-    frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:system/etc/permissions/android.hardware.camera.flash-autofocus.xml \
-    frameworks/native/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \
-    frameworks/native/data/etc/android.hardware.camera.xml:system/etc/permissions/android.hardware.camera.xml \
-
 # Voip
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
     frameworks/native/data/etc/android.software.sip.xml:system/etc/permissions/android.software.sip.xml \
 
-$(foreach sensor,accelerometer barometer compass gyroscope light stepcounter stepdetector proximity, \
-$(eval PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.sensor.$(sensor).xml:system/etc/permissions/android.hardware.sensor.$(sensor).xml))
-
 # Usb
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
     frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml
 
-# NFC
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml \
-    frameworks/native/data/etc/android.hardware.nfc.hce.xml:system/etc/permissions/android.hardware.nfc.hce.xml \
-    frameworks/native/data/etc/com.android.nfc_extras.xml:system/etc/permissions/com.android.nfc_extras.xml
-
-# Gps
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.location.xml:system/etc/permissions/android.hardware.location.xml \
-
 # Touch
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
     frameworks/native/data/etc/android.hardware.touchscreen.multitouch.distinct.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.distinct.xml \
     frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
 
-#Sensors
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:system/etc/permissions/android.hardware.sensor.accelerometer.xml \
-    frameworks/native/data/etc/android.hardware.sensor.barometer.xml:system/etc/permissions/android.hardware.sensor.barometer.xml \
-    frameworks/native/data/etc/android.hardware.sensor.compass.xml:system/etc/permissions/android.hardware.sensor.compass.xml \
-    frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \
-    frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
-    frameworks/native/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \
-
 # USB
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
@@ -96,12 +67,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.hwui.text_large_cache_width=2048 \
     ro.hwui.text_large_cache_height=512
 
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.ril.hsxpa=1 \
-    ro.ril.gprsclass=10 \
-    keyguard.no_require_sim=true \
-    ro.com.android.dataroaming=true
-
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     persist.rtc_local_time=1 \
 
@@ -117,17 +82,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.sys.wfd.virtual=0
 
-# Camera
-PRODUCT_PROPERTY_OVERRIDES += \
-    camera.disable_zsl_mode=0 \
-    persist.camera.HAL3.enabled=0 \
-    persist.camera.ois.disable=0
-
-# Camera: Format set up for graphics
-PRODUCT_PROPERTY_OVERRIDES += ro.camera.pixel_format = 0x10F
-PRODUCT_PROPERTY_OVERRIDES += ro.camera.rec.pixel_format = 0x100
-PRODUCT_PROPERTY_OVERRIDES += ro.ycbcr.pixel_format = 0x10F
-
 # Input resampling configuration
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.input.noresample=1
@@ -154,26 +108,15 @@ PRODUCT_PACKAGES += \
     WallpaperPicker \
     NotePad \
     Provision \
-    camera.android_ia \
     drmserver \
-    gps.default \
-    lights.default \
     power.android_ia \
     scp \
-    sensors.hsb \
     sftp \
     ssh \
     sshd \
     local_time.default.so \
-    vibrator.default.so \
     keystore.default.so
 
-# Sensors
-PRODUCT_PACKAGES += \
-    sensorhubd      \
-    libsensorhub    \
-    AndroidCalibrationTool \
-
 # USB
 PRODUCT_PACKAGES += \
     com.android.future.usb.accessory

From d5e79d8b1facd53e6b86fb4028320db8e8a9a8d8 Mon Sep 17 00:00:00 2001
From: Jeevaka Prabu Badrappan <jeevaka.badrappan@intel.com>
Date: Mon, 10 Jul 2017 18:24:50 +0530
Subject: [PATCH 138/427] Add hals and also manifest file needed for framework

Add base hals like composer, gralloc, usb, audio etc
to product packages. Also, add manifest which provides
hal informations like transport, version, passthrough etc
to framework for loading hal implementation.

Jira : None
Test : Device boots to home screen
Signed-off-by: Jeevaka Prabu Badrappan <jeevaka.badrappan@intel.com>
---
 androidia_64/device.mk |  54 ++++++++++++++++++++++
 manifest.xml           | 101 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 155 insertions(+)
 create mode 100644 manifest.xml

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 39d37918d..905ad6120 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -120,6 +120,29 @@ PRODUCT_PACKAGES += \
 # USB
 PRODUCT_PACKAGES += \
     com.android.future.usb.accessory
+
+# Keymaster HAL
+PRODUCT_PACKAGES += \
+    android.hardware.keymaster@3.0-impl \
+    android.hardware.keymaster@3.0-service
+
+# Power HAL
+PRODUCT_PACKAGES += \
+    android.hardware.power@1.0-impl \
+    android.hardware.power@1.0-service
+
+# DumpState HAL
+PRODUCT_PACKAGES += \
+    android.hardware.dumpstate@1.0-impl \
+    android.hardware.dumpstate@1.0-service
+
+# Configstore HAL
+PRODUCT_PACKAGES += \
+    android.hardware.configstore@1.0-impl
+
+# Vendor Interface Manifest
+PRODUCT_COPY_FILES += \
+    device/intel/android_ia/manifest.xml:vendor/manifest.xml
 ##############################################################
 # Source: device/intel/mixins/groups/graphics/android_ia/product.mk
 ##############################################################
@@ -179,6 +202,17 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.hardware.vulkan=android_ia
+
+# Graphics HAL
+PRODUCT_PACKAGES += \
+   android.hardware.graphics.composer@2.1-impl \
+   android.hardware.graphics.composer@2.1-service
+
+# Gralloc HAL
+PRODUCT_PACKAGES += \
+   android.hardware.graphics.allocator@2.0-impl \
+   android.hardware.graphics.allocator@2.0-service \
+   android.hardware.graphics.mapper@2.0-impl
 ##############################################################
 # Source: device/intel/mixins/groups/media/android_ia/product.mk
 ##############################################################
@@ -269,6 +303,12 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \
 		frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml
+
+# Bluetooth HAL
+PRODUCT_PACKAGES += \
+  android.hardware.bluetooth@1.0-impl \
+  android.hardware.bluetooth@1.0-service \
+  libbt-vendor
 ##############################################################
 # Source: device/intel/mixins/groups/disk-bus/auto/product.mk
 ##############################################################
@@ -290,6 +330,11 @@ PRODUCT_PACKAGES += \
     audio_policy.default.so \
     audio_configuration_files
 
+# Audio HAL
+PRODUCT_PACKAGES += \
+    android.hardware.audio.effect@2.0-impl \
+    android.hardware.audio@2.0-impl \
+    android.hardware.audio@2.0-service
 ##############################################################
 # Source: device/intel/mixins/groups/wlan/iwlwifi/product.mk
 ##############################################################
@@ -308,6 +353,10 @@ PRODUCT_COPY_FILES += \
 # Wifi configuration
 BOARD_WPA_SUPPLICANT_DRIVER := NL80211
 BOARD_WLAN_DEVICE := iwlwifi
+
+# Wifi HAL.
+PRODUCT_PACKAGES += \
+  android.hardware.wifi@1.0-service
 ##############################################################
 # Source: device/intel/mixins/groups/rfkill/true/product.mk
 ##############################################################
@@ -322,6 +371,11 @@ PRODUCT_COPY_FILES += \
 # usb accessory
 PRODUCT_PACKAGES += \
     com.android.future.usb.accessory
+
+# USB HAL
+PRODUCT_PACKAGES += \
+    android.hardware.usb@1.0-impl \
+    android.hardware.usb@1.0-service
 ##############################################################
 # Source: device/intel/mixins/groups/lights/true/product.mk
 ##############################################################
diff --git a/manifest.xml b/manifest.xml
new file mode 100644
index 000000000..06a143dc7
--- /dev/null
+++ b/manifest.xml
@@ -0,0 +1,101 @@
+<manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>android.hardware.audio</name>
+        <transport arch="32+64">passthrough</transport>
+        <version>2.0</version>
+        <interface>
+            <name>IDevicesFactory</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.audio.effect</name>
+        <transport arch="32+64">passthrough</transport>
+        <version>2.0</version>
+        <interface>
+            <name>IEffectsFactory</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.graphics.composer</name>
+        <transport>hwbinder</transport>
+        <version>2.1</version>
+        <interface>
+            <name>IComposer</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.graphics.allocator</name>
+        <transport>hwbinder</transport>
+        <version>2.0</version>
+        <interface>
+            <name>IAllocator</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.graphics.mapper</name>
+        <transport arch="32+64">passthrough</transport>
+        <version>2.0</version>
+        <interface>
+            <name>IMapper</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.keymaster</name>
+        <transport>hwbinder</transport>
+        <version>3.0</version>
+        <interface>
+            <name>IKeymasterDevice</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.power</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IPower</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.usb</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IUsb</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.bluetooth</name>
+        <transport arch="32+64">passthrough</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IBluetoothHci</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.configstore</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>ISurfaceFlingerConfigs</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.wifi</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IWifi</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>

From a7eefe78e45200862cd99f20ae31088ed922ff73 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Mon, 10 Jul 2017 17:35:48 +0530
Subject: [PATCH 139/427] Resolve compilation issues for AIA on Android-O

Jira : None
Test : Device boots to home screen

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/BoardConfig.mk            | 10 ++---
 androidia_64/device.mk                 | 17 ++++++++
 sepolicy/LICENSE                       | 15 -------
 sepolicy/adbd.te                       |  5 ---
 sepolicy/app.te                        |  3 --
 sepolicy/appdomain.te                  |  2 -
 sepolicy/audioserver.te                |  2 -
 sepolicy/bluetooth.te                  |  7 ----
 sepolicy/bootanim.te                   |  5 ---
 sepolicy/cameraserver.te               | 23 ----------
 sepolicy/crash_collector.te            | 18 --------
 sepolicy/crash_collector_app.te        |  9 ----
 sepolicy/debug-logs/dumpstate.te       |  5 ---
 sepolicy/debug-logs/file.te            |  1 -
 sepolicy/debug-logs/file_contexts      | 14 -------
 sepolicy/debug-logs/logsvc.te          | 34 ---------------
 sepolicy/debug-logs/nfc.te             |  5 ---
 sepolicy/debug-logs/system_app.te      |  7 ----
 sepolicy/debug-logs/vdc.te             |  2 -
 sepolicy/debugfs/dumpstate.te          |  5 ---
 sepolicy/debugfs/file.te               |  2 -
 sepolicy/debugfs/file_contexts         |  1 -
 sepolicy/debugfs/genfs_contexts        |  0
 sepolicy/debugfs/platform_app.te       |  5 ---
 sepolicy/device.te                     |  8 ----
 sepolicy/dex2oat.te                    |  1 -
 sepolicy/domain.te                     |  2 -
 sepolicy/drmserver.te                  |  2 -
 sepolicy/dumpstate.te                  |  6 ---
 sepolicy/file.te                       | 11 -----
 sepolicy/file_contexts                 | 23 ----------
 sepolicy/fsck.te                       |  1 -
 sepolicy/fwtool.te                     |  9 ----
 sepolicy/gpu_device.te                 |  1 -
 sepolicy/healthd.te                    |  2 -
 sepolicy/houdini/file.te               |  1 -
 sepolicy/houdini/init.te               |  5 ---
 sepolicy/init.te                       | 34 ---------------
 sepolicy/init_tmpfs.te                 |  5 ---
 sepolicy/installd.te                   |  1 -
 sepolicy/isolated_app.te               |  1 -
 sepolicy/kernel.te                     |  8 ----
 sepolicy/logd.te                       |  1 -
 sepolicy/mediacodec.te                 |  8 ----
 sepolicy/mediadrmserver.te             |  5 ---
 sepolicy/mediaserver.te                | 12 ------
 sepolicy/netd.te                       |  3 --
 sepolicy/priv_app.te                   |  3 --
 sepolicy/property.te                   |  3 --
 sepolicy/recovery.te                   | 16 -------
 sepolicy/rfkill.te                     | 17 --------
 sepolicy/service.te                    |  1 -
 sepolicy/servicemanager.te             |  1 -
 sepolicy/set_storage/init.te           |  5 ---
 sepolicy/set_storage/set_storage.te    | 18 --------
 sepolicy/shell.te                      |  4 --
 sepolicy/surfaceflinger.te             | 58 --------------------------
 sepolicy/sw_sync_device.te             |  1 -
 sepolicy/system_app.te                 |  5 ---
 sepolicy/system_server.te              | 23 ----------
 sepolicy/tee.te                        |  4 --
 sepolicy/thermal/device.te             |  1 -
 sepolicy/thermal/dptf/dptf.te          | 56 -------------------------
 sepolicy/thermal/dptf/file.te          |  2 -
 sepolicy/thermal/dptf/file_contexts    |  3 --
 sepolicy/thermal/dptf/init.te          |  7 ----
 sepolicy/thermal/dptf/service.te       |  1 -
 sepolicy/thermal/dptf/service_contexts |  3 --
 sepolicy/thermal/dptf/system_app.te    |  2 -
 sepolicy/thermal/dptf/system_server.te |  3 --
 sepolicy/thermal/dptf/thermal_lite.te  | 14 -------
 sepolicy/thermal/file.te               |  3 --
 sepolicy/thermal/file_contexts         | 12 ------
 sepolicy/thermal/system_app.te         | 14 -------
 sepolicy/thermal/ueventd.te            |  6 ---
 sepolicy/thermal_gov.te                | 13 ------
 sepolicy/ueventd.te                    | 18 --------
 sepolicy/uncrypt.te                    |  1 -
 sepolicy/untrusted_app.te              |  2 -
 sepolicy/vold.te                       |  3 --
 sepolicy/wpa.te                        |  5 ---
 sepolicy/zygote.te                     |  7 ----
 82 files changed, 22 insertions(+), 660 deletions(-)
 delete mode 100644 sepolicy/LICENSE
 delete mode 100644 sepolicy/adbd.te
 delete mode 100644 sepolicy/app.te
 delete mode 100644 sepolicy/appdomain.te
 delete mode 100644 sepolicy/audioserver.te
 delete mode 100644 sepolicy/bluetooth.te
 delete mode 100644 sepolicy/bootanim.te
 delete mode 100644 sepolicy/cameraserver.te
 delete mode 100644 sepolicy/crash_collector.te
 delete mode 100644 sepolicy/crash_collector_app.te
 delete mode 100644 sepolicy/debug-logs/dumpstate.te
 delete mode 100644 sepolicy/debug-logs/file.te
 delete mode 100644 sepolicy/debug-logs/file_contexts
 delete mode 100644 sepolicy/debug-logs/logsvc.te
 delete mode 100644 sepolicy/debug-logs/nfc.te
 delete mode 100644 sepolicy/debug-logs/system_app.te
 delete mode 100644 sepolicy/debug-logs/vdc.te
 delete mode 100644 sepolicy/debugfs/dumpstate.te
 delete mode 100644 sepolicy/debugfs/file.te
 delete mode 100644 sepolicy/debugfs/file_contexts
 delete mode 100644 sepolicy/debugfs/genfs_contexts
 delete mode 100644 sepolicy/debugfs/platform_app.te
 delete mode 100644 sepolicy/device.te
 delete mode 100644 sepolicy/dex2oat.te
 delete mode 100644 sepolicy/domain.te
 delete mode 100644 sepolicy/drmserver.te
 delete mode 100644 sepolicy/dumpstate.te
 delete mode 100644 sepolicy/file.te
 delete mode 100644 sepolicy/file_contexts
 delete mode 100644 sepolicy/fsck.te
 delete mode 100644 sepolicy/fwtool.te
 delete mode 100644 sepolicy/gpu_device.te
 delete mode 100644 sepolicy/healthd.te
 delete mode 100644 sepolicy/houdini/file.te
 delete mode 100644 sepolicy/houdini/init.te
 delete mode 100644 sepolicy/init.te
 delete mode 100644 sepolicy/init_tmpfs.te
 delete mode 100644 sepolicy/installd.te
 delete mode 100644 sepolicy/isolated_app.te
 delete mode 100644 sepolicy/kernel.te
 delete mode 100644 sepolicy/logd.te
 delete mode 100644 sepolicy/mediacodec.te
 delete mode 100644 sepolicy/mediadrmserver.te
 delete mode 100644 sepolicy/mediaserver.te
 delete mode 100644 sepolicy/netd.te
 delete mode 100644 sepolicy/priv_app.te
 delete mode 100644 sepolicy/property.te
 delete mode 100644 sepolicy/recovery.te
 delete mode 100644 sepolicy/rfkill.te
 delete mode 100644 sepolicy/service.te
 delete mode 100644 sepolicy/servicemanager.te
 delete mode 100644 sepolicy/set_storage/init.te
 delete mode 100644 sepolicy/set_storage/set_storage.te
 delete mode 100644 sepolicy/shell.te
 delete mode 100644 sepolicy/surfaceflinger.te
 delete mode 100644 sepolicy/sw_sync_device.te
 delete mode 100644 sepolicy/system_app.te
 delete mode 100644 sepolicy/system_server.te
 delete mode 100644 sepolicy/tee.te
 delete mode 100644 sepolicy/thermal/device.te
 delete mode 100644 sepolicy/thermal/dptf/dptf.te
 delete mode 100644 sepolicy/thermal/dptf/file.te
 delete mode 100644 sepolicy/thermal/dptf/file_contexts
 delete mode 100644 sepolicy/thermal/dptf/init.te
 delete mode 100644 sepolicy/thermal/dptf/service.te
 delete mode 100644 sepolicy/thermal/dptf/service_contexts
 delete mode 100644 sepolicy/thermal/dptf/system_app.te
 delete mode 100644 sepolicy/thermal/dptf/system_server.te
 delete mode 100644 sepolicy/thermal/dptf/thermal_lite.te
 delete mode 100644 sepolicy/thermal/file.te
 delete mode 100644 sepolicy/thermal/file_contexts
 delete mode 100644 sepolicy/thermal/system_app.te
 delete mode 100644 sepolicy/thermal/ueventd.te
 delete mode 100644 sepolicy/thermal_gov.te
 delete mode 100644 sepolicy/ueventd.te
 delete mode 100644 sepolicy/uncrypt.te
 delete mode 100644 sepolicy/untrusted_app.te
 delete mode 100644 sepolicy/vold.te
 delete mode 100644 sepolicy/wpa.te
 delete mode 100644 sepolicy/zygote.te

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index a86c69237..841e6aee7 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -141,7 +141,7 @@ KERNELFLINGER_SSL_LIBRARY := openssl
 BOARD_KERNEL_CMDLINE += iTCO_wdt.force_no_reboot=1
 
 # Show the "OEM unlocking" option in Android "Developer options"
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.frp.pst=/dev/block/by-name/android_persistent
+#PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.frp.pst=/dev/block/by-name/android_persistent
 
 # Specify file for creating final flashfiles
 BOARD_GPT_INI ?= $(TARGET_DEVICE_DIR)/gpt.ini
@@ -208,11 +208,11 @@ TARGET_BOOTLOADER_POLICY := 0x0
 # variables to store the BPM and OAK values.  The BPM value is defined
 # compilation time by the TARGET_BOOTLOADER_POLICY variable.
 TARGET_BOOTLOADER_POLICY_USE_EFI_VAR := true
-ifeq ($(TARGET_BOOTLOADER_POLICY),$(filter $(TARGET_BOOTLOADER_POLICY),0x0 0x2 0x4 0x6))
+#ifeq ($(TARGET_BOOTLOADER_POLICY),$(filter $(TARGET_BOOTLOADER_POLICY),0x0 0x2 0x4 0x6))
 # OEM Unlock reporting 1
-ADDITIONAL_DEFAULT_PROPERTIES += \
-	ro.oem_unlock_supported=1
-endif
+#ADDITIONAL_DEFAULT_PROPERTIES += \
+#	ro.oem_unlock_supported=1
+#endif
 ifeq ($(TARGET_BOOTLOADER_POLICY),$(filter $(TARGET_BOOTLOADER_POLICY),static external))
 # The bootloader policy is not generated build time but is supplied
 # statically in the repository or in $(PRODUCT_OUT)/.  If your
diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 905ad6120..a1d613008 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -314,6 +314,21 @@ PRODUCT_PACKAGES += \
 ##############################################################
 # create primary storage symlink dynamically
 PRODUCT_PACKAGES += set_storage
+##############################################################
+# Source: device/intel/mixins/groups/boot-arch/android_ia/product.mk
+##############################################################
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.frp.pst=/dev/block/by-name/android_persistent
+
+ifeq ($(TARGET_BOOTLOADER_POLICY),$(filter $(TARGET_BOOTLOADER_POLICY),0x0 0x2 0x4 0x6))
+# OEM Unlock reporting 1
+#ADDITIONAL_DEFAULT_PROPERTIES += \
+        ro.oem_unlock_supported=1
+
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+        ro.oem_unlock_supported=1
+
+endif
+
 ##############################################################
 # Source: device/intel/mixins/groups/audio/android_ia/product.mk
 ##############################################################
@@ -515,3 +530,5 @@ $(call inherit-product,build/target/product/verity.mk)
 ifeq ($(MIXIN_DEBUG_LOGS),true)
 PRODUCT_PACKAGES += crash_package
 endif
+
+
diff --git a/sepolicy/LICENSE b/sepolicy/LICENSE
deleted file mode 100644
index 9f50280f1..000000000
--- a/sepolicy/LICENSE
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-// Copyright (c) 2016 Intel Corporation
-//
-// 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.
-*/
diff --git a/sepolicy/adbd.te b/sepolicy/adbd.te
deleted file mode 100644
index 76a3f80fc..000000000
--- a/sepolicy/adbd.te
+++ /dev/null
@@ -1,5 +0,0 @@
-allow adbd tmpfs:file {entrypoint read };
-allow adbd graphics_device:dir search;
-allow adbd surfaceflinger:fifo_file rw_file_perms;
-allow adbd host1x_device:chr_file rw_file_perms;
-allow adbd surfaceflinger_tmpfs:file { read write };
diff --git a/sepolicy/app.te b/sepolicy/app.te
deleted file mode 100644
index a495f2b33..000000000
--- a/sepolicy/app.te
+++ /dev/null
@@ -1,3 +0,0 @@
-# Allow apps to read /dev/dri. Needed to pass CTS
-allow appdomain device:dir r_dir_perms;
-allow { appdomain -isolated_app } host1x_device:chr_file rw_file_perms;
diff --git a/sepolicy/appdomain.te b/sepolicy/appdomain.te
deleted file mode 100644
index 5ab909e46..000000000
--- a/sepolicy/appdomain.te
+++ /dev/null
@@ -1,2 +0,0 @@
-allow appdomain surfaceflinger:fifo_file rw_file_perms;
-allow appdomain sysfs_app_readable:file r_file_perms;
diff --git a/sepolicy/audioserver.te b/sepolicy/audioserver.te
deleted file mode 100644
index 67c24fa95..000000000
--- a/sepolicy/audioserver.te
+++ /dev/null
@@ -1,2 +0,0 @@
-allow audioserver tmpfs:lnk_file read;
-allow audioserver debugfs_tracing:file { write open };
diff --git a/sepolicy/bluetooth.te b/sepolicy/bluetooth.te
deleted file mode 100644
index 42c1e0ec1..000000000
--- a/sepolicy/bluetooth.te
+++ /dev/null
@@ -1,7 +0,0 @@
-allow bluetooth bluetooth_control:chr_file { rw_file_perms };
-
-# access /sys/devices/bt_bcm4354
-allow bluetooth sysfs_bluetooth:dir search;
-allow bluetooth sysfs_bluetooth:file rw_file_perms;
-allow bluetooth storage_stub_file:dir getattr;
-allow bluetooth self:socket create_socket_perms;
diff --git a/sepolicy/bootanim.te b/sepolicy/bootanim.te
deleted file mode 100644
index 1abc1fce9..000000000
--- a/sepolicy/bootanim.te
+++ /dev/null
@@ -1,5 +0,0 @@
-allow bootanim tmpfs:lnk_file read;
-allow bootanim debugfs_tracing:file { read open write };
-allow bootanim surfaceflinger:fifo_file rw_file_perms;
-allow bootanim device:dir r_dir_perms;
-allow bootanim sysfs_app_readable:file r_file_perms;
diff --git a/sepolicy/cameraserver.te b/sepolicy/cameraserver.te
deleted file mode 100644
index c2ff0149d..000000000
--- a/sepolicy/cameraserver.te
+++ /dev/null
@@ -1,23 +0,0 @@
-allow cameraserver tmpfs:lnk_file read;
-allow cameraserver debugfs_tracing:file { write open };
-allow bootanim surfaceflinger:fifo_file rw_file_perms;
-
-allow cameraserver system_server:unix_stream_socket { read write };
-
-# sensor manager based camera/video stabilization
-allow cameraserver sensorservice_service:service_manager find;
-allow cameraserver power_service:service_manager find;
-
-# gpu access
-allow cameraserver device:dir r_dir_perms;
-allow cameraserver gpu_device:chr_file rw_file_perms;
-allow cameraserver host1x_device:chr_file rw_file_perms;
-
-# /sys and /proc access
-allow cameraserver { proc proc_meminfo }:{ file lnk_file } r_file_perms;
-r_dir_file(cameraserver, sysfs)
-
-allow cameraserver system_file:dir r_dir_perms;
-allow cameraserver tmpfs:dir search;
-
-allow cameraserver sysfs_app_readable:file r_file_perms;
diff --git a/sepolicy/crash_collector.te b/sepolicy/crash_collector.te
deleted file mode 100644
index 2f941f0eb..000000000
--- a/sepolicy/crash_collector.te
+++ /dev/null
@@ -1,18 +0,0 @@
-type crash_collector, domain, domain_deprecated;
-type crash_collector_exec, exec_type, file_type;
-type crash_reports_data_file, file_type, data_file_type;
-
-# To start crash_collector via /proc/sys/core_pattern.
-domain_auto_trans(kernel, crash_collector_exec, crash_collector)
-allow crash_collector kernel:fifo_file read;
-allow crash_collector crash_collector_exec:file execute_no_trans;
-
-# To stop being root.
-allow crash_collector self:capability { setuid setgid };
-
-# To read exec files.
-allow crash_collector exec_type:file r_file_perms;
-
-# To write crash reports in /data/system/crash_reports/
-allow crash_collector crash_reports_data_file:dir create_dir_perms;
-allow crash_collector crash_reports_data_file:file create_file_perms;
diff --git a/sepolicy/crash_collector_app.te b/sepolicy/crash_collector_app.te
deleted file mode 100644
index 166ec1a1d..000000000
--- a/sepolicy/crash_collector_app.te
+++ /dev/null
@@ -1,9 +0,0 @@
-type crash_collector_app, domain, domain_deprecated;
-
-# com.google.android.crashuploader runs in the crash_collector_app domain
-app_domain(crash_collector_app)
-net_domain(crash_collector_app)
-
-allow crash_collector_app crash_reports_data_file:file { read getattr };
-
-allow crash_collector_app { service_manager_type -gatekeeper_service -netd_service }:service_manager find;
diff --git a/sepolicy/debug-logs/dumpstate.te b/sepolicy/debug-logs/dumpstate.te
deleted file mode 100644
index 84a6ae548..000000000
--- a/sepolicy/debug-logs/dumpstate.te
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# dumpstate
-#
-
-allow dumpstate log_file:file r_file_perms;
diff --git a/sepolicy/debug-logs/file.te b/sepolicy/debug-logs/file.te
deleted file mode 100644
index 0e3c0d2f3..000000000
--- a/sepolicy/debug-logs/file.te
+++ /dev/null
@@ -1 +0,0 @@
-type log_file, mlstrustedobject, file_type;
diff --git a/sepolicy/debug-logs/file_contexts b/sepolicy/debug-logs/file_contexts
deleted file mode 100644
index 3ed4b3c94..000000000
--- a/sepolicy/debug-logs/file_contexts
+++ /dev/null
@@ -1,14 +0,0 @@
-# earlylogs entry point script
-(/system)?/vendor/bin/elogs.sh     u:object_r:logsvc_exec:s0
-
-(/system)?/vendor/bin/start_log_srv.sh  u:object_r:logsvc_exec:s0
-
-# ap[k]_logfs entry point script
-# this is also used by debug-npk, which is dependent on debug-logs
-(/system)?/vendor/bin/logcat_ep.sh      u:object_r:logsvc_exec:s0
-
-# earlylogs logs target
-/cache/elogs(/.*)?              u:object_r:log_file:s0
-
-# Logs
-/data/logs(/.*)?                u:object_r:log_file:s0
diff --git a/sepolicy/debug-logs/logsvc.te b/sepolicy/debug-logs/logsvc.te
deleted file mode 100644
index 2ca07f367..000000000
--- a/sepolicy/debug-logs/logsvc.te
+++ /dev/null
@@ -1,34 +0,0 @@
-# Rules for debug-logs specific services
-type logsvc, domain;
-type logsvc_exec, exec_type, file_type;
-
-init_daemon_domain(logsvc);
-
-allow logsvc system_file:file x_file_perms;
-allow logsvc shell_exec:file rx_file_perms;
-
-allow logsvc self:capability { dac_override sys_nice };
-allow logsvc self:capability2 syslog;
-
-allow logsvc log_file:file create_file_perms;
-allow logsvc log_file:dir rw_dir_perms;
-
-allow logsvc logdr_socket:sock_file write;
-allow logsvc logd:unix_stream_socket connectto;
-
-allow logsvc kmsg_device:chr_file { open read };
-allow logsvc kernel:system syslog_read;
-
-set_prop(logsvc, system_prop)
-set_prop(logsvc, ctl_default_prop)
-
-allow logsvc logsvc_exec:file execute_no_trans;
-
-allow logsvc logcat_exec:file execute_no_trans;
-allow logsvc logcat_exec:file rx_file_perms;
-
-# Execute toolbox/toybox commands
-allow logsvc toolbox_exec:file rx_file_perms;
- 
-allow logsvc cache_file:dir r_dir_perms;
-allow logsvc cache_file:file r_file_perms;
diff --git a/sepolicy/debug-logs/nfc.te b/sepolicy/debug-logs/nfc.te
deleted file mode 100644
index ef12e4a32..000000000
--- a/sepolicy/debug-logs/nfc.te
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# nfc
-#
-
-allow nfc log_file:file write;
diff --git a/sepolicy/debug-logs/system_app.te b/sepolicy/debug-logs/system_app.te
deleted file mode 100644
index 806ee693c..000000000
--- a/sepolicy/debug-logs/system_app.te
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# system_app
-#
-
-allow system_app log_file:dir create_dir_perms;
-allow system_app log_file:file create_file_perms;
-allow system_app log_file:filesystem getattr;
diff --git a/sepolicy/debug-logs/vdc.te b/sepolicy/debug-logs/vdc.te
deleted file mode 100644
index d0a33993f..000000000
--- a/sepolicy/debug-logs/vdc.te
+++ /dev/null
@@ -1,2 +0,0 @@
-allow vdc log_file:dir r_dir_perms;
-allow vdc log_file:file r_file_perms;
diff --git a/sepolicy/debugfs/dumpstate.te b/sepolicy/debugfs/dumpstate.te
deleted file mode 100644
index f984db7b1..000000000
--- a/sepolicy/debugfs/dumpstate.te
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# dumpstate
-#
-
-allow dumpstate debugfs_graphics_sync:file r_file_perms;
diff --git a/sepolicy/debugfs/file.te b/sepolicy/debugfs/file.te
deleted file mode 100644
index 401ed909c..000000000
--- a/sepolicy/debugfs/file.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# debugfs sync file
-type debugfs_graphics_sync, fs_type, debugfs_type;
diff --git a/sepolicy/debugfs/file_contexts b/sepolicy/debugfs/file_contexts
deleted file mode 100644
index 971842b24..000000000
--- a/sepolicy/debugfs/file_contexts
+++ /dev/null
@@ -1 +0,0 @@
-/sys/kernel/debug/sync(/.*)?      u:object_r:debugfs_graphics_sync:s0
diff --git a/sepolicy/debugfs/genfs_contexts b/sepolicy/debugfs/genfs_contexts
deleted file mode 100644
index e69de29bb..000000000
diff --git a/sepolicy/debugfs/platform_app.te b/sepolicy/debugfs/platform_app.te
deleted file mode 100644
index 4559d08d5..000000000
--- a/sepolicy/debugfs/platform_app.te
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# platform_app
-#
-
-allow platform_app debugfs_graphics_sync:file r_file_perms;
diff --git a/sepolicy/device.te b/sepolicy/device.te
deleted file mode 100644
index 1e08949c8..000000000
--- a/sepolicy/device.te
+++ /dev/null
@@ -1,8 +0,0 @@
-type sw_sync_device, dev_type;
-type persist_block_device, dev_type;
-type rpmb_block_device, dev_type;
-type cros_ec_device, dev_type;
-type hidraw_device, dev_type;
-type host1x_device, dev_type, mlstrustedobject;
-type rfkill_device, dev_type;
-type config_block_device, dev_type;
diff --git a/sepolicy/dex2oat.te b/sepolicy/dex2oat.te
deleted file mode 100644
index a321a07df..000000000
--- a/sepolicy/dex2oat.te
+++ /dev/null
@@ -1 +0,0 @@
-allow dex2oat debugfs_tracing:file { open write };
diff --git a/sepolicy/domain.te b/sepolicy/domain.te
deleted file mode 100644
index bddbd2f93..000000000
--- a/sepolicy/domain.te
+++ /dev/null
@@ -1,2 +0,0 @@
-allow domain sysfs_socinfo:dir r_dir_perms;
-allow domain sysfs_socinfo:file r_file_perms;
diff --git a/sepolicy/drmserver.te b/sepolicy/drmserver.te
deleted file mode 100644
index be0cf3ce2..000000000
--- a/sepolicy/drmserver.te
+++ /dev/null
@@ -1,2 +0,0 @@
-allow drmserver gpu_device:chr_file rw_file_perms;
-allow drmserver ringtone_file:file { read };
diff --git a/sepolicy/dumpstate.te b/sepolicy/dumpstate.te
deleted file mode 100644
index a3c754fe3..000000000
--- a/sepolicy/dumpstate.te
+++ /dev/null
@@ -1,6 +0,0 @@
-userdebug_or_eng(`
-        allow dumpstate atvr_device:chr_file r_file_perms;
-')
-
-# GPU dynamic fbc feature
-allow dumpstate surfaceflinger:fifo_file rw_file_perms;
diff --git a/sepolicy/file.te b/sepolicy/file.te
deleted file mode 100644
index 7bfa91175..000000000
--- a/sepolicy/file.te
+++ /dev/null
@@ -1,11 +0,0 @@
-type bluetooth_control, dev_type;
-type sysfs_bluetooth, fs_type, sysfs_type;
-type sysfs_thermal_uevent, fs_type, sysfs_type;
-type sysfs_thermal_writable, fs_type, sysfs_type;
-type atvr_device, dev_type;
-type sysfs_coretemp, fs_type, sysfs_type;
-type gpu_pid_stats_file, fs_type, debugfs_type;
-type sysfs_socinfo, sysfs_type, fs_type;
-type config_file, file_type, data_file_type;
-type debugfs_pstate, fs_type, debugfs_type;
-type sysfs_app_readable, fs_type, sysfs_type;
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
deleted file mode 100644
index 9911f1417..000000000
--- a/sepolicy/file_contexts
+++ /dev/null
@@ -1,23 +0,0 @@
-/dev/block/mmcblk1p8        u:object_r:cache_block_device:s0
-/dev/block/mmcblk1p13        u:object_r:userdata_block_device:s0
-/dev/block/mmcblk1p3        u:object_r:boot_block_device:s0
-/dev/block/mmcblk1p4        u:object_r:recovery_block_device:s0
-/dev/block/mmcblk1p5        u:object_r:misc_block_device:s0
-/dev/block/mmcblk1p9        u:object_r:frp_block_device:s0
-/dev/block/mmcblk1p6        u:object_r:metadata_block_device:s0
-/dev/block/mmcblk1p11       u:object_r:config_block_device:s0
-
-/sys/kernel/debug/pstate_snb/setpoint u:object_r:debugfs_pstate:s0
-/oem_config(/.*)?           u:object_r:config_file:s0
-/system/bin/rfkill-init.sh  u:object_r:rfkill_exec:s0
-/dev/rfkill                 u:object_r:rfkill_device:s0
-
-/dev/dri/card0   u:object_r:gpu_device:s0
-/dev/dri/renderD128   u:object_r:gpu_device:s0
-/sys/devices/pci0000\:00/0000\:00\:02.0/device u:object_r:sysfs_app_readable:s0
-/sys/devices/pci0000\:00/0000\:00\:02.0/vendor u:object_r:sysfs_app_readable:s0
-/sys/devices/pci0000\:00/0000\:00\:02.0/uevent u:object_r:sysfs_app_readable:s0
-/sys/devices/pci0000\:00/0000\:00\:02.0/subsystem_vendor u:object_r:sysfs_app_readable:s0
-/sys/devices/pci0000\:00/0000\:00\:02.0/subsystem_device u:object_r:sysfs_app_readable:s0
-/sys/devices/pci0000\:00/0000\:00\:02.0/config u:object_r:sysfs_app_readable:s0
-/sys/devices/pci0000\:00/0000\:00\:02.0/resource0 u:object_r:sysfs_app_readable:s0
diff --git a/sepolicy/fsck.te b/sepolicy/fsck.te
deleted file mode 100644
index fec18b529..000000000
--- a/sepolicy/fsck.te
+++ /dev/null
@@ -1 +0,0 @@
-allow fsck config_block_device:blk_file rw_file_perms;
diff --git a/sepolicy/fwtool.te b/sepolicy/fwtool.te
deleted file mode 100644
index 39bc4d12d..000000000
--- a/sepolicy/fwtool.te
+++ /dev/null
@@ -1,9 +0,0 @@
-# permissions for /system/bin/fwtool
-type fwtool, domain, domain_deprecated;
-type fwtool_exec, exec_type, file_type;
-
-init_daemon_domain(fwtool)
-
-# access /dev/mtd/*
-allow fwtool mtd_device:dir search;
-allow fwtool mtd_device:chr_file rw_file_perms;
diff --git a/sepolicy/gpu_device.te b/sepolicy/gpu_device.te
deleted file mode 100644
index 9dea4d7a8..000000000
--- a/sepolicy/gpu_device.te
+++ /dev/null
@@ -1 +0,0 @@
-allow gpu_device debugfs:filesystem associate;
diff --git a/sepolicy/healthd.te b/sepolicy/healthd.te
deleted file mode 100644
index ea54b5770..000000000
--- a/sepolicy/healthd.te
+++ /dev/null
@@ -1,2 +0,0 @@
-allow healthd tmpfs:file entrypoint;
-allow healthd healthd:capability dac_override;
diff --git a/sepolicy/houdini/file.te b/sepolicy/houdini/file.te
deleted file mode 100644
index 9e6e92d17..000000000
--- a/sepolicy/houdini/file.te
+++ /dev/null
@@ -1 +0,0 @@
-type binfmt_misc, fs_type;
diff --git a/sepolicy/houdini/init.te b/sepolicy/houdini/init.te
deleted file mode 100644
index d446e03fe..000000000
--- a/sepolicy/houdini/init.te
+++ /dev/null
@@ -1,5 +0,0 @@
-# binfmt_misc: mount at /proc/sys/fs/binfmt_misc
-allow init proc:dir mounton;
-
-# binfmt_misc: register types
-allow init binfmt_miscfs:file write;
diff --git a/sepolicy/init.te b/sepolicy/init.te
deleted file mode 100644
index a0da4eaef..000000000
--- a/sepolicy/init.te
+++ /dev/null
@@ -1,34 +0,0 @@
-allow init kmsg_device:chr_file write;
-allow init tmpfs:file { open };
-allow init tmpfs:lnk_file { create setattr };
-allow init debugfs:dir mounton;
-allow init kernel:system module_request;
-allow init system_file:system module_load;
-allow init gpu_device:file { setattr relabelto };
-allow init tmpfs:file { relabelfrom };
-allow init init:capability sys_module;
-allow init device:chr_file { create unlink };
-allow init proc:dir mounton;
-allow init binfmt_miscfs:file w_file_perms;
-allow init tmpfs:lnk_file create_file_perms;
-# set attributes on /sys/class/gpio sym link
-# chmod 0770 /sys/class/gpio/gpio66
-allow init sysfs:lnk_file setattr;
-allow init sysfs:dir { write add_name };
-# userspace cannot create files in sys. ignore denial
-dontaudit init sysfs_devices_system_cpu:dir write;
-allow init { cache_file storage_file }:dir mounton;
-# /config
-allow init configfs:{ file lnk_file } create_file_perms;
-allow init cgroup:file create;
-allow init sw_sync_device:file { relabelto setattr read write open ioctl };
-allow init sysfs:file create;
-allow init devpts:chr_file { ioctl };
-allow init audio_device:chr_file { write ioctl };
-allow init platform_app:unix_stream_socket { read };
-
-allow init debugfs_pstate:file w_file_perms;
-allow init userdata_block_device:blk_file write;
-allow init misc_block_device:blk_file write;
-allow init kernel:key search;
-allow init init:capability2 block_suspend;
diff --git a/sepolicy/init_tmpfs.te b/sepolicy/init_tmpfs.te
deleted file mode 100644
index 1b773c0c0..000000000
--- a/sepolicy/init_tmpfs.te
+++ /dev/null
@@ -1,5 +0,0 @@
-allow init_tmpfs system_server:file { read write };
-allow init_tmpfs radio:file { read };
-allow init_tmpfs platform_app:file { read };
-allow init_tmpfs system_app:file { read };
-allow init_tmpfs untrusted_app:file { read };
diff --git a/sepolicy/installd.te b/sepolicy/installd.te
deleted file mode 100644
index ee3009f00..000000000
--- a/sepolicy/installd.te
+++ /dev/null
@@ -1 +0,0 @@
-allow installd tmpfs:file open;
diff --git a/sepolicy/isolated_app.te b/sepolicy/isolated_app.te
deleted file mode 100644
index 4ec6bcbe3..000000000
--- a/sepolicy/isolated_app.te
+++ /dev/null
@@ -1 +0,0 @@
-neverallow isolated_app host1x_device:chr_file { rw_file_perms execute };
diff --git a/sepolicy/kernel.te b/sepolicy/kernel.te
deleted file mode 100644
index 42471d8da..000000000
--- a/sepolicy/kernel.te
+++ /dev/null
@@ -1,8 +0,0 @@
-# kdevtmpfs accesses devices before ueventd restorecon
-allow kernel device: { blk_file chr_file } { create setattr };
-allow kernel device:dir { create write add_name };
-allow kernel self:capability mknod;
-allow kernel kernel:capability sys_admin;
-allow kernel kernel:system module_request;
-allow kernel tmpfs:file { open relabelfrom };
-allow kernel rootfs:chr_file { ioctl write };
diff --git a/sepolicy/logd.te b/sepolicy/logd.te
deleted file mode 100644
index 46482b45b..000000000
--- a/sepolicy/logd.te
+++ /dev/null
@@ -1 +0,0 @@
-allow logd logd:capability dac_override;
diff --git a/sepolicy/mediacodec.te b/sepolicy/mediacodec.te
deleted file mode 100644
index 69a69f408..000000000
--- a/sepolicy/mediacodec.te
+++ /dev/null
@@ -1,8 +0,0 @@
-allow mediacodec tmpfs:lnk_file read;
-dontaudit mediacodec graphics_device:dir search;
-allow mediacodec surfaceflinger:fifo_file { read write };
-allow mediacodec sysfs:file r_file_perms;
-allow mediacodec system_file:dir r_dir_perms;
-allow mediacodec device:dir r_dir_perms;
-allow mediacodec host1x_device:chr_file rw_file_perms;
-allow mediacodec sysfs_app_readable:file r_file_perms;
diff --git a/sepolicy/mediadrmserver.te b/sepolicy/mediadrmserver.te
deleted file mode 100644
index de2cef523..000000000
--- a/sepolicy/mediadrmserver.te
+++ /dev/null
@@ -1,5 +0,0 @@
-allow mediadrmserver tmpfs:lnk_file { read };
-allow mediadrmserver device:dir r_dir_perms;
-allow mediadrmserver host1x_device:chr_file rw_file_perms;
-allow mediadrmserver tmpfs:dir search;
-dontaudit mediadrmserver gpu_device:chr_file rw_file_perms;
diff --git a/sepolicy/mediaserver.te b/sepolicy/mediaserver.te
deleted file mode 100644
index 7e1fd4b74..000000000
--- a/sepolicy/mediaserver.te
+++ /dev/null
@@ -1,12 +0,0 @@
-# GPU dynamic fbc feature
-allow mediaserver surfaceflinger:fifo_file rw_file_perms;
-allow mediaserver tee_device:chr_file { ioctl open read };
-allow mediaserver device:dir r_dir_perms;
-# sensor manager based camera/video stabilization
-allow mediaserver system_server:unix_stream_socket { connectto read write setopt };
-allow mediaserver sensorservice_service:service_manager find;
-allow mediaserver host1x_device:chr_file rw_file_perms;
-# needed for widevine classic
-allow mediaserver tee_device:chr_file { ioctl open read write };
-allow mediaserver surfaceflinger_tmpfs:file { read write };
-allow mediaserver sysfs_app_readable:file r_file_perms;
diff --git a/sepolicy/netd.te b/sepolicy/netd.te
deleted file mode 100644
index bf206e3f2..000000000
--- a/sepolicy/netd.te
+++ /dev/null
@@ -1,3 +0,0 @@
-allow netd netd:capability { sys_module };
-allow netd kernel:system { module_request };
-allow netd proc_net:dir rw_dir_perms;
diff --git a/sepolicy/priv_app.te b/sepolicy/priv_app.te
deleted file mode 100644
index d9874364c..000000000
--- a/sepolicy/priv_app.te
+++ /dev/null
@@ -1,3 +0,0 @@
-allow priv_app debugfs_tracing:file { open write };
-allow priv_app device:dir { open read };
-allow priv_app device:chr_file { ioctl getattr };
diff --git a/sepolicy/property.te b/sepolicy/property.te
deleted file mode 100644
index 1bb3fe0d5..000000000
--- a/sepolicy/property.te
+++ /dev/null
@@ -1,3 +0,0 @@
-type product_locale_prop, property_type;
-type debug_bq25892_prop, property_type;
-type wifi_region_prop, property_type;
diff --git a/sepolicy/recovery.te b/sepolicy/recovery.te
deleted file mode 100644
index 769712e1b..000000000
--- a/sepolicy/recovery.te
+++ /dev/null
@@ -1,16 +0,0 @@
-recovery_only(`
-  # recovery uses cache
-  allow recovery cache_file:dir mounton;
-  # look in /dev/dri/
-  allow recovery gpu_device:chr_file rw_file_perms;
-  allow recovery host1x_device:chr_file rw_file_perms;
-
-  set_prop(recovery, ffs_prop)
-
-  # for operations in recovery/updater/flash_mtd.c
-  allow recovery mtd_device:dir search;
-  allow recovery mtd_device:chr_file rw_file_perms;
-
-  # for operations in recovery/update/flash_ec.c
-  allow recovery cros_ec_device:chr_file rw_file_perms;
-')
diff --git a/sepolicy/rfkill.te b/sepolicy/rfkill.te
deleted file mode 100644
index cd91a49f0..000000000
--- a/sepolicy/rfkill.te
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# rfkill
-# domain and exec types only. Need to refactor between autodetect and rfkill
-# mixin. Seems to be some weird dependency chanin on this.
-# For not, just handle the fc labels between the mixins and have this type
-# global.
-#
-type rfkill, domain;
-type rfkill_exec, exec_type, file_type;
-init_daemon_domain(rfkill)
-
-# devices
-allow rfkill rfkill_device:chr_file rw_file_perms;
-
-# its a shell script, so in order to run the interpreter
-# it needs access to shell_exec
-allow rfkill shell_exec:file rx_file_perms;
diff --git a/sepolicy/service.te b/sepolicy/service.te
deleted file mode 100644
index df43c0432..000000000
--- a/sepolicy/service.te
+++ /dev/null
@@ -1 +0,0 @@
-type remote_control_service, system_api_service, system_server_service, service_manager_type;
\ No newline at end of file
diff --git a/sepolicy/servicemanager.te b/sepolicy/servicemanager.te
deleted file mode 100644
index 90fa31482..000000000
--- a/sepolicy/servicemanager.te
+++ /dev/null
@@ -1 +0,0 @@
-allow servicemanager tmpfs:file open;
diff --git a/sepolicy/set_storage/init.te b/sepolicy/set_storage/init.te
deleted file mode 100644
index 8ba454da9..000000000
--- a/sepolicy/set_storage/init.te
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# init
-#
-
-domain_trans(init, rootfs, set_storage)
diff --git a/sepolicy/set_storage/set_storage.te b/sepolicy/set_storage/set_storage.te
deleted file mode 100644
index 23f71e473..000000000
--- a/sepolicy/set_storage/set_storage.te
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# set_storage - set symlink on /dev/block/by-name
-#
-
-type set_storage, domain;
-
-allow set_storage self:capability { fowner chown fsetid };
-
-allow set_storage block_device:dir rw_dir_perms;
-allow set_storage block_device:lnk_file create;
-allow set_storage rootfs:file rx_file_perms;
-
-# XXX setattr here can likely be dropped as it does so on the
-# frp block device
-allow set_storage block_device:blk_file { getattr setattr };
-
-# chmod to system partition owner, see set_storage.c
-allow set_storage frp_block_device:blk_file setattr;
\ No newline at end of file
diff --git a/sepolicy/shell.te b/sepolicy/shell.te
deleted file mode 100644
index 62ae1bddd..000000000
--- a/sepolicy/shell.te
+++ /dev/null
@@ -1,4 +0,0 @@
-allow shell efs_file:dir search;
-allow shell efs_file:file r_file_perms;
-allow shell bluetooth_efs_file:dir search;
-allow shell bluetooth_efs_file:file r_file_perms;
diff --git a/sepolicy/surfaceflinger.te b/sepolicy/surfaceflinger.te
deleted file mode 100644
index c4c918c0b..000000000
--- a/sepolicy/surfaceflinger.te
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# surfaceflinger
-#
-typeattribute surfaceflinger_tmpfs mlstrustedobject;
-
-allow surfaceflinger graphics_device:chr_file ioctl;
-allow surfaceflinger device:chr_file ioctl;
-
-allow surfaceflinger device:dir r_dir_perms;
-allow surfaceflinger gpu_device:dir search;
-allow surfaceflinger gpu_device:chr_file { read ioctl open write };
-allow surfaceflinger gpu_device:file { read ioctl open write };
-allow surfaceflinger sw_sync_device:file { read ioctl open write };
-allow surfaceflinger debugfs:chr_file { read ioctl open write getattr };
-allow surfaceflinger debugfs_tracing:file { read open write };
-allow surfaceflinger tmpfs:chr_file write;
-
-# Talk to init over the property socket.
-unix_socket_connect(surfaceflinger, property, init)
-
-allow surfaceflinger platform_app:fd use;
-allow surfaceflinger self:capability dac_override;
-allow surfaceflinger system_app:fd use;
-allow surfaceflinger system_server:binder { transfer call };
-
-allow surfaceflinger proc:file write;
-allow surfaceflinger servicemanager:binder call;
-allow surfaceflinger untrusted_app:fd use;
-
-allow surfaceflinger shell_exec:file { read execute open execute_no_trans };
-allow surfaceflinger toolbox_exec:file { read getattr open execute };
-
-allow surfaceflinger shell:binder call;
-allow surfaceflinger toolbox_exec:file execute_no_trans;
-
-allow surfaceflinger system_data_file:dir { write create add_name };
-
-allow surfaceflinger app_data_file:file write;
-allow surfaceflinger dumpstate:fd use;
-allow surfaceflinger dumpstate:unix_stream_socket { read write };
-allow surfaceflinger mediaserver:binder transfer;
-
-allow surfaceflinger bluetooth:fd use;
-
-allow surfaceflinger bootanim:fd use;
-allow surfaceflinger bootanim:binder transfer;
-allow surfaceflinger bootanim:dir search;
-allow surfaceflinger bootanim:file { read getattr open };
-allow surfaceflinger bootanim:dir search;
-allow surfaceflinger bootanim:file { read getattr open };
-
-# access to dev/sw_sync
-allow surfaceflinger sw_sync_device:chr_file rw_file_perms;
-allow surfaceflinger host1x_device:chr_file rw_file_perms;
-allow surfaceflinger debugfs_graphics_sync:dir r_dir_perms;
-allow surfaceflinger debugfs_graphics_sync:file rw_file_perms;
-
-allow surfaceflinger sysfs_app_readable:file r_file_perms;
diff --git a/sepolicy/sw_sync_device.te b/sepolicy/sw_sync_device.te
deleted file mode 100644
index 25f02b9a8..000000000
--- a/sepolicy/sw_sync_device.te
+++ /dev/null
@@ -1 +0,0 @@
-allow sw_sync_device debugfs:filesystem associate;
diff --git a/sepolicy/system_app.te b/sepolicy/system_app.te
deleted file mode 100644
index a08e4bb64..000000000
--- a/sepolicy/system_app.te
+++ /dev/null
@@ -1,5 +0,0 @@
-allow system_app surfaceflinger_tmpfs:file { read write };
-allow system_app sysfs_thermal_writable:file rw_file_perms;
-allow system_app sysfs_coretemp:file rw_file_perms;
-allow system_app self:netlink_kobject_uevent_socket {create read bind connect getopt setopt shutdown};
-allow system_app radio_data_file:dir r_dir_perms;
diff --git a/sepolicy/system_server.te b/sepolicy/system_server.te
deleted file mode 100644
index b36911916..000000000
--- a/sepolicy/system_server.te
+++ /dev/null
@@ -1,23 +0,0 @@
-allow system_server tmpfs:file open;
-allow system_server surfaceflinger_tmpfs:file { read write };
-allow system_server efs_file:dir search;
-allow system_server efs_file:file r_file_perms;
-allow system_server surfaceflinger:fifo_file rw_file_perms;
-allow system_server gpu_pid_stats_file:dir r_dir_perms;
-allow system_server gpu_pid_stats_file:file r_file_perms;
-# Allow system_server to open crash report files.
-allow system_server crash_reports_data_file:dir r_dir_perms;
-allow system_server crash_reports_data_file:file r_file_perms;
-allow system_server host1x_device:chr_file rw_file_perms;
-allow system_server zygote:process setsched;
-allow system_server self:netlink_socket create_socket_perms;
-allow system_server sensors_device:chr_file rw_file_perms;
-allow system_server uhid_device:chr_file rw_file_perms;
-allow system_server device:chr_file ioctl;
-allow system_server debugfs:file { open read write };
-allow system_server init:tcp_socket { getopt setopt read write };
-allow system_server init:udp_socket { getopt setopt read write };
-allow system_server init:process { getattr getpgid };
-allow system_server sysfs_app_readable:file r_file_perms;
-allow system_server self:capability2 wake_alarm;
-get_prop(system_server, wifi_region_prop)
diff --git a/sepolicy/tee.te b/sepolicy/tee.te
deleted file mode 100644
index 688848327..000000000
--- a/sepolicy/tee.te
+++ /dev/null
@@ -1,4 +0,0 @@
-allow tee tee_data_file:dir create_dir_perms;
-allow tee self:capability { setuid setgid sys_rawio };
-allow tee block_device:dir search;
-allow tee rpmb_block_device:blk_file rw_file_perms;
diff --git a/sepolicy/thermal/device.te b/sepolicy/thermal/device.te
deleted file mode 100644
index d58ba6c54..000000000
--- a/sepolicy/thermal/device.te
+++ /dev/null
@@ -1 +0,0 @@
-type thermal_device, dev_type;
diff --git a/sepolicy/thermal/dptf/dptf.te b/sepolicy/thermal/dptf/dptf.te
deleted file mode 100644
index e31ce0f3b..000000000
--- a/sepolicy/thermal/dptf/dptf.te
+++ /dev/null
@@ -1,56 +0,0 @@
-# Rules for esif_ufd
-type dptf, domain;
-type dptf_exec, exec_type, file_type;
-init_daemon_domain(dptf);
-
-# Communicate with JHS
-binder_use(dptf)
-binder_service(dptf)
-binder_call(dptf, system_app)
-
-# Allow raw socket
-# Also requires DAC changes in device/intel/common/filesystem_config/android_filesystem_config.h
-allow dptf self:capability { net_raw };
-
-# Allow network access for DPTF UI
-net_domain(dptf)
-
-# Allow create and listen to uevent socket
-allow dptf self:netlink_kobject_uevent_socket create_socket_perms;
-
-# Add service to service_manager
-allow dptf dptf_service:service_manager add;
-
-# Find java_helper_service
-# DPTF calls java_helper_service for things that are best done using Android
-# Java API, such as graceful system shutdown, modem turning on/off, etc.
-allow dptf system_app_service:service_manager find;
-
-# System directory
-allow dptf system_file:file rx_file_perms;
-
-# Data directory
-allow dptf dptf_data_file:dir create_dir_perms;
-allow dptf dptf_data_file:file create_file_perms;
-
-#
-# Sysfs files
-#
-allow dptf sysfs_devices_system_cpu:file rw_file_perms;
-allow dptf sysfs_powercap:{ file lnk_file } rw_file_perms;
-allow dptf sysfs_powercap:dir { read open search};
-allow dptf sysfs_powercap:dir r_dir_perms;
-allow dptf sysfs_dptf_file:dir r_dir_perms;
-allow dptf sysfs_dptf_file:file rw_file_perms;
-allow dptf sysfs_thermal_management:dir r_dir_perms;
-allow dptf sysfs_thermal_management:file rw_file_perms;
-
-# /sys/class/backlight/intel_backlight/brigthness
-# /sys/class/power_supply/bq*/max_charge_current
-allow dptf sysfs:file rw_file_perms;
-allow dptf sysfs:dir r_dir_perms;
-allow dptf system_file:dir r_dir_perms;
-allow dptf sysfs_thermal_file:file r_file_perms;
-
-# Set properties
-set_prop(dptf, powerctl_prop)
diff --git a/sepolicy/thermal/dptf/file.te b/sepolicy/thermal/dptf/file.te
deleted file mode 100644
index 08c3e1f08..000000000
--- a/sepolicy/thermal/dptf/file.te
+++ /dev/null
@@ -1,2 +0,0 @@
-type dptf_data_file, file_type, data_file_type;
-type sysfs_dptf_file, fs_type, sysfs_type;
diff --git a/sepolicy/thermal/dptf/file_contexts b/sepolicy/thermal/dptf/file_contexts
deleted file mode 100644
index 24a3bec10..000000000
--- a/sepolicy/thermal/dptf/file_contexts
+++ /dev/null
@@ -1,3 +0,0 @@
-/data/misc/dptf(/.*)?           u:object_r:dptf_data_file:s0
-/etc/dptf(/.*)?                 u:object_r:dptf_data_file:s0
-(/system)?/vendor/bin/esif_ufd  u:object_r:dptf_exec:s0
diff --git a/sepolicy/thermal/dptf/init.te b/sepolicy/thermal/dptf/init.te
deleted file mode 100644
index f315d90df..000000000
--- a/sepolicy/thermal/dptf/init.te
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# init
-#
-
-# allow init to start thermal lite from ramfs
-# thermal lite gets its label from seclabel
-domain_trans(init, rootfs, thermal_lite)
diff --git a/sepolicy/thermal/dptf/service.te b/sepolicy/thermal/dptf/service.te
deleted file mode 100644
index 57b336c49..000000000
--- a/sepolicy/thermal/dptf/service.te
+++ /dev/null
@@ -1 +0,0 @@
-type dptf_service,             service_manager_type;
diff --git a/sepolicy/thermal/dptf/service_contexts b/sepolicy/thermal/dptf/service_contexts
deleted file mode 100644
index 508fb84d1..000000000
--- a/sepolicy/thermal/dptf/service_contexts
+++ /dev/null
@@ -1,3 +0,0 @@
-esif_ufd                                  u:object_r:dptf_service:s0
-java_helper_client_service                u:object_r:dptf_service:s0
-java_helper_service                       u:object_r:system_app_service:s0
diff --git a/sepolicy/thermal/dptf/system_app.te b/sepolicy/thermal/dptf/system_app.te
deleted file mode 100644
index 40a3b4b34..000000000
--- a/sepolicy/thermal/dptf/system_app.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# JHS service
-allow system_app system_app_service:service_manager add;
diff --git a/sepolicy/thermal/dptf/system_server.te b/sepolicy/thermal/dptf/system_server.te
deleted file mode 100644
index 2ab183022..000000000
--- a/sepolicy/thermal/dptf/system_server.te
+++ /dev/null
@@ -1,3 +0,0 @@
-# permission needed for sensor service to access thermal sensors
-allow system_server sysfs_thermal_management:dir rw_dir_perms;
-allow system_server sysfs_thermal_management:file rw_file_perms;
diff --git a/sepolicy/thermal/dptf/thermal_lite.te b/sepolicy/thermal/dptf/thermal_lite.te
deleted file mode 100644
index 00d43c6f0..000000000
--- a/sepolicy/thermal/dptf/thermal_lite.te
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# thermal_lite
-#
-
-type thermal_lite, domain;
-# File is in rootfs; label set in rc
-
-allow thermal_lite sysfs_thermal_management:dir r_dir_perms;
-allow thermal_lite sysfs_thermal_management:file r_file_perms;
-allow thermal_lite sysfs_powercap:dir r_dir_perms;
-allow thermal_lite sysfs_powercap:file rw_file_perms;
-
-# properties
-set_prop(thermal_lite, powerctl_prop)
diff --git a/sepolicy/thermal/file.te b/sepolicy/thermal/file.te
deleted file mode 100644
index 86747511b..000000000
--- a/sepolicy/thermal/file.te
+++ /dev/null
@@ -1,3 +0,0 @@
-type sysfs_thermal_management, fs_type, sysfs_type;
-type sysfs_thermal_file, fs_type, sysfs_type;
-type sysfs_powercap, fs_type, sysfs_type;
diff --git a/sepolicy/thermal/file_contexts b/sepolicy/thermal/file_contexts
deleted file mode 100644
index 815cedb6d..000000000
--- a/sepolicy/thermal/file_contexts
+++ /dev/null
@@ -1,12 +0,0 @@
-/sys/devices/virtual/thermal/thermal_zone[0-9]/trip_point_[0-9]_temp u:object_r:sysfs_thermal_file:s0
-/sys/devices/virtual/thermal/cooling_device[0-9]/cur_state u:object_r:sysfs_thermal_file:s0
-/sys/devices/virtual/thermal/thermal_zone[0-9]/policy u:object_r:sysfs_thermal_file:s0
-/sys/devices/virtual/thermal/thermal_zone[0-9]/temp u:object_r:sysfs_thermal_file:s0
-/sys/devices/system/cpu/cpu[0-4]/cpufreq/thermal_scaling_max_freq u:object_r:sysfs_thermal_file:s0
-
-/dev/acpi_thermal_rel       u:object_r:thermal_device:s0
-
-# thermal management
-/sys/devices/platform/coretemp.0(/.*)? u:object_r:sysfs_thermal_management:s0
-/sys/devices/virtual/thermal(/.*)?     u:object_r:sysfs_thermal_management:s0
-/sys/devices/virtual/powercap(/.*)?  u:object_r:sysfs_powercap:s0
diff --git a/sepolicy/thermal/system_app.te b/sepolicy/thermal/system_app.te
deleted file mode 100644
index 953bdec65..000000000
--- a/sepolicy/thermal/system_app.te
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# system_app.te
-#
-
-# XXX Not sure which app this is for, so common for now
-allow system_app sysfs_thermal_file:file rw_file_perms;
-allow system_app thermal_device:chr_file rw_file_perms;
-allow system_app sysfs_thermal_management:{ file lnk_file } rw_file_perms;
-allow system_app sysfs_thermal_management:dir {read open search };
-allow system_app sysfs_devices_system_cpu:file rw_file_perms;
-allow system_app kernel:capability net_admin;
-
-allow system_app sysfs_powercap:{ file lnk_file } rw_file_perms;
-allow system_app sysfs_powercap:dir r_dir_perms;
diff --git a/sepolicy/thermal/ueventd.te b/sepolicy/thermal/ueventd.te
deleted file mode 100644
index 8074fec75..000000000
--- a/sepolicy/thermal/ueventd.te
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# ueventd
-#
-
-allow ueventd sysfs_thermal_management:file rw_file_perms;
-allow ueventd sysfs_powercap:file w_file_perms;
diff --git a/sepolicy/thermal_gov.te b/sepolicy/thermal_gov.te
deleted file mode 100644
index ffaef8151..000000000
--- a/sepolicy/thermal_gov.te
+++ /dev/null
@@ -1,13 +0,0 @@
-# permissions for /system/bin/tune-thermal-gov.sh
-type thermal_gov, domain, domain_deprecated;
-type thermal_gov_exec, exec_type, file_type;
-
-init_daemon_domain(thermal_gov)
-
-allow thermal_gov shell_exec:file rx_file_perms;
-
-# write to files in /sys/class/thermal/thermal_zone
-allow thermal_gov sysfs:file w_file_perms;
-
-# execute toolbox/toybox
-allow thermal_gov toolbox_exec:file rx_file_perms;
diff --git a/sepolicy/ueventd.te b/sepolicy/ueventd.te
deleted file mode 100644
index 51de650e1..000000000
--- a/sepolicy/ueventd.te
+++ /dev/null
@@ -1,18 +0,0 @@
-allow ueventd tmpfs:file open;
-allow ueventd ueventd:capability sys_module;
-allow ueventd device:chr_file { relabelfrom relabelto};
-allow ueventd gpu_device:chr_file { relabelfrom relabelto};
-allow ueventd graphics_device:chr_file { relabelfrom relabelto};
-allow ueventd audio_device:chr_file { relabelfrom relabelto};
-allow ueventd input_device:chr_file { relabelfrom relabelto};
-allow ueventd video_device:chr_file { relabelfrom relabelto};
-allow ueventd usb_device:chr_file { relabelfrom relabelto};
-allow ueventd kernel:system module_request;
-allow ueventd sysfs_thermal_uevent:file w_file_perms;
-allow ueventd sysfs_bluetooth:file w_file_perms;
-allow ueventd sysfs_socinfo:file w_file_perms;
-allow ueventd system_file:system { module_load };
-allow ueventd hidraw_device:chr_file { relabelfrom relabelto };
-allow ueventd kernel:key search;
-allow ueventd sysfs_app_readable:file rw_file_perms;
-allow ueventd kmsg_device:chr_file rw_file_perms;
diff --git a/sepolicy/uncrypt.te b/sepolicy/uncrypt.te
deleted file mode 100644
index 0326c72c3..000000000
--- a/sepolicy/uncrypt.te
+++ /dev/null
@@ -1 +0,0 @@
-allow uncrypt tmpfs:file { open };
diff --git a/sepolicy/untrusted_app.te b/sepolicy/untrusted_app.te
deleted file mode 100644
index 5b02ca70c..000000000
--- a/sepolicy/untrusted_app.te
+++ /dev/null
@@ -1,2 +0,0 @@
-allow untrusted_app debugfs_tracing:file { write open };
-allow untrusted_app surfaceflinger_tmpfs:file { read write };
diff --git a/sepolicy/vold.te b/sepolicy/vold.te
deleted file mode 100644
index abf227130..000000000
--- a/sepolicy/vold.te
+++ /dev/null
@@ -1,3 +0,0 @@
-allow vold tmpfs:file open;
-allow vold config_file:dir r_dir_perms;
-allow vold kernel:system module_request;
diff --git a/sepolicy/wpa.te b/sepolicy/wpa.te
deleted file mode 100644
index aa42cd783..000000000
--- a/sepolicy/wpa.te
+++ /dev/null
@@ -1,5 +0,0 @@
-allow wpa efs_file:dir r_dir_perms;
-allow wpa efs_file:file rw_file_perms;
-allow wpa log_device:chr_file { write open };
-allow wpa system_data_file:dir { write remove_name add_name setattr };
-allow wpa system_data_file:sock_file { write create unlink setattr };
diff --git a/sepolicy/zygote.te b/sepolicy/zygote.te
deleted file mode 100644
index dde68b58d..000000000
--- a/sepolicy/zygote.te
+++ /dev/null
@@ -1,7 +0,0 @@
-allow zygote debugfs_tracing:file { read open write };
-allow zygote zygote:capability sys_nice;
-allow zygote tmpfs:dir mounton;
-allow zygote tmpfs:file open;
-allow zygote host1x_device:chr_file rw_file_perms;
-allow zygote product_locale_prop:file { read open getattr };
-allow zygote debugfs_tracing:file rw_file_perms;

From 2cb52387159d0c02f21591c25b373351afb7388c Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Fri, 28 Jul 2017 10:16:37 +0530
Subject: [PATCH 140/427] set vulkan false

Jira : None
Test : Device boots to home screen

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/device.mk   | 11 -----------
 androidia_64/mixins.spec |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index a1d613008..b7df11997 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -189,19 +189,8 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PROPERTY_OVERRIDES += \
    ro.opengles.version=196610
 
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:system/etc/permissions/android.hardware.vulkan.level.xml
-
-
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.vulkan.version-1_0_3.xml:system/etc/permissions/android.hardware.vulkan.version.xml
 
-PRODUCT_PACKAGES += \
-    vulkan.android_ia \
-    libvulkan_intel
 
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.hardware.vulkan=android_ia
 
 # Graphics HAL
 PRODUCT_PACKAGES += \
diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index bdbda9745..d2afefacf 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -8,7 +8,7 @@ product.mk: device.mk
 2ndstage: oemvars
 android_ia: default
 sepolicy: enforcing
-graphics: android_ia(gen9+=true,hwc2=true,vulkan=true,drmhwc=false,minigbm=true,gralloc1=true)
+graphics: android_ia(gen9+=true,hwc2=true,vulkan=false,drmhwc=false,minigbm=true,gralloc1=true)
 media: android_ia(mediasdk=false,media_sdk_source=false)
 device-type: tablet
 ethernet: dhcp

From 57e05deb30a02c3eb64d9d84120ab2a681a06982 Mon Sep 17 00:00:00 2001
From: Atul Vaish <atul.vaish@intel.com>
Date: Tue, 1 Aug 2017 21:20:05 +0530
Subject: [PATCH 141/427] Hwbinder change for IWIFI to Isupplicant

Jira : None
Test : Wifi works fine

Signed-off-by: Atul Vaish <atul.vaish@intel.com>
---
 manifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 06a143dc7..299863b02 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -90,11 +90,11 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.wifi</name>
+        <name>android.hardware.wifi.supplicant</name>
         <transport>hwbinder</transport>
         <version>1.0</version>
         <interface>
-            <name>IWifi</name>
+            <name>ISupplicant</name>
             <instance>default</instance>
         </interface>
     </hal>

From 9c901fabfaf63bbd871552dd25bf433b34601c81 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Tue, 22 Aug 2017 19:17:49 +0530
Subject: [PATCH 142/427] Mixin-up for Wifi

Jira : None
Test : Wifi works fine
---
 androidia_64/AndroidBoard.mk |  5 ++++
 androidia_64/BoardConfig.mk  | 56 ++++++++++++++++++++++++++++++++++--
 androidia_64/device.mk       | 35 ++++++++++++++++------
 androidia_64/init.rc         | 29 ++++++++++++-------
 androidia_64/ueventd.rc      |  5 ++++
 5 files changed, 110 insertions(+), 20 deletions(-)

diff --git a/androidia_64/AndroidBoard.mk b/androidia_64/AndroidBoard.mk
index c8da4d748..a1b9c1ea3 100644
--- a/androidia_64/AndroidBoard.mk
+++ b/androidia_64/AndroidBoard.mk
@@ -245,6 +245,11 @@ endif
 # Target specific audio configuration files
 include device/intel/android_ia/common/audio/AndroidBoard.mk
 ##############################################################
+# Source: device/intel/mixins/groups/wlan/iwlwifi/AndroidBoard.mk
+##############################################################
+#LOCAL_KERNEL_PATH := $(abspath $(PRODUCT_OUT)/obj/kernel) is not defined yet
+#$(abspath $(PRODUCT_OUT)/obj/kernel)/copy_modules: iwlwifi
+##############################################################
 # Source: device/intel/mixins/groups/config-partition/enabled/AndroidBoard.mk
 ##############################################################
 INSTALLED_CONFIGIMAGE_TARGET := $(PRODUCT_OUT)/config.img
diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 841e6aee7..a92f8a995 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -250,8 +250,60 @@ USE_CONFIGURABLE_AUDIO_POLICY ?= 1
 ##############################################################
 # Source: device/intel/mixins/groups/wlan/iwlwifi/BoardConfig.mk
 ##############################################################
-# wifi support
-WPA_SUPPLICANT_VERSION := VER_0_8_X
+# This enables the wpa wireless driver
+BOARD_HOSTAPD_DRIVER := NL80211
+BOARD_WPA_SUPPLICANT_DRIVER := NL80211
+WPA_SUPPLICANT_VERSION := VER_2_1_DEVEL
+# required for wifi HAL support
+BOARD_WLAN_DEVICE := iwlwifi
+
+# Enabling iwlwifi
+BOARD_USING_INTEL_IWL := true
+INTEL_IWL_MODULE_SUB_FOLDER := rel
+INTEL_IWL_PNVM_HW := DEFAULT
+INTEL_IWL_USE_COMPAT_INSTALL := y
+INTEL_IWL_COMPAT_INSTALL_DIR := updates
+INTEL_IWL_COMPAT_INSTALL_PATH ?= .
+INTEL_IWL_INSTALL_MOD_STRIP := INSTALL_MOD_STRIP=1
+CROSS_COMPILE ?= CROSS_COMPILE=$(YOCTO_CROSSCOMPILE)
+INSTALLED_KERNEL_TARGET ?= $(PREVIOUS_KERNEL_MODULE)
+KERNEL_OUT_DIR ?= $(PRODUCT_OUT)/obj/kernel
+
+COMBO_CHIP_VENDOR := intel
+COMBO_CHIP := lnp
+
+# SoftAp FW reload definitions.
+# we don't really need this, it's to avoid error when the framework
+# will trigger the fwReloadSoftap function, what will lead to an error
+# enabling the SoftAp.
+# so we set up this for letting the function execute gracefully.
+WIFI_DRIVER_FW_PATH_STA := "/system/vendor/firmware/iwlwifi-softap-dummy.ucode"
+WIFI_DRIVER_FW_PATH_AP  := "/system/vendor/firmware/iwlwifi-softap-dummy.ucode"
+WIFI_DRIVER_FW_PATH_P2P := "/system/vendor/firmware/iwlwifi-softap-dummy.ucode"
+WIFI_DRIVER_FW_PATH_PARAM := "/dev/null"
+
+# config_wifi_background_scan_support=true:
+DEVICE_PACKAGE_OVERLAYS += device/intel/common/wlan/overlay-pno
+
+DEVICE_PACKAGE_OVERLAYS += device/intel/common/wlan/overlay-tcp-buffers
+
+# Add SIM , AKA and AKA' methods in EAP entries of WiFi UI
+DEVICE_PACKAGE_OVERLAYS += device/intel/common/wlan/overlay-eap-methods
+
+ifneq (lhp,$(INTEL_IWL_MODULE_SUB_FOLDER))
+    DEVICE_PACKAGE_OVERLAYS += device/intel/common/wlan/overlay-dual-band
+endif
+
+# WiDi / Miracast Optimisations
+DEVICE_PACKAGE_OVERLAYS += device/intel/common/wlan/overlay-miracast-go
+DEVICE_PACKAGE_OVERLAYS += device/intel/common/wlan/overlay-p2p-connected-stop-scan
+DEVICE_PACKAGE_OVERLAYS += device/intel/common/wlan/overlay-miracast-force-single-ch
+
+#BOARD_SEPOLICY_DIRS += #device/intel/sepolicy/wlan/load_iwlwifi
+
+
+BOARD_SEPOLICY_M4DEFS += module_iwlwifi=true
+BOARD_SEPOLICY_DIRS += device/intel/sepolicy/wlan/iwlwifi
 ##############################################################
 # Source: device/intel/mixins/groups/cpu-arch/skl/BoardConfig.mk
 ##############################################################
diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index b7df11997..77f063fd6 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -343,22 +343,41 @@ PRODUCT_PACKAGES += \
 # Source: device/intel/mixins/groups/wlan/iwlwifi/product.mk
 ##############################################################
 PRODUCT_PACKAGES += \
-    libwpa_client \
+    hostapd \
+    hostapd_cli \
+	wificond \
+    wifilogd \
+    wpa_supplicant \
     wpa_cli \
-    wpa_supplicant
+    iw
+   
+	
 
+# FW and PNVM
+PRODUCT_PACKAGES += \
+    iwl-fw          \
+    iwl-nvm
+
+# iwlwifi USC
+PRODUCT_PACKAGES += \
+    wifi_intel_usc
+
+#copy iwlwifi wpa config files
 PRODUCT_COPY_FILES += \
-  device/intel/common/wlan/wpa_supplicant-common.conf:system/etc/wifi/wpa_supplicant.conf \
-  device/intel/common/wlan/iwlwifi/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \
-  frameworks/native/data/etc/android.software.app_widgets.xml:system/etc/permissions/android.software.app_widgets.xml \
-  frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
-  frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml
+        device/intel/common/wlan/wpa_supplicant-common.conf:system/etc/wifi/wpa_supplicant.conf \
+        device/intel/common/wlan/iwlwifi/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \
+        frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
+        frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml
+
+
 
 # Wifi configuration
 BOARD_WPA_SUPPLICANT_DRIVER := NL80211
 BOARD_WLAN_DEVICE := iwlwifi
 
-# Wifi HAL.
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+    ro.wifi.softap_dualband_allow=false
+
 PRODUCT_PACKAGES += \
   android.hardware.wifi@1.0-service
 ##############################################################
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 41d825b2b..87195d43e 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -427,24 +427,32 @@ on init
 ##############################################################
 # Source: device/intel/mixins/groups/wlan/iwlwifi/init.rc
 ##############################################################
-on boot
-    setprop wifi.interface wlan0
+on post-fs-data
+    chmod 0660 /data/misc/wifi/p2p_supplicant.conf
+	setprop wifi.interface wlan0
+	setprop wifi.direct.interface p2p0
+    # create config WiFi NVM folder
+    mkdir /oem_config/wlan 0770 wifi system
+
 
-service dhcpcd_wlan0 /system/bin/dhcpcd -dABKL
-    group dhcp
+service wpa_supplicant /vendor/bin/hw/wpa_supplicant -Dnl80211 -iwlan0 -g@android:wpa_wlan0 -c/data/misc/wifi/wpa_supplicant.conf -dt \
+    -e /data/misc/wifi/entropy.bin
+    class main
+    socket wpa_wlan0 dgram 660 wifi wifi
     disabled
     oneshot
 
-service wpa_supplicant /system/bin/wpa_supplicant \
-        -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
-        -I/system/etc/wifi/wpa_supplicant_overlay.conf \
-        -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
+service dhcpcd_wlan0 /system/bin/dhcpcd -ABDKL
     class main
-    socket wpa_wlan0 dgram 660 wifi wifi
     disabled
     oneshot
 
-service p2p_supplicant /system/bin/wpa_supplicant \
+service iprenew_wlan0 /system/bin/dhcpcd -n
+    class main
+    disabled
+    oneshot
+
+service p2p_supplicant /vendor/bin/hw/wpa_supplicant \
    -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
    -I/system/etc/wifi/wpa_supplicant_overlay.conf \
    -m/data/misc/wifi/p2p_supplicant.conf \
@@ -464,6 +472,7 @@ service iprenew_p2p /system/bin/dhcpcd -n
     disabled
     oneshot
 
+
 ##############################################################
 # Source: device/intel/mixins/groups/cpuset/4cores/init.rc
 ##############################################################
diff --git a/androidia_64/ueventd.rc b/androidia_64/ueventd.rc
index 2aafd8e33..e9287b86f 100644
--- a/androidia_64/ueventd.rc
+++ b/androidia_64/ueventd.rc
@@ -63,6 +63,11 @@
 ##############################################################
 /dev/block/pci/pci0000:00/0000:00:1c.0/by-name/android_persistent   0660 system system
 ##############################################################
+# Source: device/intel/mixins/groups/wlan/iwlwifi/ueventd.rc
+##############################################################
+# WLAN GPT factory partition block device
+/dev/block/*/*/*/by-name/wlan_nvm 0660 wifi system
+##############################################################
 # Source: device/intel/mixins/groups/rfkill/true/ueventd.rc
 ##############################################################
 # rfkill node

From 694879113ff4722ffae8d8b4057642bf932c746a Mon Sep 17 00:00:00 2001
From: "M, Kumar K" <kumar.k.m@intel.com>
Date: Tue, 3 Oct 2017 13:58:46 +0530
Subject: [PATCH 143/427] Disable IOC SLCAN for HPN

This patch disables IOC SLCAN which is not required for
Tablet device type.

Jira : None
Test : Wifi/BT works fine

Signed-off-by: M, Kumar K <kumar.k.m@intel.com>
---
 androidia_64/mixins.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index d2afefacf..2b0f39a0d 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -39,3 +39,5 @@ debug-phonedoctor: true
 debug-tools: true
 flashfiles: ini(oemvars=false,version=3.0,fastboot_min_battery_level=3500,installer=true)
 midi: true
+slcan: default
+ioc-slcan-reboot: false

From 9fbb7cc16d3cb2ed54b1d4bf7833eb2ddd4e10a9 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 12 Oct 2017 09:46:17 +0530
Subject: [PATCH 144/427] [AIA-O] Revert Hardware Disk Encryption to reduce
 boot time

Jira : None
Test : Device takes less time to boot.

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/fstab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/androidia_64/fstab b/androidia_64/fstab
index 7a2830242..072e9888b 100644
--- a/androidia_64/fstab
+++ b/androidia_64/fstab
@@ -19,7 +19,7 @@
 
 /dev/block/mmcblk1p7	/system         ext4    ro															wait
 /dev/block/mmcblk1p8	/cache          ext4    noatime,nosuid,nodev,errors=panic                           wait,check
-/dev/block/mmcblk1p13	/data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,forceencrypt=/dev/block/mmcblk1p6
+/dev/block/mmcblk1p13	/data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable
 /dev/block/mmcblk1p3	/boot           emmc    defaults                                                    defaults
 /dev/block/mmcblk1p4	/recovery       emmc    defaults                                                    defaults
 /dev/block/mmcblk1p5	/misc           emmc    defaults                                                    defaults

From b066a56b1d21f9d0ce5c1879992ab876f4d2b8c9 Mon Sep 17 00:00:00 2001
From: Munish Bhardwaj <munishx.bhardwaj@intel.com>
Date: Tue, 10 Oct 2017 17:29:52 +0530
Subject: [PATCH 145/427] Exports used by HWC-VAL code.

Patch exports environment variables required for
HWC Validation.

JIRA:None
Tests:compilation and execution of hwcomposer/hwc-val works fine.

Signed-off-by:Munish Bhardwaj<munishx.bhardwaj@intel.com>
---
 androidia_64/hwc-valsetup.sh | 10 ++++++++++
 androidia_64/vendorsetup.sh  |  3 +++
 2 files changed, 13 insertions(+)
 create mode 100644 androidia_64/hwc-valsetup.sh

diff --git a/androidia_64/hwc-valsetup.sh b/androidia_64/hwc-valsetup.sh
new file mode 100644
index 000000000..b606219a4
--- /dev/null
+++ b/androidia_64/hwc-valsetup.sh
@@ -0,0 +1,10 @@
+LOCAL_PATH="$(gettop)"
+HWCOMPOSER_PATH="$(find vendor -name hwcomposer)"
+export HWCVAL_ROOT=$LOCAL_PATH/$HWCOMPOSER_PATH/tests/hwc-val/tests/hwc
+export VAL_HWC_TOP="`( cd "$HWCVAL_ROOT/../.." && pwd)`"
+export PATH=$HWCVAL_ROOT/host_scripts:$HWCVAL_ROOT/tools:$PATH
+export CLIENT_LOGS=$HOME/client_logs
+
+# Target directories
+export HWCVAL_TARGET_DIR=/data/validation/hwc
+export HWCVAL_TARGET_SCRIPT_DIR=/data/validation/hwc
diff --git a/androidia_64/vendorsetup.sh b/androidia_64/vendorsetup.sh
index caf362296..c3feff4f9 100644
--- a/androidia_64/vendorsetup.sh
+++ b/androidia_64/vendorsetup.sh
@@ -1,3 +1,6 @@
 add_lunch_combo androidia_64-eng
 add_lunch_combo androidia_64-userdebug
 add_lunch_combo androidia_64-user
+
+
+. $('gettop')/device/intel/android_ia/androidia_64/hwc-valsetup.sh

From 22e1fb2935d27c85b4376f2ec376b1b3f5112b86 Mon Sep 17 00:00:00 2001
From: Harish Krupo <harish.krupo.kps@intel.com>
Date: Mon, 13 Nov 2017 13:24:06 +0530
Subject: [PATCH 146/427] sepolicy: add sepolicy rules for set_storage

Signed-off-by: Harish Krupo <harish.krupo.kps@intel.com>
---
 sepolicy/set_storage/init.te        |  5 +++++
 sepolicy/set_storage/set_storage.te | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 sepolicy/set_storage/init.te
 create mode 100644 sepolicy/set_storage/set_storage.te

diff --git a/sepolicy/set_storage/init.te b/sepolicy/set_storage/init.te
new file mode 100644
index 000000000..8ba454da9
--- /dev/null
+++ b/sepolicy/set_storage/init.te
@@ -0,0 +1,5 @@
+#
+# init
+#
+
+domain_trans(init, rootfs, set_storage)
diff --git a/sepolicy/set_storage/set_storage.te b/sepolicy/set_storage/set_storage.te
new file mode 100644
index 000000000..4d431956f
--- /dev/null
+++ b/sepolicy/set_storage/set_storage.te
@@ -0,0 +1,18 @@
+#
+# set_storage - set symlink on /dev/block/by-name
+#
+
+type set_storage, domain;
+
+allow set_storage self:capability { fsetid };
+
+allow set_storage block_device:dir rw_dir_perms;
+allow set_storage block_device:lnk_file create;
+allow set_storage rootfs:file rx_file_perms;
+
+# XXX setattr here can likely be dropped as it does so on the
+# frp block device
+allow set_storage block_device:blk_file { getattr setattr };
+
+# chmod to system partition owner, see set_storage.c
+# allow set_storage frp_block_device:blk_file setattr;

From a3e0bc32946912951263e95cb42321fdfb3415c9 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 23 Nov 2017 23:35:17 +0530
Subject: [PATCH 147/427] [AIA] Mixin-Up for set_storage

Jira : None
Test : Device boots to homescreen

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/device.mk |  2 +-
 androidia_64/fstab     | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 77f063fd6..391956d1a 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -426,7 +426,7 @@ PRODUCT_COPY_FILES += $(LOCAL_PATH)/dptf.dv:/system/etc/dptf/dv/dptf.dv
 ##############################################################
 # Source: device/intel/mixins/groups/vendor-partition/true/product.mk
 ##############################################################
-PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/mmcblk1p10
+PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/by-name/android_vendor
 ##############################################################
 # Source: device/intel/mixins/groups/debug-logs/true/product.mk
 ##############################################################
diff --git a/androidia_64/fstab b/androidia_64/fstab
index 072e9888b..e0644b6e7 100644
--- a/androidia_64/fstab
+++ b/androidia_64/fstab
@@ -17,29 +17,29 @@
 /devices/*/*sdmmc*/*		auto	auto	defaults		voldmanaged=sdcard1:auto,encryptable=userdata
 /devices/*/80860F14:01/mmc_*	auto	auto	defaults		voldmanaged=sdcard1:auto,encryptable=userdata
 
-/dev/block/mmcblk1p7	/system         ext4    ro															wait
-/dev/block/mmcblk1p8	/cache          ext4    noatime,nosuid,nodev,errors=panic                           wait,check
-/dev/block/mmcblk1p13	/data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable
-/dev/block/mmcblk1p3	/boot           emmc    defaults                                                    defaults
-/dev/block/mmcblk1p4	/recovery       emmc    defaults                                                    defaults
-/dev/block/mmcblk1p5	/misc           emmc    defaults                                                    defaults
-/dev/block/mmcblk1p1	/bootloader     emmc    defaults                                                    recoveryonly
-/dev/block/mmcblk1p2	/bootloader2    emmc    defaults                                                    recoveryonly
-/dev/block/mmcblk1p9	/persistent     emmc    defaults                                                    defaults
-/dev/block/mmcblk1p6	/metadata       emmc    defaults                                                    defaults
+/dev/block/by-name/android_system   	/system         ext4    ro															wait
+/dev/block/by-name/android_cache		/cache          ext4    noatime,nosuid,nodev,errors=panic                           wait,check
+/dev/block/by-name/android_data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable
+/dev/block/by-name/android_boot         /boot           emmc    defaults                                                    defaults
+/dev/block/by-name/android_recovery     /recovery       emmc    defaults                                                    defaults
+/dev/block/by-name/android_misc         /misc           emmc    defaults                                                    defaults
+/dev/block/by-name/android_bootloader   /bootloader     emmc    defaults                                                    recoveryonly
+/dev/block/by-name/android_bootloader2  /bootloader2    emmc    defaults                                                    recoveryonly
+/dev/block/by-name/android_persistent   /persistent     emmc    defaults                                                    defaults
+/dev/block/by-name/android_metadata     /metadata       emmc    defaults                                                    defaults
 ##############################################################
 # Source: device/intel/mixins/groups/config-partition/enabled/fstab
 ##############################################################
-/dev/block/mmcblk1p11	/oem_config         ext4    noatime,nosuid,nodev,errors=panic          wait,check
+/dev/block/by-name/android_config	/oem_config         ext4    noatime,nosuid,nodev,errors=panic          wait,check
 ##############################################################
 # Source: device/intel/mixins/groups/vendor-partition/true/fstab
 ##############################################################
 # Following line is required if you use a vendor image.
 # If the vendor image is not used,
 # following line should be commented with the related ones in BoardConfig.mk
-/dev/block/mmcblk1p10	/vendor         ext4    ro                                         wait
+/dev/block/by-name/android_vendor	/vendor         ext4    ro                                         wait
 ##############################################################
 # Source: device/intel/mixins/groups/factory-partition/true/fstab
 ##############################################################
-/dev/block/mmcblk1p12      /factory        ext4    rw                                         wait
+/dev/block/by-name/android_factory      /factory        ext4    rw                                         wait
 # ------------------ END MIX-IN DEFINITIONS ------------------

From d33da22281a3d851460c7fafeeab3ec2716c98c4 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Tue, 28 Nov 2017 20:45:33 +0530
Subject: [PATCH 148/427] [AIA] Add below configs for kernel v4.14 LTS
 compilation

CONFIG_CRC8=y
CONFIG_NETFILTER_XT_MATCH_OWNER=y

Jira : None
Test : Device boots to home screen
---
 kernel_config/kernel_64_defconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index b2425f92b..0d8c0a23c 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -7092,3 +7092,6 @@ CONFIG_USB_CONFIGFS_F_MIDI=y
 CONFIG_USB_OTG_WAKELOCK=y
 CONFIG_USB_CONFIGFS_RNDIS=y
 CONFIG_BXT_WC_PMIC_OPREGION=y
+
+CONFIG_CRC8=y
+CONFIG_NETFILTER_XT_MATCH_OWNER=y

From 888b200c640758f38b3751af44be99cfe0e20457 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Tue, 28 Nov 2017 21:03:56 +0530
Subject: [PATCH 149/427] [AIA] Mixin up changes

Jira : None
Test : None
---
 androidia_64/AndroidBoard.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/androidia_64/AndroidBoard.mk b/androidia_64/AndroidBoard.mk
index a1b9c1ea3..d2f17e449 100644
--- a/androidia_64/AndroidBoard.mk
+++ b/androidia_64/AndroidBoard.mk
@@ -49,6 +49,9 @@ $(PRODUCT_OUT)/kernel: $(KERNEL_CONFIG) | $(ACP)
 	$(build_kernel) $(KERNEL_NAME) modules
 	$(hide) $(ACP) -fp $(KERNEL_BIN) $@
 
+EXTMOD_SRC := ../../../../../..
+TARGET_EXTRA_KERNEL_MODULES :=
+
 ALL_EXTRA_MODULES := $(patsubst %,$(TARGET_OUT_INTERMEDIATES)/kmodule/%,$(TARGET_EXTRA_KERNEL_MODULES))
 $(ALL_EXTRA_MODULES): $(TARGET_OUT_INTERMEDIATES)/kmodule/%: $(PRODUCT_OUT)/kernel
 	@echo Building additional kernel module $*
@@ -62,7 +65,7 @@ $(KERNEL_MODULES_INSTALL): $(PRODUCT_OUT)/kernel $(ALL_EXTRA_MODULES)
 	$(build_kernel) modules_install
 	$(hide) for kmod in "$(TARGET_EXTRA_KERNEL_MODULES)" ; do \
 		echo Installing additional kernel module $${kmod} ; \
-		$(subst +,,$(subst $(hide),,$(build_kernel))) M=$(abspath $(TARGET_OUT_INTERMEDIATES))/$${kmod}.kmodule modules_install ; \
+		$(subst +,,$(subst $(hide),,$(build_kernel))) M=$(abspath $(TARGET_OUT_INTERMEDIATES))/kernel/$${kmod} modules_install ; \
 	done
 	$(hide) rm -f $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/*/{build,source}
 	$(hide) mv $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/$(KERNELRELEASE)/* $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules

From 6cc61908c2f578a07b47c1b5520390826fadfa0e Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Wed, 29 Nov 2017 14:11:18 +0530
Subject: [PATCH 150/427] [AIA] Mixin Up changes

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/init.rc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 87195d43e..b66fb6d1b 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -213,6 +213,8 @@ on property:sys.usb.config=none && property:sys.usb.configfs=1
     write /sys/power/wake_unlock mylock
 
 on property:sys.usb.config=adb && property:sys.usb.configfs=1
+    write /config/usb_gadget/g1/idVendor 0x8087
+    write /config/usb_gadget/g1/idProduct 0x09ef
     write /sys/power/wake_lock mylock
 
 on property:init.svc.adbd=stopped

From 078d951d4c6b05a4d807822ae9358a27b2fccac0 Mon Sep 17 00:00:00 2001
From: Mingwei Shi <mingwei.shi@intel.com>
Date: Fri, 24 Nov 2017 09:45:52 +0800
Subject: [PATCH 151/427] Disable YAMA security feature to be compatible with
 Android CTS

Jira: None
Test: run cts -m CtsBionicTestCases

Signed-off-by: Mingwei Shi <mingwei.shi@intel.com>
---
 kernel_config/kernel_64_defconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 0d8c0a23c..47d0622d0 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -7041,9 +7041,8 @@ CONFIG_HARDENED_USERCOPY=y
 CONFIG_CC_STACKPROTECTOR=y
 CONFIG_CC_STACKPROTECTOR_STRONG=y
 
-# Provide userspace with ptrace ancestry protections.
 CONFIG_SECURITY=y
-CONFIG_SECURITY_YAMA=y
+# CONFIG_SECURITY_YAMA is not set
 
 # If we build using modules, they must be signed with a per-build key.
 CONFIG_MODULE_SIG=y

From 2db49de79a78441de3b26b8b1d38dfa64db18152 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Fri, 8 Dec 2017 00:06:28 +0530
Subject: [PATCH 152/427] [AIA] Mixin update change.

Jira : None
Test : Device boots to home screen
---
 androidia_64/fstab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/androidia_64/fstab b/androidia_64/fstab
index e0644b6e7..fe6af8f41 100644
--- a/androidia_64/fstab
+++ b/androidia_64/fstab
@@ -41,5 +41,5 @@
 ##############################################################
 # Source: device/intel/mixins/groups/factory-partition/true/fstab
 ##############################################################
-/dev/block/by-name/android_factory      /factory        ext4    rw                                         wait
+/dev/block/by-name/android_factory      /factory        ext4    rw,noatime                                         wait
 # ------------------ END MIX-IN DEFINITIONS ------------------

From 681ba8b4f12818b8f4831e2b001046e5ad9d4d7a Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Tue, 19 Dec 2017 09:51:16 +0530
Subject: [PATCH 153/427] [AIA-O] Mixin-up

Full Disk Encryption

Jira: None
Test: Device boots to homescreen

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/fstab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/androidia_64/fstab b/androidia_64/fstab
index fe6af8f41..e029a9c13 100644
--- a/androidia_64/fstab
+++ b/androidia_64/fstab
@@ -19,7 +19,7 @@
 
 /dev/block/by-name/android_system   	/system         ext4    ro															wait
 /dev/block/by-name/android_cache		/cache          ext4    noatime,nosuid,nodev,errors=panic                           wait,check
-/dev/block/by-name/android_data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable
+/dev/block/by-name/android_data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,forceencrypt=/dev/block/by-name/android_metadata
 /dev/block/by-name/android_boot         /boot           emmc    defaults                                                    defaults
 /dev/block/by-name/android_recovery     /recovery       emmc    defaults                                                    defaults
 /dev/block/by-name/android_misc         /misc           emmc    defaults                                                    defaults

From 238dbe9ec8fee0a41f878367b1f640360d9375bf Mon Sep 17 00:00:00 2001
From: Muhammad Aksar <muhammad.aksar@intel.com>
Date: Fri, 15 Dec 2017 12:27:06 +0530
Subject: [PATCH 154/427] Mixin: Support for USB Camera

Enabled USB Camera mixins group to avoid
permission issue in the vl42 device node

Jira:None
Test:None
Signed-off-by: Muhammad Aksar <muhammad.aksar@intel.com>
---
 androidia_64/mixins.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index 2b0f39a0d..5f75029f6 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -41,3 +41,4 @@ flashfiles: ini(oemvars=false,version=3.0,fastboot_min_battery_level=3500,instal
 midi: true
 slcan: default
 ioc-slcan-reboot: false
+camera: usbcamera

From 9c2d477fc1f1cb6d19d82c16a0f86dd927e56780 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 28 Dec 2017 10:22:59 +0530
Subject: [PATCH 155/427] [AIA-O] Mixin-up

Enable USB Camera

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/ueventd.rc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/androidia_64/ueventd.rc b/androidia_64/ueventd.rc
index e9287b86f..c475c350e 100644
--- a/androidia_64/ueventd.rc
+++ b/androidia_64/ueventd.rc
@@ -77,4 +77,11 @@
 ##############################################################
 # i915 backlight driver
 /sys/devices/pci0000:00/0000:00:02.0/drm/card*/card*/intel_backlight brightness 0644 system system
+##############################################################
+# Source: device/intel/mixins/groups/camera/usbcamera/ueventd.rc
+##############################################################
+# Camera
+/dev/video*       0666  system  camera
+/dev/media*       0660  system  camera
+/dev/v4l-subdev*  0660  system  camera
 # ------------------ END MIX-IN DEFINITIONS ------------------

From 780e4650116d275b9ec7314fa9ca8ec9675c8751 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 28 Dec 2017 11:33:57 +0530
Subject: [PATCH 156/427] [AIA-O] Mixin up

Enable light HAL

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/device.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 391956d1a..05079f587 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -402,7 +402,13 @@ PRODUCT_PACKAGES += \
 ##############################################################
 # Source: device/intel/mixins/groups/lights/true/product.mk
 ##############################################################
-PRODUCT_PACKAGES += lights.android_ia
+# Lights HAL
+BOARD_SEPOLICY_DIRS += \
+    device/intel/android_ia/sepolicy/light
+
+PRODUCT_PACKAGES += lights.android_ia \
+    android.hardware.light@2.0-service \
+    android.hardware.light@2.0-impl
 ##############################################################
 # Source: device/intel/mixins/groups/thermal/dptf/product.mk
 ##############################################################

From ae6497e1ccc99e927eda6d5ec239fa921c274e98 Mon Sep 17 00:00:00 2001
From: karanx <karanx.bhagoji@intel.com>
Date: Tue, 26 Dec 2017 14:35:27 +0530
Subject: [PATCH 157/427] [AIA-O] Patch remove mem and port in /dev

This patch remove the mem and port files in the
/dev folder , since it causing the testDevMemSane
& testDevPortSane test for CtsPermissionTestCases.

JIRA: NONE
Test: run cts -m CtsPermissionTestCases

Signed-off-by: Karan Bhagoji <karanx.bhagoji@intel>
---
 kernel_config/kernel_64_defconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 47d0622d0..a0cb5be0b 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -2794,7 +2794,7 @@ CONFIG_LEGACY_PTY_COUNT=32
 # CONFIG_NOZOMI is not set
 # CONFIG_N_GSM is not set
 # CONFIG_TRACE_SINK is not set
-CONFIG_DEVMEM=y
+# CONFIG_DEVMEM is not set
 # CONFIG_DEVKMEM is not set
 
 #
@@ -2875,7 +2875,7 @@ CONFIG_HPET=y
 CONFIG_HANGCHECK_TIMER=m
 # CONFIG_TCG_TPM is not set
 # CONFIG_TELCLOCK is not set
-CONFIG_DEVPORT=y
+# CONFIG_DEVPORT is not set
 # CONFIG_XILLYBUS is not set
 
 #

From 9a629fdc943a108a357834ba217290ffb6da0d38 Mon Sep 17 00:00:00 2001
From: "ji, zhenlong z" <zhenlong.z.ji@intel.com>
Date: Wed, 6 Dec 2017 16:13:40 +0800
Subject: [PATCH 158/427] SELinux: add sepolicy for KBL NUC

Add the required sepolicies for KBL NUC, this is the first
step of setting SELinux enforcing mode

Jira: None
Test: KBL NUC can boot to UI and adb works.

Signed-off-by: ji, zhenlong z <zhenlong.z.ji@intel.com>
---
 sepolicy/audio/android_ia/audioserver.te      |  1 +
 .../audio/android_ia/hal_audio_default.te     | 25 +++++++++
 sepolicy/bluetooth/common/bluetooth.te        | 21 ++++++++
 sepolicy/bluetooth/common/file.te             |  2 +
 sepolicy/bluetooth/common/file_contexts       |  2 +
 sepolicy/bluetooth/common/system_server.te    |  1 +
 sepolicy/bluetooth/common/ueventd.te          |  2 +
 sepolicy/boot-arch/abl/device.te              |  1 +
 sepolicy/boot-arch/abl/file_contexts          | 15 ++++++
 sepolicy/boot-arch/abl/hal_bootctl_default.te |  6 +++
 sepolicy/boot-arch/abl/init.te                |  3 ++
 sepolicy/boot-arch/abl/update_engine.te       |  3 ++
 .../boot-arch/abl/update_engine_common.te     |  3 ++
 sepolicy/boot-arch/abl/vold.te                |  1 +
 sepolicy/boot-arch/android_ia/file_contexts   | 11 ++++
 sepolicy/boot-arch/android_ia/init.te         |  1 +
 sepolicy/boot-arch/common/attributes          |  2 +
 sepolicy/boot-arch/common/audioserver.te      |  1 +
 sepolicy/boot-arch/common/device.te           |  9 ++++
 sepolicy/boot-arch/common/file.te             | 11 ++++
 sepolicy/boot-arch/common/file_contexts       | 28 ++++++++++
 sepolicy/boot-arch/common/init.te             |  9 ++++
 sepolicy/boot-arch/common/kernel.te           |  8 +++
 sepolicy/boot-arch/common/make_ext4fs.te      |  6 +++
 sepolicy/boot-arch/common/nvm_useragent.te    | 13 +++++
 sepolicy/boot-arch/common/property.te         |  3 ++
 sepolicy/boot-arch/common/property_contexts   |  6 +++
 sepolicy/boot-arch/common/rild.te             |  6 +++
 sepolicy/boot-arch/common/rpcServer.te        | 26 +++++++++
 sepolicy/boot-arch/common/rpcdaemon.te        | 10 ++++
 sepolicy/boot-arch/common/setup_fs_nvm.te     | 29 ++++++++++
 sepolicy/boot-arch/common/system_app.te       |  2 +
 sepolicy/boot-arch/common/te_macros           | 10 ++++
 sepolicy/boot-arch/common/vold.te             |  5 ++
 sepolicy/boot-arch/efi/file_contexts          | 11 ++++
 sepolicy/config-partition/device.te           |  1 +
 sepolicy/config-partition/dumpstate.te        |  2 +
 sepolicy/config-partition/file.te             |  1 +
 sepolicy/config-partition/file_contexts       |  4 ++
 sepolicy/config-partition/fsck.te             |  3 ++
 sepolicy/config-partition/init.te             |  6 +++
 sepolicy/config-partition/nfc.te              |  4 ++
 sepolicy/config-partition/ueventd.te          |  6 +++
 sepolicy/config-partition/vold.te             |  7 +++
 sepolicy/config-partition/wpa.te              |  7 +++
 sepolicy/debug-phonedoctor/crashreport_app.te | 31 +++++++++++
 sepolicy/debug-phonedoctor/file.te            |  2 +
 .../debug-phonedoctor/hal_memtrack_default.te |  4 ++
 sepolicy/debug-phonedoctor/installd.te        |  5 ++
 sepolicy/debug-phonedoctor/platform_app.te    |  3 ++
 sepolicy/debug-phonedoctor/property.te        |  1 +
 sepolicy/debug-phonedoctor/property_contexts  |  1 +
 sepolicy/debug-phonedoctor/seapp_contexts     |  1 +
 sepolicy/debug-phonedoctor/system_app.te      | 11 ++++
 sepolicy/debug-phonedoctor/system_server.te   |  3 ++
 sepolicy/debugfs/dumpstate.te                 |  5 ++
 sepolicy/debugfs/file.te                      |  2 +
 sepolicy/debugfs/file_contexts                |  1 +
 sepolicy/debugfs/genfs_contexts               |  0
 sepolicy/debugfs/platform_app.te              |  5 ++
 sepolicy/factory-partition/drmserver.te       |  6 +++
 sepolicy/factory-partition/dumpstate.te       |  1 +
 sepolicy/factory-partition/file.te            |  1 +
 sepolicy/factory-partition/file_contexts      |  1 +
 sepolicy/factory-partition/init.te            |  6 +++
 sepolicy/factory-partition/vold.te            |  7 +++
 sepolicy/graphics/android_ia/adbd.te          |  6 +++
 sepolicy/graphics/android_ia/appdomain.te     |  6 +++
 sepolicy/graphics/android_ia/bootanim.te      |  3 ++
 sepolicy/graphics/android_ia/file.te          |  1 +
 sepolicy/graphics/android_ia/file_contexts    | 10 ++++
 .../hal_graphics_allocator_default.te         | 18 +++++++
 .../hal_graphics_composer_default.te          | 15 ++++++
 sepolicy/graphics/android_ia/mediacodec.te    |  2 +
 .../graphics/android_ia/mediadrmserver.te     |  1 +
 sepolicy/graphics/android_ia/mediaserver.te   |  2 +
 sepolicy/graphics/android_ia/platform_app.te  | 30 +++++++++++
 .../graphics/android_ia/surfaceflinger.te     | 31 +++++++++++
 sepolicy/graphics/android_ia/system_server.te |  4 ++
 sepolicy/graphics/android_ia/ueventd.te       |  1 +
 sepolicy/kernel/appdomain.te                  |  1 +
 sepolicy/kernel/dumpstate.te                  |  1 +
 sepolicy/kernel/file.te                       |  1 +
 sepolicy/kernel/genfs_contexts                |  2 +
 sepolicy/kernel/hal_power_default.te          |  2 +
 sepolicy/kernel/healthd.te                    |  1 +
 sepolicy/kernel/init.te                       | 17 ++++++
 sepolicy/kernel/installd.te                   |  1 +
 sepolicy/kernel/kernel.te                     | 15 ++++++
 sepolicy/kernel/netd.te                       |  3 ++
 sepolicy/kernel/system_server.te              | 10 ++++
 sepolicy/kernel/ueventd.te                    |  4 ++
 sepolicy/kernel/vold.te                       |  1 +
 sepolicy/kernel/wificond.te                   |  1 +
 sepolicy/kernel/zygote.te                     |  1 +
 sepolicy/rfkill/bluetooth.te                  |  1 +
 sepolicy/rfkill/device.te                     |  1 +
 sepolicy/rfkill/file.te                       |  1 +
 sepolicy/rfkill/file_contexts                 |  9 ++++
 sepolicy/rfkill/rfkill.te                     | 33 ++++++++++++
 sepolicy/set_storage/init.te                  |  4 +-
 sepolicy/te_macros                            | 41 ++++++++++++++
 sepolicy/thermal/device.te                    |  1 +
 sepolicy/thermal/dptf/dptf.te                 | 54 +++++++++++++++++++
 sepolicy/thermal/dptf/file.te                 |  2 +
 sepolicy/thermal/dptf/file_contexts           |  4 ++
 sepolicy/thermal/dptf/system_server.te        |  6 +++
 sepolicy/thermal/dptf/thermal_lite.te         | 17 ++++++
 sepolicy/thermal/file.te                      |  2 +
 sepolicy/thermal/file_contexts                | 12 +++++
 sepolicy/thermal/hal_sensors_sefault.te       |  4 ++
 sepolicy/thermal/hal_thermal_default.te       | 15 ++++++
 sepolicy/thermal/platform_app.te              |  7 +++
 sepolicy/thermal/system_app.te                | 22 ++++++++
 sepolicy/thermal/ueventd.te                   |  6 +++
 sepolicy/thermal/vndservice.te                |  1 +
 sepolicy/thermal/vndservice_contexts          |  1 +
 sepolicy/wlan/iwlwifi/file_contexts           |  1 +
 sepolicy/wlan/iwlwifi/wlan_intel_restore.te   | 27 ++++++++++
 119 files changed, 893 insertions(+), 1 deletion(-)
 create mode 100644 sepolicy/audio/android_ia/audioserver.te
 create mode 100644 sepolicy/audio/android_ia/hal_audio_default.te
 create mode 100644 sepolicy/bluetooth/common/bluetooth.te
 create mode 100644 sepolicy/bluetooth/common/file.te
 create mode 100644 sepolicy/bluetooth/common/file_contexts
 create mode 100644 sepolicy/bluetooth/common/system_server.te
 create mode 100644 sepolicy/bluetooth/common/ueventd.te
 create mode 100644 sepolicy/boot-arch/abl/device.te
 create mode 100644 sepolicy/boot-arch/abl/file_contexts
 create mode 100644 sepolicy/boot-arch/abl/hal_bootctl_default.te
 create mode 100644 sepolicy/boot-arch/abl/init.te
 create mode 100644 sepolicy/boot-arch/abl/update_engine.te
 create mode 100644 sepolicy/boot-arch/abl/update_engine_common.te
 create mode 100644 sepolicy/boot-arch/abl/vold.te
 create mode 100644 sepolicy/boot-arch/android_ia/file_contexts
 create mode 100644 sepolicy/boot-arch/android_ia/init.te
 create mode 100644 sepolicy/boot-arch/common/attributes
 create mode 100644 sepolicy/boot-arch/common/audioserver.te
 create mode 100644 sepolicy/boot-arch/common/device.te
 create mode 100644 sepolicy/boot-arch/common/file.te
 create mode 100644 sepolicy/boot-arch/common/file_contexts
 create mode 100644 sepolicy/boot-arch/common/init.te
 create mode 100644 sepolicy/boot-arch/common/kernel.te
 create mode 100644 sepolicy/boot-arch/common/make_ext4fs.te
 create mode 100644 sepolicy/boot-arch/common/nvm_useragent.te
 create mode 100644 sepolicy/boot-arch/common/property.te
 create mode 100644 sepolicy/boot-arch/common/property_contexts
 create mode 100644 sepolicy/boot-arch/common/rild.te
 create mode 100644 sepolicy/boot-arch/common/rpcServer.te
 create mode 100644 sepolicy/boot-arch/common/rpcdaemon.te
 create mode 100644 sepolicy/boot-arch/common/setup_fs_nvm.te
 create mode 100644 sepolicy/boot-arch/common/system_app.te
 create mode 100644 sepolicy/boot-arch/common/te_macros
 create mode 100644 sepolicy/boot-arch/common/vold.te
 create mode 100644 sepolicy/boot-arch/efi/file_contexts
 create mode 100644 sepolicy/config-partition/device.te
 create mode 100644 sepolicy/config-partition/dumpstate.te
 create mode 100644 sepolicy/config-partition/file.te
 create mode 100644 sepolicy/config-partition/file_contexts
 create mode 100644 sepolicy/config-partition/fsck.te
 create mode 100644 sepolicy/config-partition/init.te
 create mode 100644 sepolicy/config-partition/nfc.te
 create mode 100644 sepolicy/config-partition/ueventd.te
 create mode 100644 sepolicy/config-partition/vold.te
 create mode 100644 sepolicy/config-partition/wpa.te
 create mode 100644 sepolicy/debug-phonedoctor/crashreport_app.te
 create mode 100644 sepolicy/debug-phonedoctor/file.te
 create mode 100644 sepolicy/debug-phonedoctor/hal_memtrack_default.te
 create mode 100644 sepolicy/debug-phonedoctor/installd.te
 create mode 100644 sepolicy/debug-phonedoctor/platform_app.te
 create mode 100644 sepolicy/debug-phonedoctor/property.te
 create mode 100644 sepolicy/debug-phonedoctor/property_contexts
 create mode 100644 sepolicy/debug-phonedoctor/seapp_contexts
 create mode 100644 sepolicy/debug-phonedoctor/system_app.te
 create mode 100644 sepolicy/debug-phonedoctor/system_server.te
 create mode 100644 sepolicy/debugfs/dumpstate.te
 create mode 100644 sepolicy/debugfs/file.te
 create mode 100644 sepolicy/debugfs/file_contexts
 create mode 100644 sepolicy/debugfs/genfs_contexts
 create mode 100644 sepolicy/debugfs/platform_app.te
 create mode 100644 sepolicy/factory-partition/drmserver.te
 create mode 100644 sepolicy/factory-partition/dumpstate.te
 create mode 100644 sepolicy/factory-partition/file.te
 create mode 100644 sepolicy/factory-partition/file_contexts
 create mode 100644 sepolicy/factory-partition/init.te
 create mode 100644 sepolicy/factory-partition/vold.te
 create mode 100644 sepolicy/graphics/android_ia/adbd.te
 create mode 100644 sepolicy/graphics/android_ia/appdomain.te
 create mode 100644 sepolicy/graphics/android_ia/bootanim.te
 create mode 100644 sepolicy/graphics/android_ia/file.te
 create mode 100644 sepolicy/graphics/android_ia/file_contexts
 create mode 100644 sepolicy/graphics/android_ia/hal_graphics_allocator_default.te
 create mode 100644 sepolicy/graphics/android_ia/hal_graphics_composer_default.te
 create mode 100644 sepolicy/graphics/android_ia/mediacodec.te
 create mode 100644 sepolicy/graphics/android_ia/mediadrmserver.te
 create mode 100644 sepolicy/graphics/android_ia/mediaserver.te
 create mode 100644 sepolicy/graphics/android_ia/platform_app.te
 create mode 100644 sepolicy/graphics/android_ia/surfaceflinger.te
 create mode 100644 sepolicy/graphics/android_ia/system_server.te
 create mode 100644 sepolicy/graphics/android_ia/ueventd.te
 create mode 100644 sepolicy/kernel/appdomain.te
 create mode 100644 sepolicy/kernel/dumpstate.te
 create mode 100644 sepolicy/kernel/file.te
 create mode 100644 sepolicy/kernel/genfs_contexts
 create mode 100644 sepolicy/kernel/hal_power_default.te
 create mode 100644 sepolicy/kernel/healthd.te
 create mode 100644 sepolicy/kernel/init.te
 create mode 100644 sepolicy/kernel/installd.te
 create mode 100644 sepolicy/kernel/kernel.te
 create mode 100644 sepolicy/kernel/netd.te
 create mode 100644 sepolicy/kernel/system_server.te
 create mode 100644 sepolicy/kernel/ueventd.te
 create mode 100644 sepolicy/kernel/vold.te
 create mode 100644 sepolicy/kernel/wificond.te
 create mode 100644 sepolicy/kernel/zygote.te
 create mode 100644 sepolicy/rfkill/bluetooth.te
 create mode 100644 sepolicy/rfkill/device.te
 create mode 100644 sepolicy/rfkill/file.te
 create mode 100644 sepolicy/rfkill/file_contexts
 create mode 100644 sepolicy/rfkill/rfkill.te
 create mode 100644 sepolicy/te_macros
 create mode 100644 sepolicy/thermal/device.te
 create mode 100644 sepolicy/thermal/dptf/dptf.te
 create mode 100644 sepolicy/thermal/dptf/file.te
 create mode 100644 sepolicy/thermal/dptf/file_contexts
 create mode 100644 sepolicy/thermal/dptf/system_server.te
 create mode 100644 sepolicy/thermal/dptf/thermal_lite.te
 create mode 100644 sepolicy/thermal/file.te
 create mode 100644 sepolicy/thermal/file_contexts
 create mode 100644 sepolicy/thermal/hal_sensors_sefault.te
 create mode 100644 sepolicy/thermal/hal_thermal_default.te
 create mode 100644 sepolicy/thermal/platform_app.te
 create mode 100644 sepolicy/thermal/system_app.te
 create mode 100644 sepolicy/thermal/ueventd.te
 create mode 100644 sepolicy/thermal/vndservice.te
 create mode 100644 sepolicy/thermal/vndservice_contexts
 create mode 100644 sepolicy/wlan/iwlwifi/file_contexts
 create mode 100644 sepolicy/wlan/iwlwifi/wlan_intel_restore.te

diff --git a/sepolicy/audio/android_ia/audioserver.te b/sepolicy/audio/android_ia/audioserver.te
new file mode 100644
index 000000000..52cb04a2e
--- /dev/null
+++ b/sepolicy/audio/android_ia/audioserver.te
@@ -0,0 +1 @@
+ignore_adb_debug(audioserver)
diff --git a/sepolicy/audio/android_ia/hal_audio_default.te b/sepolicy/audio/android_ia/hal_audio_default.te
new file mode 100644
index 000000000..bfd25f255
--- /dev/null
+++ b/sepolicy/audio/android_ia/hal_audio_default.te
@@ -0,0 +1,25 @@
+ignore_adb_debug(hal_audio_default)
+
+allow hal_audio_default self:capability sys_nice;
+
+allow hal_audio_default audioserver_data_file:dir create_dir_perms;
+allow hal_audio_default audioserver_data_file:fifo_file create_file_perms;
+allow hal_audio_default audioserver_data_file:file create_file_perms;
+
+allow hal_audio_default dumpstate:fd use;
+allow hal_audio_default dumpstate:fifo_file write;
+
+set_prop(hal_audio_default, audiohal_prop)
+
+allow hal_audio_default self:netlink_kobject_uevent_socket { read bind create setopt };
+
+userdebug_or_eng(`
+  # hal_audio_default exposes a remote debugging port
+
+  # used for parameter framework (PFW) tuning and debug
+  dontaudit hal_audio_default fwmarkd_socket:sock_file write;
+  dontaudit hal_audio_default netd:unix_stream_socket connectto;
+  dontaudit hal_audio_default node:tcp_socket node_bind;
+  dontaudit hal_audio_default port:tcp_socket name_bind;
+  dontaudit hal_audio_default self:tcp_socket { accept bind create getopt listen read setopt write };
+')
diff --git a/sepolicy/bluetooth/common/bluetooth.te b/sepolicy/bluetooth/common/bluetooth.te
new file mode 100644
index 000000000..94ad4d2f0
--- /dev/null
+++ b/sepolicy/bluetooth/common/bluetooth.te
@@ -0,0 +1,21 @@
+#
+# Common Bluetooth Permissions
+#
+allow bluetooth self:socket create_socket_perms;
+allowxperm bluetooth self:socket ioctl unpriv_sock_ioctls;
+
+allow bluetooth kernel:system module_request;
+allow bluetooth rfkill_device:chr_file rw_file_perms;
+allow bluetooth sysfs_bluetooth_writable:file rw_file_perms;
+
+module_only(`config_partition', `
+    allow bluetooth config_file:dir search;
+')
+
+allow bluetooth bluetooth_efs_file:dir rw_dir_perms;
+allow bluetooth bluetooth_efs_file:file create_file_perms;
+
+allow bluetooth bluetooth_config_file:dir r_dir_perms;
+allow bluetooth bluetooth_config_file:file r_file_perms;
+
+allow bluetooth self:bluetooth_socket create_socket_perms_no_ioctl;
diff --git a/sepolicy/bluetooth/common/file.te b/sepolicy/bluetooth/common/file.te
new file mode 100644
index 000000000..9c9139383
--- /dev/null
+++ b/sepolicy/bluetooth/common/file.te
@@ -0,0 +1,2 @@
+# NVM data in etc/bluetooth
+type bluetooth_config_file, file_type, data_file_type;
diff --git a/sepolicy/bluetooth/common/file_contexts b/sepolicy/bluetooth/common/file_contexts
new file mode 100644
index 000000000..ecc7faa71
--- /dev/null
+++ b/sepolicy/bluetooth/common/file_contexts
@@ -0,0 +1,2 @@
+/system/etc/bluetooth(/.*)?           u:object_r:bluetooth_config_file:s0
+/oem_config/bluetooth                  u:object_r:bluetooth_data_file:s0
diff --git a/sepolicy/bluetooth/common/system_server.te b/sepolicy/bluetooth/common/system_server.te
new file mode 100644
index 000000000..d8cc4672d
--- /dev/null
+++ b/sepolicy/bluetooth/common/system_server.te
@@ -0,0 +1 @@
+add_service(system_server, bluetooth_service)
diff --git a/sepolicy/bluetooth/common/ueventd.te b/sepolicy/bluetooth/common/ueventd.te
new file mode 100644
index 000000000..e610c2d05
--- /dev/null
+++ b/sepolicy/bluetooth/common/ueventd.te
@@ -0,0 +1,2 @@
+allow ueventd bluetooth_efs_file:dir search;
+allow ueventd bluetooth_efs_file:file { read getattr open };
diff --git a/sepolicy/boot-arch/abl/device.te b/sepolicy/boot-arch/abl/device.te
new file mode 100644
index 000000000..b31ee1953
--- /dev/null
+++ b/sepolicy/boot-arch/abl/device.te
@@ -0,0 +1 @@
+type vendor_block_device, dev_type;
diff --git a/sepolicy/boot-arch/abl/file_contexts b/sepolicy/boot-arch/abl/file_contexts
new file mode 100644
index 000000000..03f4101f3
--- /dev/null
+++ b/sepolicy/boot-arch/abl/file_contexts
@@ -0,0 +1,15 @@
+#
+# Block Devices
+#
+/dev/block/(pci|platform)(/.*)?/.*/by-name/boot(_(a|b))?	u:object_r:boot_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/system(_(a|b))?	u:object_r:system_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/vendor(_(a|b))?	u:object_r:vendor_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/vbmeta(_(a|b))?	u:object_r:boot_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/tos(_(a|b))?		u:object_r:boot_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/persistent		u:object_r:frp_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/recovery		u:object_r:recovery_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/metadata		u:object_r:metadata_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/cache		u:object_r:cache_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/data			u:object_r:userdata_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/misc			u:object_r:misc_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/teedata		u:object_r:tee_device:s0
diff --git a/sepolicy/boot-arch/abl/hal_bootctl_default.te b/sepolicy/boot-arch/abl/hal_bootctl_default.te
new file mode 100644
index 000000000..2f1f82bc0
--- /dev/null
+++ b/sepolicy/boot-arch/abl/hal_bootctl_default.te
@@ -0,0 +1,6 @@
+allow hal_bootctl_default rootfs:file r_file_perms;
+allow hal_bootctl_default proc:file r_file_perms;
+allow hal_bootctl_default block_device:dir r_dir_perms;
+allow hal_bootctl_default misc_block_device:blk_file rw_file_perms;
+allow hal_bootctl_default tmpfs:file r_file_perms;
+allow hal_bootctl_default tmpfs:dir r_dir_perms;
diff --git a/sepolicy/boot-arch/abl/init.te b/sepolicy/boot-arch/abl/init.te
new file mode 100644
index 000000000..b86e52916
--- /dev/null
+++ b/sepolicy/boot-arch/abl/init.te
@@ -0,0 +1,3 @@
+allow init system_file:system module_load;
+allow init tmpfs:file r_file_perms;
+allow init { boot_block_device vendor_block_device }:lnk_file relabelto;
diff --git a/sepolicy/boot-arch/abl/update_engine.te b/sepolicy/boot-arch/abl/update_engine.te
new file mode 100644
index 000000000..c65dc121e
--- /dev/null
+++ b/sepolicy/boot-arch/abl/update_engine.te
@@ -0,0 +1,3 @@
+allow update_engine vendor_block_device:blk_file rw_file_perms;
+allow update_engine tmpfs:file r_file_perms;
+allow update_engine tmpfs:lnk_file r_file_perms;
diff --git a/sepolicy/boot-arch/abl/update_engine_common.te b/sepolicy/boot-arch/abl/update_engine_common.te
new file mode 100644
index 000000000..eb5f3aab2
--- /dev/null
+++ b/sepolicy/boot-arch/abl/update_engine_common.te
@@ -0,0 +1,3 @@
+allow update_engine_common vendor_block_device:blk_file rw_file_perms;
+allow update_engine_common tmpfs:file r_file_perms;
+allow update_engine_common tmpfs:lnk_file r_file_perms;
diff --git a/sepolicy/boot-arch/abl/vold.te b/sepolicy/boot-arch/abl/vold.te
new file mode 100644
index 000000000..a7cd94845
--- /dev/null
+++ b/sepolicy/boot-arch/abl/vold.te
@@ -0,0 +1 @@
+allow vold tmpfs:file r_file_perms;
diff --git a/sepolicy/boot-arch/android_ia/file_contexts b/sepolicy/boot-arch/android_ia/file_contexts
new file mode 100644
index 000000000..49807ffd8
--- /dev/null
+++ b/sepolicy/boot-arch/android_ia/file_contexts
@@ -0,0 +1,11 @@
+#
+# Block Devices
+#
+
+/dev/block/(pci|platform)(/.*)?/.*/by-name/android_boot       u:object_r:boot_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/android_persistent u:object_r:frp_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/android_recovery   u:object_r:recovery_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/android_metadata   u:object_r:metadata_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/android_cache      u:object_r:cache_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/android_data       u:object_r:userdata_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/android_misc       u:object_r:misc_block_device:s0
diff --git a/sepolicy/boot-arch/android_ia/init.te b/sepolicy/boot-arch/android_ia/init.te
new file mode 100644
index 000000000..35d653a71
--- /dev/null
+++ b/sepolicy/boot-arch/android_ia/init.te
@@ -0,0 +1 @@
+allow init userdata_block_device:{ lnk_file blk_file } w_file_perms;
diff --git a/sepolicy/boot-arch/common/attributes b/sepolicy/boot-arch/common/attributes
new file mode 100644
index 000000000..466333803
--- /dev/null
+++ b/sepolicy/boot-arch/common/attributes
@@ -0,0 +1,2 @@
+# all rpc sockets
+attribute rpc_socket_type;
diff --git a/sepolicy/boot-arch/common/audioserver.te b/sepolicy/boot-arch/common/audioserver.te
new file mode 100644
index 000000000..ac5f7e20f
--- /dev/null
+++ b/sepolicy/boot-arch/common/audioserver.te
@@ -0,0 +1 @@
+rpc_socket_use(audioserver)
diff --git a/sepolicy/boot-arch/common/device.te b/sepolicy/boot-arch/common/device.te
new file mode 100644
index 000000000..16f19d829
--- /dev/null
+++ b/sepolicy/boot-arch/common/device.te
@@ -0,0 +1,9 @@
+#
+# Devices
+#
+type nvm_device, dev_type;
+type rpc_device, dev_type;
+
+# Block Devices
+type nvm_block_device, dev_type;
+type rpc_block_device, dev_type;
diff --git a/sepolicy/boot-arch/common/file.te b/sepolicy/boot-arch/common/file.te
new file mode 100644
index 000000000..a09d7f473
--- /dev/null
+++ b/sepolicy/boot-arch/common/file.te
@@ -0,0 +1,11 @@
+#
+# RPC Socket types
+#
+type rpc_send_socket, rpc_socket_type, file_type;
+type rpc_recv_socket, rpc_socket_type, file_type;
+type rpc_reg_socket, rpc_socket_type, file_type;
+
+#
+# msm socket type
+#
+type msm_socket, file_type;
diff --git a/sepolicy/boot-arch/common/file_contexts b/sepolicy/boot-arch/common/file_contexts
new file mode 100644
index 000000000..baae56d04
--- /dev/null
+++ b/sepolicy/boot-arch/common/file_contexts
@@ -0,0 +1,28 @@
+#
+# Devices
+#
+/dev/nvmdev	u:object_r:nvm_device:s0
+/dev/tee_rpc	u:object_r:tee_device:s0
+/dev/vmodem	u:object_r:rpc_device:s0
+
+#
+# nvm factory fs
+#
+/nvm_fs_partition(/.*)?	u:object_r:efs_file:s0
+
+#
+#  Sockets
+#
+/dev/socket/msmSock	u:object_r:msm_socket:s0
+/dev/socket/rpc_send	u:object_r:rpc_send_socket:s0
+/dev/socket/rpc_recv	u:object_r:rpc_recv_socket:s0
+/dev/socket/rpc_reg	u:object_r:rpc_reg_socket:s0
+
+#
+# System executables
+#
+/system/bin/rpcServer		u:object_r:rpcServer_exec:s0
+/system/bin/rpc-daemon		u:object_r:rpcdaemon_exec:s0
+/system/bin/nvm_useragent	u:object_r:nvm_useragent_exec:s0
+/system/bin/setup_fs_nvm        u:object_r:setup_fs_nvm_exec:s0
+/system/bin/make_ext4fs     u:object_r:make_ext4fs_exec:s0
diff --git a/sepolicy/boot-arch/common/init.te b/sepolicy/boot-arch/common/init.te
new file mode 100644
index 000000000..59378f216
--- /dev/null
+++ b/sepolicy/boot-arch/common/init.te
@@ -0,0 +1,9 @@
+#
+# init
+#
+
+#
+# The setup_nvm_fs helper no longer does the mount. It is now mounted in the init.rc directly.
+# path: /nvm_fs_partition
+#
+allow init efs_file:dir mounton;
diff --git a/sepolicy/boot-arch/common/kernel.te b/sepolicy/boot-arch/common/kernel.te
new file mode 100644
index 000000000..61e36a9c8
--- /dev/null
+++ b/sepolicy/boot-arch/common/kernel.te
@@ -0,0 +1,8 @@
+#
+# kernel
+#
+
+# vnvm
+allow kernel block_device:dir search;
+
+allow kernel ram_device:blk_file rw_file_perms;
diff --git a/sepolicy/boot-arch/common/make_ext4fs.te b/sepolicy/boot-arch/common/make_ext4fs.te
new file mode 100644
index 000000000..eaeca7562
--- /dev/null
+++ b/sepolicy/boot-arch/common/make_ext4fs.te
@@ -0,0 +1,6 @@
+type make_ext4fs, domain;
+type make_ext4fs_exec, file_type, exec_type;
+
+init_daemon_domain(make_ext4fs)
+
+allow make_ext4fs nvm_block_device:blk_file rw_file_perms;
diff --git a/sepolicy/boot-arch/common/nvm_useragent.te b/sepolicy/boot-arch/common/nvm_useragent.te
new file mode 100644
index 000000000..3da0582b5
--- /dev/null
+++ b/sepolicy/boot-arch/common/nvm_useragent.te
@@ -0,0 +1,13 @@
+#
+# This process runs as root which will FAIL CTS
+# This process also triggers dac_override which
+# should not be granted
+#
+
+type nvm_useragent, domain;
+type nvm_useragent_exec, exec_type, file_type;
+init_daemon_domain(nvm_useragent)
+
+allow nvm_useragent efs_file:dir rw_dir_perms;
+allow nvm_useragent efs_file:file create_file_perms;
+allow nvm_useragent nvm_device:chr_file rw_file_perms;
diff --git a/sepolicy/boot-arch/common/property.te b/sepolicy/boot-arch/common/property.te
new file mode 100644
index 000000000..5600e9615
--- /dev/null
+++ b/sepolicy/boot-arch/common/property.te
@@ -0,0 +1,3 @@
+type msm_prop, property_type;
+type rpc_default_prop, property_type;
+type rpc_state_prop, property_type;
diff --git a/sepolicy/boot-arch/common/property_contexts b/sepolicy/boot-arch/common/property_contexts
new file mode 100644
index 000000000..c72ae35a8
--- /dev/null
+++ b/sepolicy/boot-arch/common/property_contexts
@@ -0,0 +1,6 @@
+msm.		u:object_r:msm_prop:s0
+rpc		u:object_r:rpc_default_prop:s0
+rpc.state	u:object_r:rpc_state_prop:s0
+
+# XXX this may be refactorable into a higher echelon
+persist.configure.modem u:object_r:config_prop:s0
diff --git a/sepolicy/boot-arch/common/rild.te b/sepolicy/boot-arch/common/rild.te
new file mode 100644
index 000000000..ab94824a2
--- /dev/null
+++ b/sepolicy/boot-arch/common/rild.te
@@ -0,0 +1,6 @@
+#
+# rild
+#
+rpc_socket_use(rild)
+
+unix_socket_connect(rild, msm, rpcServer)
diff --git a/sepolicy/boot-arch/common/rpcServer.te b/sepolicy/boot-arch/common/rpcServer.te
new file mode 100644
index 000000000..c9f735466
--- /dev/null
+++ b/sepolicy/boot-arch/common/rpcServer.te
@@ -0,0 +1,26 @@
+type rpcServer, domain;
+type rpcServer_exec, exec_type, file_type;
+
+init_daemon_domain(rpcServer)
+
+allow rpcServer self:capability net_admin;
+
+set_prop(rpcServer, msm_prop)
+set_prop(rpcServer, config_prop)
+
+allow rpcServer rpc_device:chr_file rw_file_perms;
+
+allow rpcServer self:netlink_kobject_uevent_socket create_socket_perms;
+allowxperm rpcServer self:netlink_kobject_uevent_socket ioctl SIOCETHTOOL;
+
+# XXX Running shell
+allow rpcServer shell_exec:file rx_file_perms;
+
+allow rpcServer mvpipe_device:chr_file rw_file_perms;
+
+# Access NVM partitions
+allow rpcServer block_device:dir search;
+allow rpcServer ram_device:blk_file r_file_perms;
+
+# Run /system/bin/reboot
+allow rpcServer system_file:file execute_no_trans;
diff --git a/sepolicy/boot-arch/common/rpcdaemon.te b/sepolicy/boot-arch/common/rpcdaemon.te
new file mode 100644
index 000000000..d230ed6c4
--- /dev/null
+++ b/sepolicy/boot-arch/common/rpcdaemon.te
@@ -0,0 +1,10 @@
+type rpcdaemon, domain;
+type rpcdaemon_exec, exec_type, file_type;
+
+init_daemon_domain(rpcdaemon)
+
+set_prop(rpcdaemon, rpc_state_prop)
+
+unix_socket_connect(rpcdaemon, msm, rpcServer)
+
+allow rpcdaemon mvpipe_device:chr_file rw_file_perms;
diff --git a/sepolicy/boot-arch/common/setup_fs_nvm.te b/sepolicy/boot-arch/common/setup_fs_nvm.te
new file mode 100644
index 000000000..c47cb9a5c
--- /dev/null
+++ b/sepolicy/boot-arch/common/setup_fs_nvm.te
@@ -0,0 +1,29 @@
+#
+# setup_fs_nvm
+#
+
+type setup_fs_nvm, domain;
+type setup_fs_nvm_exec, file_type, exec_type;
+
+init_daemon_domain(setup_fs_nvm)
+
+# execute e2fsck
+allow setup_fs_nvm fsck_exec:file rx_file_perms;
+
+# execute make_ext4fs
+allow setup_fs_nvm make_ext4fs_exec:file rx_file_perms;
+
+# Access nvm on factoryfs
+allow setup_fs_nvm efs_file:dir r_dir_perms;
+
+allow setup_fs_nvm kernel:process setsched;
+allow setup_fs_nvm nvm_block_device:blk_file getattr;
+allow setup_fs_nvm nvm_block_device:blk_file rw_file_perms;
+allow setup_fs_nvm nvm_block_device:dir search;
+allow setup_fs_nvm block_device:dir search;
+
+allow setup_fs_nvm setup_fs_nvm_exec:file x_file_perms;
+
+module_only(`swap', `
+  allow setup_fs_nvm swap_block_device:blk_file getattr;
+')
diff --git a/sepolicy/boot-arch/common/system_app.te b/sepolicy/boot-arch/common/system_app.te
new file mode 100644
index 000000000..e05b6481f
--- /dev/null
+++ b/sepolicy/boot-arch/common/system_app.te
@@ -0,0 +1,2 @@
+unix_socket_connect(system_app, msm, rpcServer)
+allow system_app msm_socket:sock_file write;
diff --git a/sepolicy/boot-arch/common/te_macros b/sepolicy/boot-arch/common/te_macros
new file mode 100644
index 000000000..60b0e8d16
--- /dev/null
+++ b/sepolicy/boot-arch/common/te_macros
@@ -0,0 +1,10 @@
+###################################
+#
+# allow a domain to connect and use
+#  the rpc sockets
+# rpc_socket_use(domain)
+#
+define(`rpc_socket_use', `
+	allow $1 rpcdaemon:unix_stream_socket connectto;
+	allow $1 rpc_socket_type:sock_file write;
+')
diff --git a/sepolicy/boot-arch/common/vold.te b/sepolicy/boot-arch/common/vold.te
new file mode 100644
index 000000000..022a223bb
--- /dev/null
+++ b/sepolicy/boot-arch/common/vold.te
@@ -0,0 +1,5 @@
+#
+# vold
+#
+
+allow vold make_ext4fs_exec:file rx_file_perms;
diff --git a/sepolicy/boot-arch/efi/file_contexts b/sepolicy/boot-arch/efi/file_contexts
new file mode 100644
index 000000000..809a4aaf3
--- /dev/null
+++ b/sepolicy/boot-arch/efi/file_contexts
@@ -0,0 +1,11 @@
+#
+# Block Devices
+#
+
+/dev/block/(pci|platform)(/.*)?/.*/by-name/boot       u:object_r:boot_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/persistent u:object_r:frp_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/recovery   u:object_r:recovery_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/metadata   u:object_r:metadata_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/cache      u:object_r:cache_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/data       u:object_r:userdata_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/misc       u:object_r:misc_block_device:s0
diff --git a/sepolicy/config-partition/device.te b/sepolicy/config-partition/device.te
new file mode 100644
index 000000000..9d3aa092a
--- /dev/null
+++ b/sepolicy/config-partition/device.te
@@ -0,0 +1 @@
+type config_block_device, dev_type;
diff --git a/sepolicy/config-partition/dumpstate.te b/sepolicy/config-partition/dumpstate.te
new file mode 100644
index 000000000..b6f244949
--- /dev/null
+++ b/sepolicy/config-partition/dumpstate.te
@@ -0,0 +1,2 @@
+dontaudit dumpstate config_file:dir r_dir_perms;
+dontaudit dumpstate config_file:file r_file_perms;
diff --git a/sepolicy/config-partition/file.te b/sepolicy/config-partition/file.te
new file mode 100644
index 000000000..565d0d54a
--- /dev/null
+++ b/sepolicy/config-partition/file.te
@@ -0,0 +1 @@
+type config_file, file_type, data_file_type;
diff --git a/sepolicy/config-partition/file_contexts b/sepolicy/config-partition/file_contexts
new file mode 100644
index 000000000..bdcd77b53
--- /dev/null
+++ b/sepolicy/config-partition/file_contexts
@@ -0,0 +1,4 @@
+# Config partition
+/oem_config(/.*)?               u:object_r:config_file:s0
+
+/dev/block/(pci|platform)(/.*)?/.*/by-name/android_config  u:object_r:config_block_device:s0
diff --git a/sepolicy/config-partition/fsck.te b/sepolicy/config-partition/fsck.te
new file mode 100644
index 000000000..3c5e52261
--- /dev/null
+++ b/sepolicy/config-partition/fsck.te
@@ -0,0 +1,3 @@
+# Run fsck on config partition
+
+allow fsck config_block_device:blk_file rw_file_perms;
diff --git a/sepolicy/config-partition/init.te b/sepolicy/config-partition/init.te
new file mode 100644
index 000000000..7af77b916
--- /dev/null
+++ b/sepolicy/config-partition/init.te
@@ -0,0 +1,6 @@
+#
+# init
+#
+
+# mount /oem_config
+allow init config_file:dir mounton;
diff --git a/sepolicy/config-partition/nfc.te b/sepolicy/config-partition/nfc.te
new file mode 100644
index 000000000..c95f3b155
--- /dev/null
+++ b/sepolicy/config-partition/nfc.te
@@ -0,0 +1,4 @@
+#
+# nfc
+#
+allow nfc config_file:dir search;
diff --git a/sepolicy/config-partition/ueventd.te b/sepolicy/config-partition/ueventd.te
new file mode 100644
index 000000000..dcae46210
--- /dev/null
+++ b/sepolicy/config-partition/ueventd.te
@@ -0,0 +1,6 @@
+#
+# ueventd
+#
+
+allow ueventd config_file:dir search;
+allow ueventd config_file:file r_file_perms;
diff --git a/sepolicy/config-partition/vold.te b/sepolicy/config-partition/vold.te
new file mode 100644
index 000000000..78940f289
--- /dev/null
+++ b/sepolicy/config-partition/vold.te
@@ -0,0 +1,7 @@
+#
+# vold
+#
+
+allow vold config_file:dir r_dir_perms;
+# uapi/linux/fs.h:#define FITRIM _IOWR('X', 121, struct fstrim_range) /* Trim */
+#allow vold config_file:dir 0x5879;
diff --git a/sepolicy/config-partition/wpa.te b/sepolicy/config-partition/wpa.te
new file mode 100644
index 000000000..fbe3ae40a
--- /dev/null
+++ b/sepolicy/config-partition/wpa.te
@@ -0,0 +1,7 @@
+#
+# wpa.te
+#
+
+# allow wpa to access Mac address given by wlan_prov tool
+#allow wpa config_file:dir search;
+#allow wpa config_file:file r_file_perms;
diff --git a/sepolicy/debug-phonedoctor/crashreport_app.te b/sepolicy/debug-phonedoctor/crashreport_app.te
new file mode 100644
index 000000000..2fc8c122a
--- /dev/null
+++ b/sepolicy/debug-phonedoctor/crashreport_app.te
@@ -0,0 +1,31 @@
+# define the type for all builds, but grant no permissions.
+# this is because seapp_contexts does not support macros.
+type crashreport_app, domain;
+
+userdebug_or_eng(`
+
+  permissive crashreport_app;
+
+  app_domain(crashreport_app)
+  net_domain(crashreport_app)
+  binder_service(crashreport_app)
+
+#============= crashreport_app ==============
+  module_only(`debug_crashlogd', `
+    allow crashreport_app crashlogd_prop:file r_file_perms;
+  ')
+
+  allow crashreport_app crashreport_app_data_file:dir create_dir_perms;
+  allow crashreport_app crashreport_app_data_file:file create_file_perms;
+  allow crashreport_app crashreport_app_data_file:file r_file_perms;
+  allow crashreport_app debugfs:dir r_dir_perms;
+  allow crashreport_app init:unix_stream_socket connectto;
+  allow crashreport_app log_file:dir create_dir_perms;
+  allow crashreport_app log_file:file create_file_perms;
+
+  dontaudit crashreport_app property_socket:sock_file w_file_perms;
+  dontaudit crashreport_app system_prop:property_service set;
+
+# any rules that violate neverallows can go here
+  dontaudit crashreport_app serialno_prop:file r_file_perms;
+')
diff --git a/sepolicy/debug-phonedoctor/file.te b/sepolicy/debug-phonedoctor/file.te
new file mode 100644
index 000000000..a566f30a2
--- /dev/null
+++ b/sepolicy/debug-phonedoctor/file.te
@@ -0,0 +1,2 @@
+# Always define since seapp contexts does not support m4 macro support.
+type crashreport_app_data_file, file_type, data_file_type, mlstrustedobject;
diff --git a/sepolicy/debug-phonedoctor/hal_memtrack_default.te b/sepolicy/debug-phonedoctor/hal_memtrack_default.te
new file mode 100644
index 000000000..168b71edb
--- /dev/null
+++ b/sepolicy/debug-phonedoctor/hal_memtrack_default.te
@@ -0,0 +1,4 @@
+userdebug_or_eng(`
+  allow hal_memtrack_default crashreport_app:dir r_dir_perms;
+  allow hal_memtrack_default crashreport_app:file r_file_perms;
+')
diff --git a/sepolicy/debug-phonedoctor/installd.te b/sepolicy/debug-phonedoctor/installd.te
new file mode 100644
index 000000000..d8e0e82e2
--- /dev/null
+++ b/sepolicy/debug-phonedoctor/installd.te
@@ -0,0 +1,5 @@
+userdebug_or_eng(`
+  allow installd crashreport_app_data_file:dir create_dir_perms;
+  allow installd crashreport_app_data_file:dir relabelto;
+  allow installd crashreport_app_data_file:file relabelto;
+')
diff --git a/sepolicy/debug-phonedoctor/platform_app.te b/sepolicy/debug-phonedoctor/platform_app.te
new file mode 100644
index 000000000..6e66c9153
--- /dev/null
+++ b/sepolicy/debug-phonedoctor/platform_app.te
@@ -0,0 +1,3 @@
+userdebug_or_eng(`
+  allow platform_app crashreport_app_data_file:dir getattr;
+')
diff --git a/sepolicy/debug-phonedoctor/property.te b/sepolicy/debug-phonedoctor/property.te
new file mode 100644
index 000000000..1da0ebad8
--- /dev/null
+++ b/sepolicy/debug-phonedoctor/property.te
@@ -0,0 +1 @@
+type ctl_logconfig_prop, property_type;
diff --git a/sepolicy/debug-phonedoctor/property_contexts b/sepolicy/debug-phonedoctor/property_contexts
new file mode 100644
index 000000000..c8364a51b
--- /dev/null
+++ b/sepolicy/debug-phonedoctor/property_contexts
@@ -0,0 +1 @@
+ctl.logconfig   u:object_r:ctl_logconfig_prop:s0
diff --git a/sepolicy/debug-phonedoctor/seapp_contexts b/sepolicy/debug-phonedoctor/seapp_contexts
new file mode 100644
index 000000000..37af4ebc5
--- /dev/null
+++ b/sepolicy/debug-phonedoctor/seapp_contexts
@@ -0,0 +1 @@
+user=system seinfo=platform name=com.intel.crashreport domain=crashreport_app type=crashreport_app_data_file
diff --git a/sepolicy/debug-phonedoctor/system_app.te b/sepolicy/debug-phonedoctor/system_app.te
new file mode 100644
index 000000000..2f5763be4
--- /dev/null
+++ b/sepolicy/debug-phonedoctor/system_app.te
@@ -0,0 +1,11 @@
+# setprop ctl.logconfig
+set_prop(system_app, ctl_logconfig_prop)
+
+allow system_app sysfs_devices_system_cpu:file rw_file_perms;
+
+# com.intel.crashreport which is part of the crash_package used by phonedoctor
+# mixin.
+allow system_app sysfs_devices_system_cpu:file rw_file_perms;
+# create_socket_perms does not work becuae of neverallow on write
+allow system_app self:netlink_kobject_uevent_socket { read create setopt bind };
+allowxperm system_app self:netlink_kobject_uevent_socket ioctl SIOCETHTOOL;
diff --git a/sepolicy/debug-phonedoctor/system_server.te b/sepolicy/debug-phonedoctor/system_server.te
new file mode 100644
index 000000000..4bac7f77d
--- /dev/null
+++ b/sepolicy/debug-phonedoctor/system_server.te
@@ -0,0 +1,3 @@
+userdebug_or_eng(`
+  allow system_server crashreport_app:file w_file_perms;
+')
diff --git a/sepolicy/debugfs/dumpstate.te b/sepolicy/debugfs/dumpstate.te
new file mode 100644
index 000000000..d012fdf54
--- /dev/null
+++ b/sepolicy/debugfs/dumpstate.te
@@ -0,0 +1,5 @@
+#
+# dumpstate
+#
+
+dontaudit dumpstate debugfs_graphics_sync:file r_file_perms;
diff --git a/sepolicy/debugfs/file.te b/sepolicy/debugfs/file.te
new file mode 100644
index 000000000..401ed909c
--- /dev/null
+++ b/sepolicy/debugfs/file.te
@@ -0,0 +1,2 @@
+# debugfs sync file
+type debugfs_graphics_sync, fs_type, debugfs_type;
diff --git a/sepolicy/debugfs/file_contexts b/sepolicy/debugfs/file_contexts
new file mode 100644
index 000000000..5ab0695dd
--- /dev/null
+++ b/sepolicy/debugfs/file_contexts
@@ -0,0 +1 @@
+/sys/kernel/debug/sync      u:object_r:debugfs_graphics_sync:s0
diff --git a/sepolicy/debugfs/genfs_contexts b/sepolicy/debugfs/genfs_contexts
new file mode 100644
index 000000000..e69de29bb
diff --git a/sepolicy/debugfs/platform_app.te b/sepolicy/debugfs/platform_app.te
new file mode 100644
index 000000000..4559d08d5
--- /dev/null
+++ b/sepolicy/debugfs/platform_app.te
@@ -0,0 +1,5 @@
+#
+# platform_app
+#
+
+allow platform_app debugfs_graphics_sync:file r_file_perms;
diff --git a/sepolicy/factory-partition/drmserver.te b/sepolicy/factory-partition/drmserver.te
new file mode 100644
index 000000000..957dcd31e
--- /dev/null
+++ b/sepolicy/factory-partition/drmserver.te
@@ -0,0 +1,6 @@
+#
+# drm
+#
+
+allow drmserver factory_file:dir r_dir_perms;
+allow drmserver factory_file:file r_file_perms;
diff --git a/sepolicy/factory-partition/dumpstate.te b/sepolicy/factory-partition/dumpstate.te
new file mode 100644
index 000000000..075da97cc
--- /dev/null
+++ b/sepolicy/factory-partition/dumpstate.te
@@ -0,0 +1 @@
+dontaudit dumpstate factory_file:dir getattr;
diff --git a/sepolicy/factory-partition/file.te b/sepolicy/factory-partition/file.te
new file mode 100644
index 000000000..890e98c1b
--- /dev/null
+++ b/sepolicy/factory-partition/file.te
@@ -0,0 +1 @@
+type factory_file, file_type;
diff --git a/sepolicy/factory-partition/file_contexts b/sepolicy/factory-partition/file_contexts
new file mode 100644
index 000000000..b7dc84ad7
--- /dev/null
+++ b/sepolicy/factory-partition/file_contexts
@@ -0,0 +1 @@
+/factory(/.*)?                  u:object_r:factory_file:s0
diff --git a/sepolicy/factory-partition/init.te b/sepolicy/factory-partition/init.te
new file mode 100644
index 000000000..c7efab0a3
--- /dev/null
+++ b/sepolicy/factory-partition/init.te
@@ -0,0 +1,6 @@
+#
+# init
+#
+
+# mount /factory
+allow init factory_file:dir mounton;
diff --git a/sepolicy/factory-partition/vold.te b/sepolicy/factory-partition/vold.te
new file mode 100644
index 000000000..798143317
--- /dev/null
+++ b/sepolicy/factory-partition/vold.te
@@ -0,0 +1,7 @@
+#
+# Vold
+#
+
+allow vold factory_file:dir r_dir_perms;
+# uapi/linux/fs.h:#define FITRIM _IOWR('X', 121, struct fstrim_range) /* Trim */
+#allow vold factory_file:dir 0x5879;
diff --git a/sepolicy/graphics/android_ia/adbd.te b/sepolicy/graphics/android_ia/adbd.te
new file mode 100644
index 000000000..e1e7b4483
--- /dev/null
+++ b/sepolicy/graphics/android_ia/adbd.te
@@ -0,0 +1,6 @@
+# to allow CTS/XTS screen capture through method getScreenshot.
+allow adbd graphics_device:dir search;
+allow adbd graphics_device:chr_file { read open };
+allow adbd gpu_device:dir search;
+allow adbd gpu_device:chr_file r_file_perms;
+allow adbd hal_graphics_allocator_default_tmpfs:file { read write map };
diff --git a/sepolicy/graphics/android_ia/appdomain.te b/sepolicy/graphics/android_ia/appdomain.te
new file mode 100644
index 000000000..be5eb35b9
--- /dev/null
+++ b/sepolicy/graphics/android_ia/appdomain.te
@@ -0,0 +1,6 @@
+# graphics buffer passed to applications for screencap and rendering
+#allow appdomain surfaceflinger_tmpfs:file { read write };
+allow appdomain hal_graphics_allocator_default_tmpfs:file { read write map };
+allow appdomain hal_graphics_composer_default_tmpfs:file { read write map };
+allow appdomain gpu_device:dir r_dir_perms;
+allow appdomain sysfs_app_readable:file r_file_perms;
diff --git a/sepolicy/graphics/android_ia/bootanim.te b/sepolicy/graphics/android_ia/bootanim.te
new file mode 100644
index 000000000..347ccbcd3
--- /dev/null
+++ b/sepolicy/graphics/android_ia/bootanim.te
@@ -0,0 +1,3 @@
+allow bootanim sysfs_app_readable:file r_file_perms;
+allow bootanim gpu_device:chr_file rw_file_perms;
+allow bootanim gpu_device:dir r_dir_perms;
diff --git a/sepolicy/graphics/android_ia/file.te b/sepolicy/graphics/android_ia/file.te
new file mode 100644
index 000000000..7b84fdae2
--- /dev/null
+++ b/sepolicy/graphics/android_ia/file.te
@@ -0,0 +1 @@
+type sysfs_app_readable, fs_type, sysfs_type;
diff --git a/sepolicy/graphics/android_ia/file_contexts b/sepolicy/graphics/android_ia/file_contexts
new file mode 100644
index 000000000..042ab4108
--- /dev/null
+++ b/sepolicy/graphics/android_ia/file_contexts
@@ -0,0 +1,10 @@
+# devices
+/dev/dri(/.*)?              u:object_r:gpu_device:s0
+/dev/sw_sync                u:object_r:graphics_device:s0
+
+/sys/devices/pci0000\:00/0000\:00\:02.0/config u:object_r:sysfs_app_readable:s0
+/sys/devices/pci0000:00/0000:00:02.0/vendor u:object_r:sysfs_app_readable:s0
+/sys/devices/pci0000:00/0000:00:02.0/device u:object_r:sysfs_app_readable:s0
+/sys/devices/pci0000:00/0000:00:02.0/subsystem_vendor u:object_r:sysfs_app_readable:s0
+/sys/devices/pci0000:00/0000:00:02.0/subsystem_device u:object_r:sysfs_app_readable:s0
+/sys/devices/pci0000:00/0000:00:02.0/uevent u:object_r:sysfs_app_readable:s0
diff --git a/sepolicy/graphics/android_ia/hal_graphics_allocator_default.te b/sepolicy/graphics/android_ia/hal_graphics_allocator_default.te
new file mode 100644
index 000000000..42ef776b5
--- /dev/null
+++ b/sepolicy/graphics/android_ia/hal_graphics_allocator_default.te
@@ -0,0 +1,18 @@
+#============= hal_graphics_allocator_default ==============
+allow hal_graphics_allocator_default gpu_device:chr_file rw_file_perms;
+allow hal_graphics_allocator_default gpu_device:dir r_dir_perms;
+allowxperm hal_graphics_allocator_default gpu_device:chr_file ioctl {
+	DRM_IOCTL_RADEON_SURF_FREE
+	DRM_IOCTL_I915_GEM_SET_TILING
+	DRM_IOCTL_PRIME_HANDLE_TO_FD
+	DRM_IOCTL_GEM_CLOSE
+	DRM_IOCTL_VERSION
+	VIDIOC_INT_RESET
+	DRM_IOCTL_GET_CAP
+	DRM_IOCTL_SET_CLIENT_CAP
+	DRM_IOCTL_RADEON_FULLSCREEN
+	DRM_IOCTL_MODE_GETPLANERESOURCES
+	DRM_IOCTL_MODE_GETPLANE
+	DRM_IOCTL_MODE_OBJ_GETPROPERTIES
+	DRM_IOCTL_MODE_GETPROPERTY
+};
diff --git a/sepolicy/graphics/android_ia/hal_graphics_composer_default.te b/sepolicy/graphics/android_ia/hal_graphics_composer_default.te
new file mode 100644
index 000000000..4cf7ce25b
--- /dev/null
+++ b/sepolicy/graphics/android_ia/hal_graphics_composer_default.te
@@ -0,0 +1,15 @@
+vndbinder_use(hal_graphics_composer_default)
+
+binder_call(hal_graphics_composer_default, hal_graphics_allocator_default)
+
+allow hal_graphics_composer_default cache_file:dir create_dir_perms;
+allow hal_graphics_composer_default cache_file:file create_file_perms;
+
+allow hal_graphics_composer_default self:netlink_kobject_uevent_socket { read bind create setopt };
+
+allow hal_graphics_composer_default hal_graphics_mapper_hwservice:hwservice_manager find;
+allow hal_graphics_composer_default hal_graphics_allocator_hwservice:hwservice_manager find;
+
+allow hal_graphics_composer_default gpu_device:dir r_dir_perms;
+allow hal_graphics_composer_default gpu_device:chr_file rw_file_perms;
+allow hal_graphics_composer_default sysfs_app_readable:file r_file_perms;
diff --git a/sepolicy/graphics/android_ia/mediacodec.te b/sepolicy/graphics/android_ia/mediacodec.te
new file mode 100644
index 000000000..877812abc
--- /dev/null
+++ b/sepolicy/graphics/android_ia/mediacodec.te
@@ -0,0 +1,2 @@
+allow mediacodec sysfs_app_readable:file r_file_perms;
+allow mediacodec gpu_device:dir r_dir_perms;
diff --git a/sepolicy/graphics/android_ia/mediadrmserver.te b/sepolicy/graphics/android_ia/mediadrmserver.te
new file mode 100644
index 000000000..0dab914b6
--- /dev/null
+++ b/sepolicy/graphics/android_ia/mediadrmserver.te
@@ -0,0 +1 @@
+allow mediadrmserver sysfs_app_readable:file r_file_perms;
diff --git a/sepolicy/graphics/android_ia/mediaserver.te b/sepolicy/graphics/android_ia/mediaserver.te
new file mode 100644
index 000000000..f78e12b70
--- /dev/null
+++ b/sepolicy/graphics/android_ia/mediaserver.te
@@ -0,0 +1,2 @@
+allow mediadrmserver sysfs_app_readable:file r_file_perms;
+allow mediadrmserver gpu_device:dir r_dir_perms;
diff --git a/sepolicy/graphics/android_ia/platform_app.te b/sepolicy/graphics/android_ia/platform_app.te
new file mode 100644
index 000000000..3416c11c6
--- /dev/null
+++ b/sepolicy/graphics/android_ia/platform_app.te
@@ -0,0 +1,30 @@
+allowxperm platform_app gpu_device:chr_file ioctl {
+	DRM_IOCTL_RADEON_IRQ_WAIT
+	DRM_IOCTL_PRIME_FD_TO_HANDLE
+	DRM_IOCTL_I915_GEM_THROTTLE
+	DRM_IOCTL_RADEON_SURF_FREE
+	DRM_IOCTL_GEM_CLOSE
+	DRM_IOCTL_EXYNOS_G2D_EXEC
+	DRM_IOCTL_PRIME_FD_TO_HANDLE
+	DRM_IOCTL_VERSION
+	DRM_IOCTL_I915_GEM_SET_DOMAIN
+	DRM_IOCTL_I915_GEM_MMAP
+	VIDIOC_INT_RESET
+	DRM_IOCTL_I915_GEM_SET_TILING
+	DRM_IOCTL_I915_GEM_EXECBUFFER2
+	DRM_IOCTL_I915_GEM_WAIT
+	DRM_IOCTL_I915_GETPARAM
+	DRM_IOCTL_GET_CAP
+	DRM_IOCTL_SET_CLIENT_CAP
+	DRM_IOCTL_MODE_GETPLANERESOURCES
+	DRM_IOCTL_MODE_GETPLANE
+	DRM_IOCTL_I915_GEM_PWRITE
+	DRM_IOCTL_MODE_GETPROPERTY
+	DRM_IOCTL_MODE_OBJ_GETPROPERTIES
+	DRM_IOCTL_RADEON_GEM_SET_DOMAIN
+	DRM_IOCTL_I915_GEM_CONTEXT_CREATE
+	DRM_IOCTL_I915_GEM_CONTEXT_DESTROY
+	DRM_IOCTL_I915_GET_RESET_STATS
+	DRM_IOCTL_I915_REG_READ
+	0x6475
+};
diff --git a/sepolicy/graphics/android_ia/surfaceflinger.te b/sepolicy/graphics/android_ia/surfaceflinger.te
new file mode 100644
index 000000000..641ce3157
--- /dev/null
+++ b/sepolicy/graphics/android_ia/surfaceflinger.te
@@ -0,0 +1,31 @@
+allow surfaceflinger sysfs_app_readable:file r_file_perms;
+allow surfaceflinger gpu_device:dir r_dir_perms;
+allowxperm surfaceflinger gpu_device:chr_file ioctl {
+	DRM_IOCTL_I915_GEM_EXECBUFFER2
+	DRM_IOCTL_I915_GEM_ENTERVT
+	DRM_IOCTL_RADEON_IRQ_WAIT
+	DRM_IOCTL_I915_GEM_THROTTLE
+	VIDIOC_INT_RESET
+	DRM_IOCTL_RADEON_SURF_FREE
+	DRM_IOCTL_RADEON_GEM_PREAD
+	DRM_IOCTL_I915_GEM_PWRITE
+	DRM_IOCTL_I915_GEM_SET_DOMAIN
+	DRM_IOCTL_GEM_CLOSE
+	DRM_IOCTL_PRIME_FD_TO_HANDLE
+	DRM_IOCTL_I915_GEM_GET_TILING
+	DRM_IOCTL_I915_GEM_MMAP
+	DRM_IOCTL_VERSION
+	DRM_IOCTL_RADEON_FULLSCREEN
+	DRM_IOCTL_GET_CAP
+	DRM_IOCTL_SET_CLIENT_CAP
+	DRM_IOCTL_MODE_GETPLANERESOURCES
+	DRM_IOCTL_RADEON_GEM_SET_DOMAIN
+	DRM_IOCTL_MODE_GETPLANE
+	DRM_IOCTL_MODE_OBJ_GETPROPERTIES
+	DRM_IOCTL_EXYNOS_IPP_SET_PROPERTY
+	DRM_IOCTL_I915_GET_RESET_STATS
+	DRM_IOCTL_I915_GEM_CONTEXT_CREATE
+	DRM_IOCTL_I915_GEM_MMAP_GTT
+	DRM_IOCTL_MODE_GETPROPERTY
+	0x6475
+};
diff --git a/sepolicy/graphics/android_ia/system_server.te b/sepolicy/graphics/android_ia/system_server.te
new file mode 100644
index 000000000..fcc8528aa
--- /dev/null
+++ b/sepolicy/graphics/android_ia/system_server.te
@@ -0,0 +1,4 @@
+allow system_server hal_graphics_allocator_default_tmpfs:file { read write map };
+allow system_server gpu_device:dir r_dir_perms;
+allow system_server hal_graphics_composer_default_tmpfs:file { read write map };
+allow system_server sysfs_app_readable:file r_file_perms;
diff --git a/sepolicy/graphics/android_ia/ueventd.te b/sepolicy/graphics/android_ia/ueventd.te
new file mode 100644
index 000000000..36309c59a
--- /dev/null
+++ b/sepolicy/graphics/android_ia/ueventd.te
@@ -0,0 +1 @@
+allow ueventd sysfs_app_readable:file rw_file_perms;
diff --git a/sepolicy/kernel/appdomain.te b/sepolicy/kernel/appdomain.te
new file mode 100644
index 000000000..3fd8e136f
--- /dev/null
+++ b/sepolicy/kernel/appdomain.te
@@ -0,0 +1 @@
+allow appdomain proc_version:file r_file_perms;
diff --git a/sepolicy/kernel/dumpstate.te b/sepolicy/kernel/dumpstate.te
new file mode 100644
index 000000000..551dfabcc
--- /dev/null
+++ b/sepolicy/kernel/dumpstate.te
@@ -0,0 +1 @@
+dontaudit dumpstate proc_version:file r_file_perms;
diff --git a/sepolicy/kernel/file.te b/sepolicy/kernel/file.te
new file mode 100644
index 000000000..b4d7b9015
--- /dev/null
+++ b/sepolicy/kernel/file.te
@@ -0,0 +1 @@
+type proc_version, fs_type, sysfs_type;
diff --git a/sepolicy/kernel/genfs_contexts b/sepolicy/kernel/genfs_contexts
new file mode 100644
index 000000000..7024d8bb7
--- /dev/null
+++ b/sepolicy/kernel/genfs_contexts
@@ -0,0 +1,2 @@
+genfscon proc /version u:object_r:proc_version:s0
+genfscon proc /sys/kernel/osrelease u:object_r:proc_version:s0
diff --git a/sepolicy/kernel/hal_power_default.te b/sepolicy/kernel/hal_power_default.te
new file mode 100644
index 000000000..9019aaba9
--- /dev/null
+++ b/sepolicy/kernel/hal_power_default.te
@@ -0,0 +1,2 @@
+allow hal_power_default sysfs:file rw_file_perms;
+allow hal_power_default sysfs:dir r_dir_perms;
diff --git a/sepolicy/kernel/healthd.te b/sepolicy/kernel/healthd.te
new file mode 100644
index 000000000..d4f839d0a
--- /dev/null
+++ b/sepolicy/kernel/healthd.te
@@ -0,0 +1 @@
+allow healthd self:capability2 wake_alarm;
diff --git a/sepolicy/kernel/init.te b/sepolicy/kernel/init.te
new file mode 100644
index 000000000..d67837348
--- /dev/null
+++ b/sepolicy/kernel/init.te
@@ -0,0 +1,17 @@
+allow init debugfs:file write;
+allow init kernel:key search;
+allow init kernel:system module_request;
+allow init {
+  rootfs
+  vendor_file
+}:system module_load;
+
+allow init sysfs_devices_system_cpu:dir rw_dir_perms;
+allow init sysfs_devices_system_cpu:file create_file_perms;
+allow init tmpfs:lnk_file create_file_perms;
+allow init configfs:{ file lnk_file } create_file_perms;
+allow init self:capability dac_read_search;
+allow init self:capability sys_module;
+allow init self:capability2 block_suspend;
+
+dontaudit init cgroup:file create_file_perms;
diff --git a/sepolicy/kernel/installd.te b/sepolicy/kernel/installd.te
new file mode 100644
index 000000000..3208a1ecc
--- /dev/null
+++ b/sepolicy/kernel/installd.te
@@ -0,0 +1 @@
+allow installd self:capability dac_read_search;
diff --git a/sepolicy/kernel/kernel.te b/sepolicy/kernel/kernel.te
new file mode 100644
index 000000000..101b795b2
--- /dev/null
+++ b/sepolicy/kernel/kernel.te
@@ -0,0 +1,15 @@
+#
+# kernel
+#
+
+#vnvm kthread
+allow kernel block_device:blk_file rw_file_perms;
+allow kernel block_device:dir search;
+
+# watchdog kernel option CONFIG_LOCKUP_DETECTOR
+allow kernel kernel:capability sys_admin;
+
+# For loading /lib/modules/inet_diag.ko
+allow kernel rootfs:system module_load;
+allow kernel system_file:system module_load;
+allow kernel self:system module_request;
diff --git a/sepolicy/kernel/netd.te b/sepolicy/kernel/netd.te
new file mode 100644
index 000000000..8c860a800
--- /dev/null
+++ b/sepolicy/kernel/netd.te
@@ -0,0 +1,3 @@
+allow netd kernel:system module_request;
+allow netd self:capability { sys_module fsetid };
+
diff --git a/sepolicy/kernel/system_server.te b/sepolicy/kernel/system_server.te
new file mode 100644
index 000000000..4c89058f9
--- /dev/null
+++ b/sepolicy/kernel/system_server.te
@@ -0,0 +1,10 @@
+#
+# system_server
+#
+
+allow system_server proc_version:file r_file_perms;
+
+allow system_server audioserver:file rw_file_perms;
+allow system_server system_app:file rw_file_perms;
+
+allow system_server hal_graphics_allocator_default_tmpfs:file rw_file_perms;
diff --git a/sepolicy/kernel/ueventd.te b/sepolicy/kernel/ueventd.te
new file mode 100644
index 000000000..2c6cc0b01
--- /dev/null
+++ b/sepolicy/kernel/ueventd.te
@@ -0,0 +1,4 @@
+allow ueventd self:capability sys_module;
+allow ueventd vendor_file:system module_load;
+allow ueventd kernel:key search;
+allow ueventd kernel:system module_request;
diff --git a/sepolicy/kernel/vold.te b/sepolicy/kernel/vold.te
new file mode 100644
index 000000000..7438b0038
--- /dev/null
+++ b/sepolicy/kernel/vold.te
@@ -0,0 +1 @@
+allow vold self:capability dac_read_search;
diff --git a/sepolicy/kernel/wificond.te b/sepolicy/kernel/wificond.te
new file mode 100644
index 000000000..61a4f9cb2
--- /dev/null
+++ b/sepolicy/kernel/wificond.te
@@ -0,0 +1 @@
+allow wificond kernel:system module_request;
diff --git a/sepolicy/kernel/zygote.te b/sepolicy/kernel/zygote.te
new file mode 100644
index 000000000..7d91e5bb0
--- /dev/null
+++ b/sepolicy/kernel/zygote.te
@@ -0,0 +1 @@
+allow zygote self:capability dac_read_search;
diff --git a/sepolicy/rfkill/bluetooth.te b/sepolicy/rfkill/bluetooth.te
new file mode 100644
index 000000000..625cce25b
--- /dev/null
+++ b/sepolicy/rfkill/bluetooth.te
@@ -0,0 +1 @@
+allow bluetooth sysfs_rfkill:file r_file_perms;
diff --git a/sepolicy/rfkill/device.te b/sepolicy/rfkill/device.te
new file mode 100644
index 000000000..d3585299a
--- /dev/null
+++ b/sepolicy/rfkill/device.te
@@ -0,0 +1 @@
+type rfkill_device, dev_type;
diff --git a/sepolicy/rfkill/file.te b/sepolicy/rfkill/file.te
new file mode 100644
index 000000000..563f86736
--- /dev/null
+++ b/sepolicy/rfkill/file.te
@@ -0,0 +1 @@
+type sysfs_rfkill, sysfs_type, fs_type;
diff --git a/sepolicy/rfkill/file_contexts b/sepolicy/rfkill/file_contexts
new file mode 100644
index 000000000..fd68dac26
--- /dev/null
+++ b/sepolicy/rfkill/file_contexts
@@ -0,0 +1,9 @@
+#
+# rfkill
+#
+
+/dev/rfkill    u:object_r:rfkill_device:s0
+
+/vendor/bin/rfkill-init.sh  u:object_r:rfkill_exec:s0
+
+/sys/devices/virtual/ieee80211/phy0/rfkill[0-9]{1}/type u:object_r:sysfs_rfkill:s0
diff --git a/sepolicy/rfkill/rfkill.te b/sepolicy/rfkill/rfkill.te
new file mode 100644
index 000000000..e96cd60cb
--- /dev/null
+++ b/sepolicy/rfkill/rfkill.te
@@ -0,0 +1,33 @@
+#
+# rfkill
+#
+
+type rfkill, domain;
+type rfkill_exec, exec_type, file_type, vendor_file_type;
+init_daemon_domain(rfkill)
+
+# devices
+allow rfkill rfkill_device:chr_file rw_file_perms;
+
+
+# devices
+allow rfkill rfkill_device:chr_file rw_file_perms;
+
+# chmods sysfs rfkill files
+allow rfkill sysfs:file { getattr setattr };
+allow rfkill sysfs_bluetooth_writable:file { getattr setattr };
+
+allow rfkill sysfs:dir r_dir_perms;
+allow rfkill sysfs:file r_file_perms;
+allow rfkill sysfs_rfkill:file r_file_perms;
+
+not_full_treble(`
+  # its a shell script, so in order to run the interpreter
+  # it needs access to shell_exec
+  allow rfkill shell_exec:file rx_file_perms;
+  allow rfkill toolbox_exec:file rx_file_perms;
+')
+full_treble_only(`
+  allow rfkill vendor_shell_exec:file rx_file_perms;
+  allow rfkill vendor_toolbox_exec:file rx_file_perms;
+')
diff --git a/sepolicy/set_storage/init.te b/sepolicy/set_storage/init.te
index 8ba454da9..99383f2c0 100644
--- a/sepolicy/set_storage/init.te
+++ b/sepolicy/set_storage/init.te
@@ -2,4 +2,6 @@
 # init
 #
 
-domain_trans(init, rootfs, set_storage)
+not_full_treble(`
+	domain_trans(init, rootfs, set_storage)
+')
diff --git a/sepolicy/te_macros b/sepolicy/te_macros
new file mode 100644
index 000000000..5211ca5a7
--- /dev/null
+++ b/sepolicy/te_macros
@@ -0,0 +1,41 @@
+#####################################
+# Userfastboot only
+# SELinux rules which apply only to userfastboot mode
+#
+define(`userfastboot_only', ifelse(target_userfastboot, `true', $1, ))
+
+define(`notuserfastboot', ifelse(target_userfastboot, `true', -userfastboot, ))
+
+
+#####################################
+# target_only(target, rules)
+# SELinux rules which only apply to a particular target
+# target - the target name in TARGET_PRODUCT. Note this is a substring search
+#          so target_only(`coh', `rules') is the same as target_only(`coho', `rules')
+# rules - Any rules you wish to add, make sure to quote them with `'
+#
+define(`target_only', `ifelse(eval(index(board_sepolicy_target_product, $1) >= 0),1,$2)')
+
+#####################################
+# module_only(module_name, rules)
+# Only add rules if a module is true.
+# Note: that a module must declare themselves exported
+# by adding BOARD_SEPOLICY_M4DEFS += module_<modname>=true
+# in the module specific mixin BoardConfig.mk file.
+# WARNING: <modname> cannot contain a dash, use underscores.
+define(`module_only', `ifelse(module_$1, `true', $2)')
+
+# ignore_adb_debug(domain)
+# Some hal interface expose a forwarded port over adb
+# for debugging, ignore these. If you need to access
+# the port, run setenforce 0 from a root shell.
+define(`ignore_adb_debug', `
+  userdebug_or_eng(`
+    dontaudit $1 node:tcp_socket *;
+    dontaudit $1 self:socket *;
+    dontaudit $1 self:tcp_socket *;
+    dontaudit $1 self:udp_socket *;
+    dontaudit $1 port:tcp_socket *;
+    permissive $1;
+  ')
+')
diff --git a/sepolicy/thermal/device.te b/sepolicy/thermal/device.te
new file mode 100644
index 000000000..d58ba6c54
--- /dev/null
+++ b/sepolicy/thermal/device.te
@@ -0,0 +1 @@
+type thermal_device, dev_type;
diff --git a/sepolicy/thermal/dptf/dptf.te b/sepolicy/thermal/dptf/dptf.te
new file mode 100644
index 000000000..9e324c10a
--- /dev/null
+++ b/sepolicy/thermal/dptf/dptf.te
@@ -0,0 +1,54 @@
+# Rules for esif_ufd
+type dptf, domain;
+type dptf_exec, exec_type, file_type, vendor_file_type;
+init_daemon_domain(dptf);
+
+# Need to use vendor binder
+vndbinder_use(dptf)
+binder_call(dptf, hal_thermal_default)
+
+# Allow dptf to find the thermal_hal_service service
+allow dptf thermal_hal_service:service_manager find;
+
+# Allow raw socket
+# Also requires DAC changes in device/intel/common/filesystem_config/android_filesystem_config.h
+allow dptf self:capability { net_raw };
+
+# Allow network access for DPTF UI
+net_domain(dptf)
+
+# Allow create and listen to uevent socket
+allow dptf self:netlink_kobject_uevent_socket create_socket_perms;
+allowxperm dptf self:netlink_kobject_uevent_socket ioctl SIOCETHTOOL;
+
+# Vendor directory
+# /vendor/lib64
+# /vendor/app and /vendor/etc/dptf/dv direcroty
+allow dptf vendor_file:dir r_dir_perms;
+allow dptf vendor_file:file rx_file_perms;
+
+# Data directory
+allow dptf dptf_data_file:dir create_dir_perms;
+allow dptf dptf_data_file:file create_file_perms;
+
+#
+# Sysfs files
+#
+allow dptf sysfs:dir r_dir_perms;
+allow dptf sysfs_devices_system_cpu:file rw_file_perms;
+allow dptf sysfs_powercap:{ file lnk_file } rw_file_perms;
+allow dptf sysfs_powercap:dir { read open search};
+allow dptf sysfs_powercap:dir r_dir_perms;
+allow dptf sysfs_dptf_file:dir r_dir_perms;
+allow dptf sysfs_dptf_file:file rw_file_perms;
+allow dptf sysfs_thermal_management:dir r_dir_perms;
+allow dptf sysfs_thermal_management:file rw_file_perms;
+allow dptf sysfs_thermal:file r_file_perms;
+allow dptf sysfs_thermal:file w_file_perms;
+
+# /sys/class/backlight/intel_backlight/brigthness
+# /sys/class/power_supply/bq*/max_charge_current
+allow dptf sysfs:file rw_file_perms;
+
+# Set properties
+set_prop(dptf, powerctl_prop)
diff --git a/sepolicy/thermal/dptf/file.te b/sepolicy/thermal/dptf/file.te
new file mode 100644
index 000000000..08c3e1f08
--- /dev/null
+++ b/sepolicy/thermal/dptf/file.te
@@ -0,0 +1,2 @@
+type dptf_data_file, file_type, data_file_type;
+type sysfs_dptf_file, fs_type, sysfs_type;
diff --git a/sepolicy/thermal/dptf/file_contexts b/sepolicy/thermal/dptf/file_contexts
new file mode 100644
index 000000000..ec1606f2c
--- /dev/null
+++ b/sepolicy/thermal/dptf/file_contexts
@@ -0,0 +1,4 @@
+/data/misc/dptf(/.*)?           u:object_r:dptf_data_file:s0
+/etc/dptf(/.*)?                 u:object_r:dptf_data_file:s0
+(/system)?/vendor/bin/esif_ufd  u:object_r:dptf_exec:s0
+/vendor/bin/thermal_lite        u:object_r:thermal_lite_exec:s0
diff --git a/sepolicy/thermal/dptf/system_server.te b/sepolicy/thermal/dptf/system_server.te
new file mode 100644
index 000000000..c41f88a66
--- /dev/null
+++ b/sepolicy/thermal/dptf/system_server.te
@@ -0,0 +1,6 @@
+# permission needed for sensor service to access thermal sensors
+allow system_server sysfs_thermal_management:dir rw_dir_perms;
+allow system_server sysfs_thermal_management:file rw_file_perms;
+#for last_reboot_reason
+allow system_server reboot_data_file:dir rw_dir_perms;
+allow system_server reboot_data_file:file rw_file_perms;
diff --git a/sepolicy/thermal/dptf/thermal_lite.te b/sepolicy/thermal/dptf/thermal_lite.te
new file mode 100644
index 000000000..478dea7b3
--- /dev/null
+++ b/sepolicy/thermal/dptf/thermal_lite.te
@@ -0,0 +1,17 @@
+#
+# thermal_lite
+#
+
+type thermal_lite, domain;
+type thermal_lite_exec, exec_type, file_type, vendor_file_type;
+init_daemon_domain(thermal_lite)
+
+allow thermal_lite sysfs:dir r_dir_perms;
+allow thermal_lite sysfs_thermal_management:dir r_dir_perms;
+allow thermal_lite sysfs_thermal_management:file r_file_perms;
+allow thermal_lite sysfs_powercap:file rw_file_perms;
+allow thermal_lite sysfs_powercap:dir r_dir_perms;
+allow thermal_lite sysfs_thermal:file rw_file_perms;
+
+# properties
+set_prop(thermal_lite, powerctl_prop)
diff --git a/sepolicy/thermal/file.te b/sepolicy/thermal/file.te
new file mode 100644
index 000000000..3a8ebd1e4
--- /dev/null
+++ b/sepolicy/thermal/file.te
@@ -0,0 +1,2 @@
+type sysfs_thermal_management, fs_type, sysfs_type;
+type sysfs_powercap, fs_type, sysfs_type;
diff --git a/sepolicy/thermal/file_contexts b/sepolicy/thermal/file_contexts
new file mode 100644
index 000000000..02d7664ac
--- /dev/null
+++ b/sepolicy/thermal/file_contexts
@@ -0,0 +1,12 @@
+/sys/devices/virtual/thermal/thermal_zone[0-9]/trip_point_[0-9]_temp u:object_r:sysfs_thermal:s0
+/sys/devices/virtual/thermal/cooling_device[0-9]/cur_state u:object_r:sysfs_thermal:s0
+/sys/devices/virtual/thermal/thermal_zone[0-9]/policy u:object_r:sysfs_thermal:s0
+/sys/devices/virtual/thermal/thermal_zone[0-9]/temp u:object_r:sysfs_thermal:s0
+/sys/devices/system/cpu/cpu[0-4]/cpufreq/thermal_scaling_max_freq u:object_r:sysfs_thermal:s0
+
+/dev/acpi_thermal_rel       u:object_r:thermal_device:s0
+
+# thermal management
+/sys/devices/platform/coretemp.0(/.*)? u:object_r:sysfs_thermal_management:s0
+/sys/devices/virtual/thermal(/.*)?     u:object_r:sysfs_thermal_management:s0
+/sys/devices/virtual/powercap(/.*)?  u:object_r:sysfs_powercap:s0
diff --git a/sepolicy/thermal/hal_sensors_sefault.te b/sepolicy/thermal/hal_sensors_sefault.te
new file mode 100644
index 000000000..63e24751b
--- /dev/null
+++ b/sepolicy/thermal/hal_sensors_sefault.te
@@ -0,0 +1,4 @@
+allow hal_sensors_default sysfs_thermal_management:dir r_dir_perms;
+allow hal_sensors_default sysfs_thermal_management:file rw_file_perms;
+
+allow system_server system_app:file w_file_perms;
diff --git a/sepolicy/thermal/hal_thermal_default.te b/sepolicy/thermal/hal_thermal_default.te
new file mode 100644
index 000000000..9f65440de
--- /dev/null
+++ b/sepolicy/thermal/hal_thermal_default.te
@@ -0,0 +1,15 @@
+#============= hal_thermal_default ==============
+vndbinder_use(hal_thermal_default)
+
+add_service(hal_thermal_default, thermal_hal_service)
+
+allow hal_thermal_default thermal_hal_service:hwservice_manager find;
+allow hal_thermal_default sysfs_thermal_management:dir r_dir_perms;
+allow hal_thermal_default sysfs_thermal:file r_file_perms;
+allow hal_thermal_default proc_stat:file r_file_perms;
+allow hal_thermal_default self:can_socket create_socket_perms;
+allowxperm hal_thermal_default self:can_socket ioctl {
+  SIOCGIFINDEX
+  SIOCSIFNAME
+  SIOCSIFFLAGS
+};
diff --git a/sepolicy/thermal/platform_app.te b/sepolicy/thermal/platform_app.te
new file mode 100644
index 000000000..57625dcd4
--- /dev/null
+++ b/sepolicy/thermal/platform_app.te
@@ -0,0 +1,7 @@
+#
+# platform_app
+#
+
+# XXX Did the thermal apps drop out of the system app domain?
+allow platform_app sysfs_powercap:dir search;
+allow platform_app sysfs_powercap:file r_file_perms;
diff --git a/sepolicy/thermal/system_app.te b/sepolicy/thermal/system_app.te
new file mode 100644
index 000000000..882d0f643
--- /dev/null
+++ b/sepolicy/thermal/system_app.te
@@ -0,0 +1,22 @@
+#
+# system_app.te
+#
+
+# XXX Not sure which app this is for, so common for now
+allow system_app sysfs_thermal:file rw_file_perms;
+allow system_app thermal_device:chr_file rw_file_perms;
+allow system_app sysfs_thermal_management:{ file lnk_file } rw_file_perms;
+allow system_app sysfs_thermal_management:dir {read open search };
+allow system_app sysfs_devices_system_cpu:file rw_file_perms;
+allow system_app kernel:capability net_admin;
+
+allow system_app sysfs_powercap:{ file lnk_file } rw_file_perms;
+allow system_app sysfs_powercap:dir r_dir_perms;
+
+module_only(`camera_ipu2', `
+  set_prop(system_app, cam_flash_thrtl_prop)
+')
+
+module_only(`camera_ipu4', `
+  set_prop(system_app, cam_flash_thrtl_prop)
+')
diff --git a/sepolicy/thermal/ueventd.te b/sepolicy/thermal/ueventd.te
new file mode 100644
index 000000000..8074fec75
--- /dev/null
+++ b/sepolicy/thermal/ueventd.te
@@ -0,0 +1,6 @@
+#
+# ueventd
+#
+
+allow ueventd sysfs_thermal_management:file rw_file_perms;
+allow ueventd sysfs_powercap:file w_file_perms;
diff --git a/sepolicy/thermal/vndservice.te b/sepolicy/thermal/vndservice.te
new file mode 100644
index 000000000..18b2e46be
--- /dev/null
+++ b/sepolicy/thermal/vndservice.te
@@ -0,0 +1 @@
+type thermal_hal_service,    vndservice_manager_type;
diff --git a/sepolicy/thermal/vndservice_contexts b/sepolicy/thermal/vndservice_contexts
new file mode 100644
index 000000000..8ed48541e
--- /dev/null
+++ b/sepolicy/thermal/vndservice_contexts
@@ -0,0 +1 @@
+thermal.hal.service    u:object_r:thermal_hal_service:s0
diff --git a/sepolicy/wlan/iwlwifi/file_contexts b/sepolicy/wlan/iwlwifi/file_contexts
new file mode 100644
index 000000000..b678c7ca6
--- /dev/null
+++ b/sepolicy/wlan/iwlwifi/file_contexts
@@ -0,0 +1 @@
+/system/bin/wlan_intel_restore.sh  u:object_r:wlan_intel_restore_exec:s0
diff --git a/sepolicy/wlan/iwlwifi/wlan_intel_restore.te b/sepolicy/wlan/iwlwifi/wlan_intel_restore.te
new file mode 100644
index 000000000..22964bf67
--- /dev/null
+++ b/sepolicy/wlan/iwlwifi/wlan_intel_restore.te
@@ -0,0 +1,27 @@
+#
+# wlan_intel_restore - does what?
+#
+
+type wlan_intel_restore, domain;
+type wlan_intel_restore_exec, file_type, exec_type, vendor_file_type;
+
+init_daemon_domain(wlan_intel_restore)
+
+# Execute as a script and run toolbox and system commands
+allow wlan_intel_restore system_file:file rx_file_perms;
+
+allow wlan_intel_restore block_device:dir search;
+
+module_only(`config_partition', `
+  allow wlan_intel_restore config_file:dir rw_dir_perms;
+  allow wlan_intel_restore config_file:file r_file_perms;
+')
+
+not_full_treble(`
+  allow rfkill shell_exec:file rx_file_perms;
+  allow rfkill toolbox_exec:file rx_file_perms;
+')
+full_treble_only(`
+  allow rfkill vendor_shell_exec:file rx_file_perms;
+  allow rfkill vendor_toolbox_exec:file rx_file_perms;
+')

From 52dcae122382da9130f66fc95a97d9763ab909eb Mon Sep 17 00:00:00 2001
From: "K, Gururaj" <gururaj.k@intel.com>
Date: Mon, 18 Dec 2017 16:00:31 +0530
Subject: [PATCH 159/427] config: Enable support for external usb 3.x hub

adds support for external super-speed hub; including
HP type-C dock.
Matches kernel configuration with Ubuntu LTS wrt USB HCD

Jira: None
Test: None
Signed-off-by: K, Gururaj <gururaj.k@intel.com>
---
 kernel_config/kernel_64_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index a0cb5be0b..08a6d152f 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -4986,21 +4986,21 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_EHCI_PCI=y
-# CONFIG_USB_EHCI_HCD_PLATFORM is not set
+CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_OXU210HP_HCD=y
 CONFIG_USB_ISP116X_HCD=y
 CONFIG_USB_ISP1362_HCD=y
 # CONFIG_USB_FOTG210_HCD is not set
-# CONFIG_USB_MAX3421_HCD is not set
+CONFIG_USB_MAX3421_HCD=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PCI=y
-# CONFIG_USB_OHCI_HCD_PLATFORM is not set
+CONFIG_USB_OHCI_HCD_PLATFORM=y
 CONFIG_USB_UHCI_HCD=y
 CONFIG_USB_SL811_HCD=y
 CONFIG_USB_SL811_HCD_ISO=y
 # CONFIG_USB_SL811_CS is not set
 # CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_HCD_BCMA is not set
+CONFIG_USB_HCD_BCMA=m
 # CONFIG_USB_HCD_SSB is not set
 # CONFIG_USB_HCD_TEST_MODE is not set
 

From 6a5cba79b97f9b01c849dcc38c116fbf2829fffc Mon Sep 17 00:00:00 2001
From: "Shen, Zhita" <zhitax.shen@intel.com>
Date: Fri, 12 Jan 2018 14:56:42 +0800
Subject: [PATCH 160/427] [AIA-O]Add sepolicy for crashlogd

The patch allow crashlogd start automatically

Jira: https://jira01.devtools.intel.com/browse/OAM-53653
Test: Tests on KBL_NUC

Signed-off-by: Shen, ZhitaX zhitax.shen@intel.com
---
 sepolicy/crashlogd/crashlogd.te         | 40 +++++++++++++++++++++++++
 sepolicy/crashlogd/dumpstate.te         |  6 ++++
 sepolicy/crashlogd/dumpstate_dropbox.te | 27 +++++++++++++++++
 sepolicy/crashlogd/file_contexts        |  5 ++++
 sepolicy/crashlogd/property.te          |  1 +
 sepolicy/crashlogd/property_contexts    |  2 ++
 sepolicy/crashlogd/shell.te             |  5 ++++
 sepolicy/crashlogd/system_app.te        |  8 +++++
 sepolicy/crashlogd/system_server.te     |  5 ++++
 sepolicy/debug-logs/dumpstate.te        |  5 ++++
 sepolicy/debug-logs/file.te             |  1 +
 sepolicy/debug-logs/file_contexts       | 14 +++++++++
 sepolicy/debug-logs/logsvc.te           | 34 +++++++++++++++++++++
 sepolicy/debug-logs/nfc.te              |  5 ++++
 sepolicy/debug-logs/system_app.te       |  7 +++++
 sepolicy/debug-logs/vdc.te              |  2 ++
 sepolicy/debugfs/dumpstate.te           |  1 +
 sepolicy/debugfs/file_contexts          |  2 +-
 sepolicy/device.te                      |  8 +++++
 sepolicy/domain.te                      |  2 ++
 sepolicy/file.te                        | 11 +++++++
 sepolicy/init.te                        | 33 ++++++++++++++++++++
 sepolicy/logd.te                        |  1 +
 sepolicy/shell.te                       |  4 +++
 24 files changed, 228 insertions(+), 1 deletion(-)
 create mode 100644 sepolicy/crashlogd/crashlogd.te
 create mode 100644 sepolicy/crashlogd/dumpstate.te
 create mode 100644 sepolicy/crashlogd/dumpstate_dropbox.te
 create mode 100644 sepolicy/crashlogd/file_contexts
 create mode 100644 sepolicy/crashlogd/property.te
 create mode 100644 sepolicy/crashlogd/property_contexts
 create mode 100644 sepolicy/crashlogd/shell.te
 create mode 100644 sepolicy/crashlogd/system_app.te
 create mode 100644 sepolicy/crashlogd/system_server.te
 create mode 100644 sepolicy/debug-logs/dumpstate.te
 create mode 100644 sepolicy/debug-logs/file.te
 create mode 100644 sepolicy/debug-logs/file_contexts
 create mode 100644 sepolicy/debug-logs/logsvc.te
 create mode 100644 sepolicy/debug-logs/nfc.te
 create mode 100644 sepolicy/debug-logs/system_app.te
 create mode 100644 sepolicy/debug-logs/vdc.te
 create mode 100644 sepolicy/device.te
 create mode 100644 sepolicy/domain.te
 create mode 100644 sepolicy/file.te
 create mode 100644 sepolicy/init.te
 create mode 100644 sepolicy/logd.te
 create mode 100644 sepolicy/shell.te

diff --git a/sepolicy/crashlogd/crashlogd.te b/sepolicy/crashlogd/crashlogd.te
new file mode 100644
index 000000000..266036109
--- /dev/null
+++ b/sepolicy/crashlogd/crashlogd.te
@@ -0,0 +1,40 @@
+userdebug_or_eng(`
+  # Rules for crashlogd
+  type crashlogd, domain;
+  type crashlogd_exec, exec_type, file_type;
+  init_daemon_domain(crashlogd)
+  permissive crashlogd;
+
+  typeattribute crashlogd mlstrustedsubject;
+
+  #For silence only
+  dontaudit crashlogd self:capability_class_set *;
+  dontaudit crashlogd kernel:security *;
+  dontaudit crashlogd kernel:system *;
+  dontaudit crashlogd self:memprotect *;
+  dontaudit crashlogd domain:process *;
+  dontaudit crashlogd domain:fd *;
+  dontaudit crashlogd domain:dir r_dir_perms;
+  dontaudit crashlogd domain:lnk_file r_file_perms;
+  dontaudit crashlogd domain:{ fifo_file file } rw_file_perms;
+  dontaudit crashlogd domain:socket_class_set *;
+  dontaudit crashlogd domain:ipc_class_set *;
+  dontaudit crashlogd domain:key *;
+  dontaudit crashlogd fs_type:filesystem *;
+  dontaudit crashlogd fs_type:dir_file_class_set *;
+  dontaudit crashlogd dev_type:dir_file_class_set *;
+  dontaudit crashlogd file_type:dir_file_class_set *;
+  dontaudit crashlogd node_type:node *;
+  dontaudit crashlogd node_type:{ tcp_socket udp_socket } node_bind;
+  dontaudit crashlogd netif_type:netif *;
+  dontaudit crashlogd port_type:socket_class_set name_bind;
+  dontaudit crashlogd port_type:{ tcp_socket dccp_socket } name_connect;
+  dontaudit crashlogd domain:peer recv;
+  dontaudit crashlogd domain:binder *;
+  dontaudit crashlogd property_type:property_service *;
+  dontaudit crashlogd property_type:file *;
+  # dontaudit crashlogd domain:debuggerd *;
+  dontaudit crashlogd service_manager_type:service_manager *;
+
+  binder_use(crashlogd);
+')
diff --git a/sepolicy/crashlogd/dumpstate.te b/sepolicy/crashlogd/dumpstate.te
new file mode 100644
index 000000000..0797460ab
--- /dev/null
+++ b/sepolicy/crashlogd/dumpstate.te
@@ -0,0 +1,6 @@
+allow dumpstate block_device:blk_file getattr;
+allow dumpstate config_file:dir r_dir_perms;
+allow dumpstate crashlogd:process signal;
+allow dumpstate debugfs_graphics_sync:dir r_dir_perms;
+allow dumpstate kernel:system module_request;
+allow dumpstate self:netlink_xfrm_socket create;
diff --git a/sepolicy/crashlogd/dumpstate_dropbox.te b/sepolicy/crashlogd/dumpstate_dropbox.te
new file mode 100644
index 000000000..a1de12457
--- /dev/null
+++ b/sepolicy/crashlogd/dumpstate_dropbox.te
@@ -0,0 +1,27 @@
+userdebug_or_eng(`
+  type dumpstate_dropbox, domain;
+  type dumpstate_dropbox_exec, exec_type, file_type;
+
+  domain_auto_trans(init, dumpstate_dropbox_exec, dumpstate_dropbox)
+
+  permissive dumpstate_dropbox;
+
+  allow dumpstate_dropbox self:capability { chown dac_override };
+  allow dumpstate_dropbox system_server:binder call;
+
+  allow domain dumpstate_dropbox:fd use;
+
+  allow dumpstate_dropbox dropbox_service:service_manager find;
+
+  binder_use(dumpstate_dropbox);
+  binder_call(system_server, dumpstate_dropbox);
+  set_prop(dumpstate_dropbox, ctl_dumpstate_prop)
+  unix_socket_connect(dumpstate_dropbox, dumpstate, dumpstate)
+
+  # Execute shell scripts, toolbox and system bin files.
+  allow dumpstate_dropbox toolbox_exec:file rx_file_perms;
+  allow dumpstate_dropbox shell_exec:file rx_file_perms;
+  allow dumpstate_dropbox system_file:file rx_file_perms;
+  allow dumpstate_dropbox system_data_file:dir { add_name write };
+
+')
diff --git a/sepolicy/crashlogd/file_contexts b/sepolicy/crashlogd/file_contexts
new file mode 100644
index 000000000..41ac72fb5
--- /dev/null
+++ b/sepolicy/crashlogd/file_contexts
@@ -0,0 +1,5 @@
+# Crashlogd executable
+(/system)?/vendor/bin/crashlogd u:object_r:crashlogd_exec:s0
+
+# Dumpstate dropbox script
+(/system)?/vendor/bin/dumpstate_dropbox.sh u:object_r:dumpstate_dropbox_exec:s0
diff --git a/sepolicy/crashlogd/property.te b/sepolicy/crashlogd/property.te
new file mode 100644
index 000000000..e12565229
--- /dev/null
+++ b/sepolicy/crashlogd/property.te
@@ -0,0 +1 @@
+type crashlogd_prop, property_type;
diff --git a/sepolicy/crashlogd/property_contexts b/sepolicy/crashlogd/property_contexts
new file mode 100644
index 000000000..c2715194d
--- /dev/null
+++ b/sepolicy/crashlogd/property_contexts
@@ -0,0 +1,2 @@
+# user changable crashlogd properties
+persist.crashlogd.          u:object_r:crashlogd_prop:s0
diff --git a/sepolicy/crashlogd/shell.te b/sepolicy/crashlogd/shell.te
new file mode 100644
index 000000000..8b54073a4
--- /dev/null
+++ b/sepolicy/crashlogd/shell.te
@@ -0,0 +1,5 @@
+# enable the change of crashlog properties
+userdebug_or_eng(`
+  set_prop(shell, crashlogd_prop)
+')
+
diff --git a/sepolicy/crashlogd/system_app.te b/sepolicy/crashlogd/system_app.te
new file mode 100644
index 000000000..cdde78261
--- /dev/null
+++ b/sepolicy/crashlogd/system_app.te
@@ -0,0 +1,8 @@
+#
+# system_app
+#
+
+get_prop(system_app, crashlogd_prop)
+
+allow system_app debugfs:dir r_dir_perms;
+
diff --git a/sepolicy/crashlogd/system_server.te b/sepolicy/crashlogd/system_server.te
new file mode 100644
index 000000000..0fd69e865
--- /dev/null
+++ b/sepolicy/crashlogd/system_server.te
@@ -0,0 +1,5 @@
+userdebug_or_eng(`
+  binder_call(system_server, crashlogd);
+  allow system_server crashlogd:fifo_file w_file_perms;
+  allow system_server dumpstate_dropbox:fifo_file w_file_perms;
+')
diff --git a/sepolicy/debug-logs/dumpstate.te b/sepolicy/debug-logs/dumpstate.te
new file mode 100644
index 000000000..84a6ae548
--- /dev/null
+++ b/sepolicy/debug-logs/dumpstate.te
@@ -0,0 +1,5 @@
+#
+# dumpstate
+#
+
+allow dumpstate log_file:file r_file_perms;
diff --git a/sepolicy/debug-logs/file.te b/sepolicy/debug-logs/file.te
new file mode 100644
index 000000000..0e3c0d2f3
--- /dev/null
+++ b/sepolicy/debug-logs/file.te
@@ -0,0 +1 @@
+type log_file, mlstrustedobject, file_type;
diff --git a/sepolicy/debug-logs/file_contexts b/sepolicy/debug-logs/file_contexts
new file mode 100644
index 000000000..3ed4b3c94
--- /dev/null
+++ b/sepolicy/debug-logs/file_contexts
@@ -0,0 +1,14 @@
+# earlylogs entry point script
+(/system)?/vendor/bin/elogs.sh     u:object_r:logsvc_exec:s0
+
+(/system)?/vendor/bin/start_log_srv.sh  u:object_r:logsvc_exec:s0
+
+# ap[k]_logfs entry point script
+# this is also used by debug-npk, which is dependent on debug-logs
+(/system)?/vendor/bin/logcat_ep.sh      u:object_r:logsvc_exec:s0
+
+# earlylogs logs target
+/cache/elogs(/.*)?              u:object_r:log_file:s0
+
+# Logs
+/data/logs(/.*)?                u:object_r:log_file:s0
diff --git a/sepolicy/debug-logs/logsvc.te b/sepolicy/debug-logs/logsvc.te
new file mode 100644
index 000000000..2ca07f367
--- /dev/null
+++ b/sepolicy/debug-logs/logsvc.te
@@ -0,0 +1,34 @@
+# Rules for debug-logs specific services
+type logsvc, domain;
+type logsvc_exec, exec_type, file_type;
+
+init_daemon_domain(logsvc);
+
+allow logsvc system_file:file x_file_perms;
+allow logsvc shell_exec:file rx_file_perms;
+
+allow logsvc self:capability { dac_override sys_nice };
+allow logsvc self:capability2 syslog;
+
+allow logsvc log_file:file create_file_perms;
+allow logsvc log_file:dir rw_dir_perms;
+
+allow logsvc logdr_socket:sock_file write;
+allow logsvc logd:unix_stream_socket connectto;
+
+allow logsvc kmsg_device:chr_file { open read };
+allow logsvc kernel:system syslog_read;
+
+set_prop(logsvc, system_prop)
+set_prop(logsvc, ctl_default_prop)
+
+allow logsvc logsvc_exec:file execute_no_trans;
+
+allow logsvc logcat_exec:file execute_no_trans;
+allow logsvc logcat_exec:file rx_file_perms;
+
+# Execute toolbox/toybox commands
+allow logsvc toolbox_exec:file rx_file_perms;
+ 
+allow logsvc cache_file:dir r_dir_perms;
+allow logsvc cache_file:file r_file_perms;
diff --git a/sepolicy/debug-logs/nfc.te b/sepolicy/debug-logs/nfc.te
new file mode 100644
index 000000000..ef12e4a32
--- /dev/null
+++ b/sepolicy/debug-logs/nfc.te
@@ -0,0 +1,5 @@
+#
+# nfc
+#
+
+allow nfc log_file:file write;
diff --git a/sepolicy/debug-logs/system_app.te b/sepolicy/debug-logs/system_app.te
new file mode 100644
index 000000000..806ee693c
--- /dev/null
+++ b/sepolicy/debug-logs/system_app.te
@@ -0,0 +1,7 @@
+#
+# system_app
+#
+
+allow system_app log_file:dir create_dir_perms;
+allow system_app log_file:file create_file_perms;
+allow system_app log_file:filesystem getattr;
diff --git a/sepolicy/debug-logs/vdc.te b/sepolicy/debug-logs/vdc.te
new file mode 100644
index 000000000..d0a33993f
--- /dev/null
+++ b/sepolicy/debug-logs/vdc.te
@@ -0,0 +1,2 @@
+allow vdc log_file:dir r_dir_perms;
+allow vdc log_file:file r_file_perms;
diff --git a/sepolicy/debugfs/dumpstate.te b/sepolicy/debugfs/dumpstate.te
index d012fdf54..6f50c8958 100644
--- a/sepolicy/debugfs/dumpstate.te
+++ b/sepolicy/debugfs/dumpstate.te
@@ -2,4 +2,5 @@
 # dumpstate
 #
 
+allow dumpstate debugfs_graphics_sync:file r_file_perms;
 dontaudit dumpstate debugfs_graphics_sync:file r_file_perms;
diff --git a/sepolicy/debugfs/file_contexts b/sepolicy/debugfs/file_contexts
index 5ab0695dd..971842b24 100644
--- a/sepolicy/debugfs/file_contexts
+++ b/sepolicy/debugfs/file_contexts
@@ -1 +1 @@
-/sys/kernel/debug/sync      u:object_r:debugfs_graphics_sync:s0
+/sys/kernel/debug/sync(/.*)?      u:object_r:debugfs_graphics_sync:s0
diff --git a/sepolicy/device.te b/sepolicy/device.te
new file mode 100644
index 000000000..1e08949c8
--- /dev/null
+++ b/sepolicy/device.te
@@ -0,0 +1,8 @@
+type sw_sync_device, dev_type;
+type persist_block_device, dev_type;
+type rpmb_block_device, dev_type;
+type cros_ec_device, dev_type;
+type hidraw_device, dev_type;
+type host1x_device, dev_type, mlstrustedobject;
+type rfkill_device, dev_type;
+type config_block_device, dev_type;
diff --git a/sepolicy/domain.te b/sepolicy/domain.te
new file mode 100644
index 000000000..bddbd2f93
--- /dev/null
+++ b/sepolicy/domain.te
@@ -0,0 +1,2 @@
+allow domain sysfs_socinfo:dir r_dir_perms;
+allow domain sysfs_socinfo:file r_file_perms;
diff --git a/sepolicy/file.te b/sepolicy/file.te
new file mode 100644
index 000000000..7bfa91175
--- /dev/null
+++ b/sepolicy/file.te
@@ -0,0 +1,11 @@
+type bluetooth_control, dev_type;
+type sysfs_bluetooth, fs_type, sysfs_type;
+type sysfs_thermal_uevent, fs_type, sysfs_type;
+type sysfs_thermal_writable, fs_type, sysfs_type;
+type atvr_device, dev_type;
+type sysfs_coretemp, fs_type, sysfs_type;
+type gpu_pid_stats_file, fs_type, debugfs_type;
+type sysfs_socinfo, sysfs_type, fs_type;
+type config_file, file_type, data_file_type;
+type debugfs_pstate, fs_type, debugfs_type;
+type sysfs_app_readable, fs_type, sysfs_type;
diff --git a/sepolicy/init.te b/sepolicy/init.te
new file mode 100644
index 000000000..b459b0661
--- /dev/null
+++ b/sepolicy/init.te
@@ -0,0 +1,33 @@
+allow init kmsg_device:chr_file write;
+allow init tmpfs:file { open };
+allow init tmpfs:lnk_file { create setattr };
+allow init debugfs:dir mounton;
+allow init kernel:system module_request;
+allow init system_file:system module_load;
+allow init gpu_device:file { setattr relabelto };
+allow init tmpfs:file { relabelfrom };
+allow init init:capability sys_module;
+allow init device:chr_file { create unlink };
+allow init proc:dir mounton;
+allow init binfmt_miscfs:file w_file_perms;
+allow init tmpfs:lnk_file create_file_perms;
+# set attributes on /sys/class/gpio sym link
+# chmod 0770 /sys/class/gpio/gpio66
+allow init sysfs:lnk_file setattr;
+allow init sysfs:dir { write add_name };
+# userspace cannot create files in sys. ignore denial
+dontaudit init sysfs_devices_system_cpu:dir write;
+allow init { cache_file storage_file }:dir mounton;
+# /config
+allow init configfs:{ file lnk_file } create_file_perms;
+allow init cgroup:file create;
+allow init sw_sync_device:file { relabelto setattr read write open ioctl };
+allow init sysfs:file create;
+allow init devpts:chr_file { ioctl };
+allow init audio_device:chr_file { write ioctl };
+allow init platform_app:unix_stream_socket { read };
+
+allow init debugfs_pstate:file w_file_perms;
+allow init userdata_block_device:blk_file write;
+allow init misc_block_device:blk_file write;
+allow init kernel:key search;
diff --git a/sepolicy/logd.te b/sepolicy/logd.te
new file mode 100644
index 000000000..46482b45b
--- /dev/null
+++ b/sepolicy/logd.te
@@ -0,0 +1 @@
+allow logd logd:capability dac_override;
diff --git a/sepolicy/shell.te b/sepolicy/shell.te
new file mode 100644
index 000000000..62ae1bddd
--- /dev/null
+++ b/sepolicy/shell.te
@@ -0,0 +1,4 @@
+allow shell efs_file:dir search;
+allow shell efs_file:file r_file_perms;
+allow shell bluetooth_efs_file:dir search;
+allow shell bluetooth_efs_file:file r_file_perms;

From a611d5bb31828d641fe2945ee07f56234be1bd87 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Fri, 12 Jan 2018 13:18:52 +0530
Subject: [PATCH 161/427] [AIA-O] Mixin up

Add sepolicy for crashlogd

Jira: None
Test: None
---
 androidia_64/device.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 05079f587..c32128d5e 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -471,7 +471,7 @@ endif
 
 ifeq ($(MIXIN_DEBUG_LOGS),true)
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.crashlogd.data_quota=50
-BOARD_SEPOLICY_DIRS += device/intel/sepolicy/crashlogd
+BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/crashlogd
 
 CRASHLOGD_LOGS_PATH := "/data/logs"
 CRASHLOGD_APLOG := true

From bdd1d98e649b6e5e0d43244c891d408a9bb1500d Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Fri, 12 Jan 2018 14:05:17 +0530
Subject: [PATCH 162/427] [AIA-O] Resolve sepolicy compilation issue

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 sepolicy/device.te | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sepolicy/device.te b/sepolicy/device.te
index 1e08949c8..1c4826181 100644
--- a/sepolicy/device.te
+++ b/sepolicy/device.te
@@ -4,5 +4,4 @@ type rpmb_block_device, dev_type;
 type cros_ec_device, dev_type;
 type hidraw_device, dev_type;
 type host1x_device, dev_type, mlstrustedobject;
-type rfkill_device, dev_type;
 type config_block_device, dev_type;

From 3cea11f41bea088c9eda1c25ead4ca1f5e89c21c Mon Sep 17 00:00:00 2001
From: swei22 <w.sheng@intel.com>
Date: Tue, 26 Dec 2017 14:13:44 +0800
Subject: [PATCH 163/427] Enable trusty on Android-IA

Enable trusty flag and tos_partition flag for Android-IA
Enable trusty driver build
Add sepolicy for trusty
Add tos partition in flash.json

Jira: None
Jira: Device boots to home screen
Signed-off-by: swei22 <w.sheng@intel.com>
---
 androidia_64/flash.json           | 38 +++++++++++++++++++++++++++++++
 androidia_64/installer.cmd        |  1 +
 androidia_64/mixins.spec          |  3 ++-
 kernel_config/kernel_64_defconfig |  8 +++++++
 sepolicy/trusty/file_contexts     |  9 ++++++++
 sepolicy/trusty/gatekeeperd.te    |  3 +++
 sepolicy/trusty/storageproxyd.te  | 11 +++++++++
 7 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 sepolicy/trusty/file_contexts
 create mode 100644 sepolicy/trusty/gatekeeperd.te
 create mode 100644 sepolicy/trusty/storageproxyd.te

diff --git a/androidia_64/flash.json b/androidia_64/flash.json
index 4372fe34c..c38ebb783 100644
--- a/androidia_64/flash.json
+++ b/androidia_64/flash.json
@@ -65,6 +65,22 @@
                 "timeout": 60000, 
                 "tool": "fastboot"
             }, 
+            {
+                "args": "flash tos ${tos}", 
+                "description": "Flash tos partition", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "update"
+                ], 
+                "retry": 1, 
+                "timeout": 60000, 
+                "tool": "fastboot"
+            }, 
             {
                 "args": "flash system ${system}", 
                 "description": "Flash system partition", 
@@ -346,6 +362,22 @@
                 "timeout": 60000, 
                 "tool": "fastboot"
             }, 
+            {
+                "args": "flash tos ${tos}", 
+                "description": "Flash tos partition", 
+                "mandatory": true, 
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV", 
+                    "expression": "${battery} >= 3500", 
+                    "skipOnFailure": false
+                }, 
+                "restrict": [
+                    "blank"
+                ], 
+                "retry": 1, 
+                "timeout": 60000, 
+                "tool": "fastboot"
+            }, 
             {
                 "args": "flash system ${system}", 
                 "description": "Flash system partition", 
@@ -498,6 +530,12 @@
                 "type": "file", 
                 "value": "factory.img"
             }, 
+            "tos": {
+                "description": "tos.img", 
+                "name": "tos", 
+                "type": "file", 
+                "value": "tos.img"
+            }, 
             "system": {
                 "description": "system.img", 
                 "name": "system", 
diff --git a/androidia_64/installer.cmd b/androidia_64/installer.cmd
index 48a3937e8..8abe9b72a 100644
--- a/androidia_64/installer.cmd
+++ b/androidia_64/installer.cmd
@@ -17,6 +17,7 @@ flash recovery recovery.img
 flash system system.img
 flash factory factory.img
 flash bootloader bootloader
+flash tos tos.img
 flashing lock
 continue
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index 5f75029f6..b8e62b8be 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -19,7 +19,7 @@ usb-gadget: g_ffs
 adb_net: true
 kernel: android_ia(loglevel=3, disable_cpuidle_on_boot=true)
 bluetooth: btusb
-boot-arch: android_ia(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true)
+boot-arch: android_ia(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true)
 audio: android_ia
 wlan: iwlwifi
 cpu-arch: skl
@@ -39,6 +39,7 @@ debug-phonedoctor: true
 debug-tools: true
 flashfiles: ini(oemvars=false,version=3.0,fastboot_min_battery_level=3500,installer=true)
 midi: true
+trusty: true
 slcan: default
 ioc-slcan-reboot: false
 camera: usbcamera
diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 08a6d152f..9f3706b2e 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -7052,6 +7052,14 @@ CONFIG_MODULE_SIG_SHA512=y
 CONFIG_MODULE_SIG_HASH="sha512"
 CONFIG_MODULE_SIG_KEY="certs/signing_key.pem"
 
+#
+# Trusty
+#
+CONFIG_TRUSTY=y
+CONFIG_TRUSTY_LOG=y
+CONFIG_TRUSTY_VIRTIO=y
+CONFIG_TRUSTY_VIRTIO_IPC=y
+
 ## Android recommended configs
 CONFIG_ANDROID_TIMED_GPIO=y
 CONFIG_ARM_KERNMEM_PERMS=y
diff --git a/sepolicy/trusty/file_contexts b/sepolicy/trusty/file_contexts
new file mode 100644
index 000000000..c91d78174
--- /dev/null
+++ b/sepolicy/trusty/file_contexts
@@ -0,0 +1,9 @@
+# Trusty ipc device
+/dev/trusty-ipc-dev0    u:object_r:tee_device:s0
+# Trusty rpmb device
+/dev/rpmb[01]           u:object_r:tee_device:s0
+
+/system/vendor/bin/intelstorageproxyd    u:object_r:tee_exec:s0
+/vendor/bin/intelstorageproxyd    u:object_r:tee_exec:s0
+
+/data/misc/securestorage(/.*)?    u:object_r:tee_data_file:s0
diff --git a/sepolicy/trusty/gatekeeperd.te b/sepolicy/trusty/gatekeeperd.te
new file mode 100644
index 000000000..50c79b25b
--- /dev/null
+++ b/sepolicy/trusty/gatekeeperd.te
@@ -0,0 +1,3 @@
+# HwBinder IPC from client to server, and callbacks
+# refer to system/sepolicy/public/hal_gatekeeper.te
+binder_call(gatekeeperd, hal_gatekeeper)
diff --git a/sepolicy/trusty/storageproxyd.te b/sepolicy/trusty/storageproxyd.te
new file mode 100644
index 000000000..9c2a4a1df
--- /dev/null
+++ b/sepolicy/trusty/storageproxyd.te
@@ -0,0 +1,11 @@
+# intelstorageproxyd is a daemon of secure storage to do operations on rpmb,
+# which is a partition of eMMC, and provides encrypted and tamper proof
+# storage to secure apps. storageproxyd service receives cmds from trusty
+# storage app to execute read/write on rpmb and gives responses to trusty.
+
+# intelstorageproxyd requires sys_rawio permission to call ioctl to execute
+# read/write operations on /dev/rpmb*, which is in tee domain.
+
+allow tee self:capability { sys_rawio };
+allow tee block_device:dir search;
+allow tee tee_device:blk_file rw_file_perms;
\ No newline at end of file

From 4c17cb32e966c38a738b0319a5beb61954a27735 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Tue, 16 Jan 2018 15:04:19 +0530
Subject: [PATCH 164/427] [AIA-O] MMixin-Up

Enable trusty

Jira: None
Test: Device boots to homescreen

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/AndroidBoard.mk | 31 ++++++++++++++++++++++++++++
 androidia_64/BoardConfig.mk  | 39 ++++++++++++++++++++++++++++++++++++
 androidia_64/device.mk       | 14 +++++++++++++
 androidia_64/flashfiles.ini  |  8 ++++++++
 androidia_64/gpt.ini         |  8 +++++++-
 androidia_64/init.rc         |  8 ++++++++
 6 files changed, 107 insertions(+), 1 deletion(-)

diff --git a/androidia_64/AndroidBoard.mk b/androidia_64/AndroidBoard.mk
index d2f17e449..0e42f3f87 100644
--- a/androidia_64/AndroidBoard.mk
+++ b/androidia_64/AndroidBoard.mk
@@ -375,4 +375,35 @@ $(provdata_zip): $(provdata_zip_deps) | $(ACP)
 
 INSTALLED_RADIOIMAGE_TARGET += $(provdata_zip)
 
+##############################################################
+# Source: device/intel/mixins/groups/trusty/true/AndroidBoard.mk
+##############################################################
+TOS_IMAGE_TARGET := $(TRUSTY_BUILDROOT)/evmm_lk_pkg.bin
+
+INTERNAL_PLATFORM := ikgt
+LOCAL_MAKE := make
+
+# Build the evmm_pkg.bin and lk.bin
+.PHONY: $(TOS_IMAGE_TARGET)
+$(TOS_IMAGE_TARGET):
+	@echo "making lk.bin.."
+	$(hide) (cd $(TOPDIR)trusty && $(TRUSTY_ENV_VAR) $(LOCAL_MAKE) sand-x86-64)
+	@echo "making tos image.."
+	$(hide) (cd $(TOPDIR)vendor/intel/fw/evmm/$(INTERNAL_PLATFORM) && $(TRUSTY_ENV_VAR) $(LOCAL_MAKE))
+
+#tos partition is assigned for trusty
+INSTALLED_TOS_IMAGE_TARGET := $(PRODUCT_OUT)/tos.img
+TOS_SIGNING_KEY := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8
+TOS_SIGNING_CERT := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem
+
+.PHONY: tosimage
+tosimage: $(INSTALLED_TOS_IMAGE_TARGET)
+$(INSTALLED_TOS_IMAGE_TARGET): $(TOS_IMAGE_TARGET) $(MKBOOTIMG) $(BOOT_SIGNER)
+	@echo "mkbootimg to create boot image for TOS file: $@"
+	$(hide) $(MKBOOTIMG) --kernel $(TOS_IMAGE_TARGET) --output $@
+	$(if $(filter true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_BOOT_SIGNER)),\
+		@echo "sign prebuilt TOS file: $@" &&\
+		$(BOOT_SIGNER) /tos $@ $(TOS_SIGNING_KEY) $(TOS_SIGNING_CERT) $@)
+
+INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_TOS_IMAGE_TARGET)
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index a92f8a995..8a0de313c 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -161,6 +161,7 @@ BOARD_FLASHFILES += $(PRODUCT_OUT)/config.img
 BOARD_FLASHFILES += $(PRODUCT_OUT)/vendor.img
 BOARD_FLASHFILES += $(PRODUCT_OUT)/factory.img
 BOARD_FLASHFILES += $(TARGET_DEVICE_DIR)/flash.json
+BOARD_FLASHFILES += $(PRODUCT_OUT)/tos.img
 
 # -- OTA RELATED DEFINES --
 # tell build system where to get the recovery.fstab.
@@ -375,6 +376,44 @@ USE_INTEL_FLASHFILES := true
 VARIANT_SPECIFIC_FLASHFILES ?= false
 FAST_FLASHFILES := true
 
+##############################################################
+# Source: device/intel/mixins/groups/trusty/true/BoardConfig.mk
+##############################################################
+TARGET_USE_TRUSTY := true
+
+KM_VERSION := 1
+ifeq ($(KM_VERSION),1)
+BOARD_USES_TRUSTY := true
+BOARD_USES_KEYMASTER1 := true
+endif
+
+BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy
+BOARD_SEPOLICY_M4DEFS += module_trusty=true
+
+LK_PRODUCT := androidia_64
+
+LKBUILD_TOOLCHAIN_ROOT = $(PWD)/vendor/intel/external/prebuilts/elf/
+LKBUILD_X86_TOOLCHAIN =
+LKBUILD_X64_TOOLCHAIN = $(LKBUILD_TOOLCHAIN_ROOT)x86_64-elf-4.9.1-Linux-x86_64/bin
+TRUSTY_BUILDROOT = $(PWD)/$(PRODUCT_OUT)/obj/trusty/
+
+TRUSTY_ENV_VAR += LK_CORE_NUM=1
+TRUSTY_ENV_VAR += TARGET_PRODUCT=$(LK_PRODUCT)
+
+#for trusty lk
+TRUSTY_ENV_VAR += BUILDROOT=$(TRUSTY_BUILDROOT)
+TRUSTY_ENV_VAR += PATH=$(PATH):$(LKBUILD_X86_TOOLCHAIN):$(LKBUILD_X64_TOOLCHAIN)
+
+#for trusty vmm
+# use same toolchain as android kernel
+TRUSTY_ENV_VAR += COMPILE_TOOLCHAIN=$(EVMMBUILD_TOOLCHAIN)
+
+# output build dir to android out folder
+TRUSTY_ENV_VAR += BUILD_DIR=$(TRUSTY_BUILDROOT)
+TRUSTY_ENV_VAR += LKBIN_DIR=$(TRUSTY_BUILDROOT)/build-sand-x86-64/
+
+#Workaround CPU lost issue on SIMICS, will remove this line below after PO.
+BOARD_KERNEL_CMDLINE += cpu_init_udelay=500000
 # ------------------ END MIX-IN DEFINITIONS ------------------
 
 # Install Native Bridge
diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index c32128d5e..149de46cd 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -501,6 +501,20 @@ PRODUCT_PACKAGES_DEBUG += \
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.midi.xml:system/etc/permissions/android.software.midi.xml
 ##############################################################
+# Source: device/intel/mixins/groups/trusty/true/product.mk
+##############################################################
+
+KM_VERSION := 1
+
+ifeq ($(KM_VERSION),1)
+PRODUCT_PACKAGES += \
+	keystore.android_ia
+endif
+
+PRODUCT_PACKAGES += \
+	libtrusty
+
+##############################################################
 # Source: device/intel/mixins/groups/debug-kernel/default/product.mk
 ##############################################################
 ifneq ($(TARGET_BUILD_VARIANT),user)
diff --git a/androidia_64/flashfiles.ini b/androidia_64/flashfiles.ini
index 345b1e8cf..094e5c8bf 100644
--- a/androidia_64/flashfiles.ini
+++ b/androidia_64/flashfiles.ini
@@ -217,4 +217,12 @@ description = Set device state to locked
 tool = fastboot
 args = continue
 description = Boot to main OS
+##############################################################
+# Source: device/intel/mixins/groups/trusty/true/flashfiles.ini
+##############################################################
+[command.flash.tos]
+tool = fastboot
+args = flash tos $file
+file = radio:tos.img
+description = Flash tos partition
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/gpt.ini b/androidia_64/gpt.ini
index 7409aab97..e2162cc46 100644
--- a/androidia_64/gpt.ini
+++ b/androidia_64/gpt.ini
@@ -4,7 +4,7 @@
 # Source: device/intel/mixins/groups/boot-arch/android_ia/gpt.ini
 ##############################################################
 [base]
-partitions = bootloader bootloader2 boot recovery misc metadata system cache persistent vendor config factory data
+partitions = bootloader bootloader2 boot recovery misc metadata system cache persistent vendor config factory tos data
 
 [partition.bootloader]
 label = android_bootloader
@@ -86,4 +86,10 @@ label = android_factory
 len = 10
 type = linux
 guid = 8f68cc74-c5e5-48da-be91-a0c8c15e9c80
+
+[partition.tos]
+label = android_tos
+len = 10
+type = boot
+guid = 52cd00fd-f5b0-4061-b3a5-65b07f2179f0
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index b66fb6d1b..9c068d2b1 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -574,6 +574,14 @@ on property:sys.usb.config=midi,adb
     start adbd
     setprop sys.usb.state ${sys.usb.config}
 ##############################################################
+# Source: device/intel/mixins/groups/trusty/true/init.rc
+##############################################################
+on fs
+    # Update device node r/w attribute
+    chown system system /dev/trusty-ipc-dev0
+    chmod 660 /dev/trusty-ipc-dev0
+
+##############################################################
 # Source: device/intel/mixins/groups/debug-kernel/default/init.rc
 ##############################################################
 import /init.kernel.rc

From c75437b14483ff84dd06aa66da187adcb356841d Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 25 Jan 2018 10:24:22 +0530
Subject: [PATCH 165/427] [AIA-O] Resolve sepolicy compilation issues

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 sepolicy/device.te | 1 -
 sepolicy/file.te   | 2 --
 2 files changed, 3 deletions(-)

diff --git a/sepolicy/device.te b/sepolicy/device.te
index 1c4826181..e284b159f 100644
--- a/sepolicy/device.te
+++ b/sepolicy/device.te
@@ -4,4 +4,3 @@ type rpmb_block_device, dev_type;
 type cros_ec_device, dev_type;
 type hidraw_device, dev_type;
 type host1x_device, dev_type, mlstrustedobject;
-type config_block_device, dev_type;
diff --git a/sepolicy/file.te b/sepolicy/file.te
index 7bfa91175..1e43945e4 100644
--- a/sepolicy/file.te
+++ b/sepolicy/file.te
@@ -6,6 +6,4 @@ type atvr_device, dev_type;
 type sysfs_coretemp, fs_type, sysfs_type;
 type gpu_pid_stats_file, fs_type, debugfs_type;
 type sysfs_socinfo, sysfs_type, fs_type;
-type config_file, file_type, data_file_type;
 type debugfs_pstate, fs_type, debugfs_type;
-type sysfs_app_readable, fs_type, sysfs_type;

From b791d1a3492de6350029269bf7e7a944a2375598 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 25 Jan 2018 10:34:22 +0530
Subject: [PATCH 166/427] [AIA-O] Mixin Up for Sepolicy

Jira: None
Test: Device boots to homescreen

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/AndroidBoard.mk | 32 +++++++++++++++++++++-----------
 androidia_64/BoardConfig.mk  | 18 +++++++++++++++---
 androidia_64/init.rc         |  2 +-
 3 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/androidia_64/AndroidBoard.mk b/androidia_64/AndroidBoard.mk
index 0e42f3f87..271d3e63e 100644
--- a/androidia_64/AndroidBoard.mk
+++ b/androidia_64/AndroidBoard.mk
@@ -257,17 +257,28 @@ include device/intel/android_ia/common/audio/AndroidBoard.mk
 ##############################################################
 INSTALLED_CONFIGIMAGE_TARGET := $(PRODUCT_OUT)/config.img
 
-$(INSTALLED_CONFIGIMAGE_TARGET) : $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK)
+selinux_fc := $(TARGET_ROOT_OUT)/file_contexts.bin
+
+$(INSTALLED_CONFIGIMAGE_TARGET) : PRIVATE_SELINUX_FC := $(selinux_fc)
+$(INSTALLED_CONFIGIMAGE_TARGET) : $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK) $(selinux_fc)
 	$(call pretty,"Target config fs image: $(INSTALLED_CONFIGIMAGE_TARGET)")
 	@mkdir -p $(PRODUCT_OUT)/config
-	$(hide)	$(MKEXTUSERIMG) -s \
+	$(hide)	PATH=$(HOST_OUT_EXECUTABLES):$$PATH \
+		$(MKEXTUSERIMG) -s \
 		$(PRODUCT_OUT)/config \
 		$(PRODUCT_OUT)/config.img \
 		ext4 \
 		oem_config \
-		$(BOARD_CONFIGIMAGE_PARTITION_SIZE)
+		$(BOARD_CONFIGIMAGE_PARTITION_SIZE) \
+		$(PRIVATE_SELINUX_FC)
 
 INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_CONFIGIMAGE_TARGET)
+
+selinux_fc :=
+
+selinux_fc :=
+.PHONY: configimage
+configimage: $(INSTALLED_CONFIGIMAGE_TARGET)
 ##############################################################
 # Source: device/intel/mixins/groups/vendor-partition/true/AndroidBoard.mk
 ##############################################################
@@ -279,11 +290,10 @@ $(PRODUCT_OUT)/vendor.img : $(KERNEL_MODULES_INSTALL)
 # Source: device/intel/mixins/groups/factory-partition/true/AndroidBoard.mk
 ##############################################################
 INSTALLED_FACTORYIMAGE_TARGET := $(PRODUCT_OUT)/factory.img
-#selinux_fc := $(TARGET_ROOT_OUT)/file_contexts
+selinux_fc := $(TARGET_ROOT_OUT)/file_contexts.bin
 
-#$(INSTALLED_FACTORYIMAGE_TARGET) : PRIVATE_SELINUX_FC := $(selinux_fc)
-#$(INSTALLED_FACTORYIMAGE_TARGET) : $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK) $(selinux_fc)
-$(INSTALLED_FACTORYIMAGE_TARGET) : $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK)
+$(INSTALLED_FACTORYIMAGE_TARGET) : PRIVATE_SELINUX_FC := $(selinux_fc)
+$(INSTALLED_FACTORYIMAGE_TARGET) : $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK) $(selinux_fc)
 	$(call pretty,"Target factory fs image: $(INSTALLED_FACTORYIMAGE_TARGET)")
 	@mkdir -p $(PRODUCT_OUT)/factory
 	$(hide)	$(MKEXTUSERIMG) -s \
@@ -291,12 +301,12 @@ $(INSTALLED_FACTORYIMAGE_TARGET) : $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK)
 		$(PRODUCT_OUT)/factory.img \
 		ext4 \
 		factory \
-		$(BOARD_FACTORYIMAGE_PARTITION_SIZE)
-#		$(PRIVATE_SELINUX_FC)
+		$(BOARD_FACTORYIMAGE_PARTITION_SIZE) \
+		$(PRIVATE_SELINUX_FC)
 
-#INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_FACTORYIMAGE_TARGET)
+INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_FACTORYIMAGE_TARGET)
 
-#selinux_fc :=
+selinux_fc :=
 
 .PHONY: factoryimage
 factoryimage: $(INSTALLED_FACTORYIMAGE_TARGET)
diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 8a0de313c..2d0d1fa28 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -39,6 +39,8 @@ ifneq ($(strip $(BOARD_GPU_DRIVERS)),)
 TARGET_HARDWARE_3D := true
 endif
 
+BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/graphics/android_ia
+
 
 BOARD_USES_DRM_HWCOMPOSER := false
 BOARD_USES_IA_HWCOMPOSER := true
@@ -78,13 +80,17 @@ TARGET_NO_KERNEL ?= false
 KERNEL_LOGLEVEL ?= 3
 SERIAL_PARAMETER := console=tty0 console=ttyS2,115200n8
 
-BOARD_KERNEL_CMDLINE += root=/dev/ram0  androidboot.hardware=$(TARGET_PRODUCT) androidboot.selinux=permissive firmware_class.path=/vendor/firmware loglevel=$(KERNEL_LOGLEVEL)
+BOARD_KERNEL_CMDLINE += root=/dev/ram0  androidboot.hardware=$(TARGET_PRODUCT) firmware_class.path=/vendor/firmware loglevel=$(KERNEL_LOGLEVEL)
 
 ifneq ($(TARGET_BUILD_VARIANT),user)
 ifeq ($(SPARSE_IMG),true)
 BOARD_KERNEL_CMDLINE += $(SERIAL_PARAMETER)
 endif
 endif
+
+
+BOARD_SEPOLICY_M4DEFS += module_kernel=true
+BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/kernel
 ##############################################################
 # Source: device/intel/mixins/groups/bluetooth/btusb/BoardConfig.mk
 ##############################################################
@@ -92,6 +98,8 @@ BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_LINUX := true
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/intel/common/bluetooth/bcm43241/
 DEVICE_PACKAGE_OVERLAYS += device/intel/common/bluetooth/overlay-bt-pan
+BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/bluetooth/common \
+                       device/intel/android_ia/sepolicy/bluetooth/btusb
 ##############################################################
 # Source: device/intel/mixins/groups/disk-bus/auto/BoardConfig.mk
 ##############################################################
@@ -140,6 +148,8 @@ KERNELFLINGER_SSL_LIBRARY := openssl
 # Avoid Watchdog truggered reboot
 BOARD_KERNEL_CMDLINE += iTCO_wdt.force_no_reboot=1
 
+BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/boot-arch/android_ia
+
 # Show the "OEM unlocking" option in Android "Developer options"
 #PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.frp.pst=/dev/block/by-name/android_persistent
 
@@ -304,7 +314,7 @@ DEVICE_PACKAGE_OVERLAYS += device/intel/common/wlan/overlay-miracast-force-singl
 
 
 BOARD_SEPOLICY_M4DEFS += module_iwlwifi=true
-BOARD_SEPOLICY_DIRS += device/intel/sepolicy/wlan/iwlwifi
+BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/wlan/iwlwifi
 ##############################################################
 # Source: device/intel/mixins/groups/cpu-arch/skl/BoardConfig.mk
 ##############################################################
@@ -345,6 +355,8 @@ BOARD_KERNEL_CMDLINE += thermal.off=1
 # Source: device/intel/mixins/groups/config-partition/enabled/BoardConfig.mk
 ##############################################################
 BOARD_CONFIGIMAGE_PARTITION_SIZE := 8388608
+BOARD_SEPOLICY_M4DEFS += module_config_partition=true
+BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/config-partition
 ##############################################################
 # Source: device/intel/mixins/groups/vendor-partition/true/BoardConfig.mk
 ##############################################################
@@ -367,7 +379,7 @@ BOARD_SEPOLICY_M4DEFS += module_factory_partition=true
 # Source: device/intel/mixins/groups/debug-phonedoctor/true/BoardConfig.mk
 ##############################################################
 BOARD_SEPOLICY_M4DEFS += module_debug_phonedoctor=true
-BOARD_SEPOLICY_DIRS += device/intel/sepolicy/debug-phonedoctor
+BOARD_SEPOLICY_DIRS += device/intel/androidia/sepolicy/debug-phonedoctor
 ##############################################################
 # Source: device/intel/mixins/groups/flashfiles/ini/BoardConfig.mk
 ##############################################################
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 9c068d2b1..4c145c051 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -532,7 +532,7 @@ on boot
 ##############################################################
 # Enable SELinux labeling
 on post-fs
-    restorecon_recursive /config
+    restorecon_recursive /oem_config
 ##############################################################
 # Source: device/intel/mixins/groups/factory-partition/true/init.rc
 ##############################################################

From 1bc101523bf0ad1ad6fa24628109bdccabcf56b9 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 25 Jan 2018 23:32:49 +0530
Subject: [PATCH 167/427] [AIA-O] Mixin up

Enable Quota in fstab

Jira: None
Test: None
---
 androidia_64/fstab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/androidia_64/fstab b/androidia_64/fstab
index e029a9c13..fcae03c72 100644
--- a/androidia_64/fstab
+++ b/androidia_64/fstab
@@ -19,7 +19,7 @@
 
 /dev/block/by-name/android_system   	/system         ext4    ro															wait
 /dev/block/by-name/android_cache		/cache          ext4    noatime,nosuid,nodev,errors=panic                           wait,check
-/dev/block/by-name/android_data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,forceencrypt=/dev/block/by-name/android_metadata
+/dev/block/by-name/android_data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,forceencrypt=/dev/block/by-name/android_metadata,quota
 /dev/block/by-name/android_boot         /boot           emmc    defaults                                                    defaults
 /dev/block/by-name/android_recovery     /recovery       emmc    defaults                                                    defaults
 /dev/block/by-name/android_misc         /misc           emmc    defaults                                                    defaults

From 708c0cc675c9922b9899e10d581fd55cbb62f916 Mon Sep 17 00:00:00 2001
From: Muhammad Aksar <muhammad.aksar@intel.com>
Date: Fri, 19 Jan 2018 12:59:04 +0530
Subject: [PATCH 168/427] Add kernel config for enabling XT_QTAGUID module

Added dependancy kernel configs to enable
XT_QTAGUID module of Netfilter.
Enabled Netfilter IPv4 and IPv6 socket and
disabled XT_MATCH_OWNER.
XT_QTAGUID Netfilter module will enable stats
control and it exports /proc/net/xt_qtaguid
interface which provides data monitoring and
tracking functionality in Network.

Jira:None
Test:None
Signed-off-by: Muhammad Aksar <muhammad.aksar@intel.com>
---
 kernel_config/kernel_64_defconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 9f3706b2e..537579915 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -954,6 +954,7 @@ CONFIG_NETFILTER_XT_MATCH_U32=y
 #
 CONFIG_NF_DEFRAG_IPV4=y
 CONFIG_NF_CONNTRACK_IPV4=y
+CONFIG_NF_SOCKET_IPV4=y
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 # CONFIG_NF_DUP_IPV4 is not set
 # CONFIG_NF_LOG_ARP is not set
@@ -991,6 +992,7 @@ CONFIG_IP_NF_ARP_MANGLE=y
 #
 CONFIG_NF_DEFRAG_IPV6=y
 CONFIG_NF_CONNTRACK_IPV6=y
+CONFIG_NF_SOCKET_IPV6=y
 # CONFIG_NF_DUP_IPV6 is not set
 CONFIG_NF_REJECT_IPV6=y
 # CONFIG_NF_LOG_IPV6 is not set
@@ -7101,4 +7103,3 @@ CONFIG_USB_CONFIGFS_RNDIS=y
 CONFIG_BXT_WC_PMIC_OPREGION=y
 
 CONFIG_CRC8=y
-CONFIG_NETFILTER_XT_MATCH_OWNER=y

From bc234f813a56578e27e1921b696eb5da62c00f57 Mon Sep 17 00:00:00 2001
From: Harish Krupo <harish.krupo.kps@intel.com>
Date: Tue, 12 Dec 2017 20:11:01 +0530
Subject: [PATCH 169/427] Add memtrack to mixin.spec

Jira: None
Test: memtrack libraries should be present in vendor partition

Signed-off-by: Harish Krupo <harish.krupo.kps@intel.com>
---
 androidia_64/mixins.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index b8e62b8be..9e26ac7ac 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -43,3 +43,4 @@ trusty: true
 slcan: default
 ioc-slcan-reboot: false
 camera: usbcamera
+memtrack: true

From 12fa756c6d78cbbef0029ef80aa867eedf60def1 Mon Sep 17 00:00:00 2001
From: Priya Shree <priya.shree@intel.com>
Date: Tue, 23 Jan 2018 22:09:09 +0530
Subject: [PATCH 170/427] [AIA-O] Added media related performance xml for
 CtsVideo

Jira: None
Test: None

Signed-off-by: M,Kumar K <kumar.k.m@intel.com>
Signed-off-by: Priya Shree <priya.shree@intel.com>
---
 common/media/media_codecs_performance.xml | 104 ++++++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 common/media/media_codecs_performance.xml

diff --git a/common/media/media_codecs_performance.xml b/common/media/media_codecs_performance.xml
new file mode 100644
index 000000000..1ae406492
--- /dev/null
+++ b/common/media/media_codecs_performance.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2015 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.
+-->
+
+<MediaCodecs>
+    <Decoders>
+        <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
+            <Limit name="measured-frame-rate-176x144" range="500-600" />
+            <Limit name="measured-frame-rate-352x288" range="300-310" />
+        </MediaCodec>
+        <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
+            <Limit name="measured-frame-rate-320x240" range="300-310" />
+            <Limit name="measured-frame-rate-720x480" range="100-110" />
+            <Limit name="measured-frame-rate-1280x720" range="40-50" />
+            <Limit name="measured-frame-rate-1920x1080" range="15-16" />
+        </MediaCodec>
+        <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
+            <Limit name="measured-frame-rate-352x288" range="300-350" />
+            <Limit name="measured-frame-rate-640x360" range="200-210" />
+            <Limit name="measured-frame-rate-720x480" range="200-210" />
+            <Limit name="measured-frame-rate-1280x720" range="60-70" />
+            <Limit name="measured-frame-rate-1920x1080" range="30-40" />
+        </MediaCodec>
+        <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" update="true">
+            <Limit name="measured-frame-rate-176x144" range="700-750" />
+        </MediaCodec>
+        <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
+            <Limit name="measured-frame-rate-320x180" range="450-460" />
+            <Limit name="measured-frame-rate-640x360" range="200-210" />
+            <Limit name="measured-frame-rate-1280x720" range="40-50" />
+            <Limit name="measured-frame-rate-1920x1080" range="20-25" />
+        </MediaCodec>
+        <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
+            <Limit name="measured-frame-rate-320x180" range="220-484" />
+            <Limit name="measured-frame-rate-640x360" range="180-190" />
+            <Limit name="measured-frame-rate-1280x720" range="60-70" />
+            <Limit name="measured-frame-rate-1920x1080" range="40-50" />
+        </MediaCodec>
+        <MediaCodec name="OMX.Intel.hw_vd.h264" type="video/avc" update="true">
+            <Limit name="measured-frame-rate-320x240" range="280-300" />
+            <Limit name="measured-frame-rate-720x480" range="300-310" />
+            <Limit name="measured-frame-rate-1280x720" range="305-320" />
+            <Limit name="measured-frame-rate-1920x1088" range="750-1310" />
+        </MediaCodec>
+        <MediaCodec name="OMX.Intel.hw_vd.h265" type="video/hevc" update="true">
+            <Limit name="measured-frame-rate-352x288" range="500-720" />
+            <Limit name="measured-frame-rate-640x360" range="500-600" />
+            <Limit name="measured-frame-rate-720x480" range="640-810" />
+            <Limit name="measured-frame-rate-1280x720" range="600-2180" />
+            <Limit name="measured-frame-rate-1920x1080" range="320-330" />
+            <Limit name="measured-frame-rate-3840x2160" range="70-80" />
+        </MediaCodec>
+        <MediaCodec name="OMX.Intel.hw_vd.vp8" type="video/x-vnd.on2.vp8" update="true">
+            <Limit name="measured-frame-rate-320x240" range="820-860" />
+            <Limit name="measured-frame-rate-640x360" range="1500-2590" />
+            <Limit name="measured-frame-rate-1280x720" range="880-1020" />
+            <Limit name="measured-frame-rate-1920x1080" range="240-300" />
+        </MediaCodec>
+    </Decoders>
+    <Encoders>
+        <MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
+            <Limit name="measured-frame-rate-320x240" range="200-250" />
+            <Limit name="measured-frame-rate-720x480" range="80-100" />
+            <Limit name="measured-frame-rate-1280x720" range="30-40" />
+            <Limit name="measured-frame-rate-1920x1080" range="10-20" />
+        </MediaCodec>
+        <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
+            <Limit name="measured-frame-rate-176x144" range="350-360" />
+        </MediaCodec>
+        <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
+            <Limit name="measured-frame-rate-176x144" range="350-360" />
+        </MediaCodec>
+        <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
+            <Limit name="measured-frame-rate-320x180" range="60-70" />
+            <Limit name="measured-frame-rate-640x360" range="40-50" />
+            <Limit name="measured-frame-rate-1280x720" range="20-30" />
+            <Limit name="measured-frame-rate-1920x1080" range="10-20" />
+        </MediaCodec>
+        <MediaCodec name="OMX.Intel.hw_ve.h264" type="video/avc" update="true">
+            <Limit name="measured-frame-rate-320x240" range="190-200" />
+            <Limit name="measured-frame-rate-720x480" range="180-200" />
+            <Limit name="measured-frame-rate-1280x720" range="80-90" />
+            <Limit name="measured-frame-rate-1920x1080" range="20-35" />
+        </MediaCodec>
+        <MediaCodec name="OMX.Intel.hw_ve.vp8" type="video/x-vnd.on2.vp8" update="true">
+            <Limit name="measured-frame-rate-320x180" range="170-180" />
+            <Limit name="measured-frame-rate-640x360" range="70-90" />
+            <Limit name="measured-frame-rate-1280x720" range="30-35" />
+            <Limit name="measured-frame-rate-1920x1080" range="25-35" />
+        </MediaCodec>
+    </Encoders>
+</MediaCodecs>

From 4cb3c0439a22239ad1eb0cdf139462bb1e5050cf Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Fri, 26 Jan 2018 00:36:58 +0530
Subject: [PATCH 171/427] [AIA-O] Mixin-Up for memtrack

Jira: None
Test: None
---
 androidia_64/BoardConfig.mk |  4 ++++
 androidia_64/device.mk      | 12 ++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 2d0d1fa28..b02e7656a 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -426,6 +426,10 @@ TRUSTY_ENV_VAR += LKBIN_DIR=$(TRUSTY_BUILDROOT)/build-sand-x86-64/
 
 #Workaround CPU lost issue on SIMICS, will remove this line below after PO.
 BOARD_KERNEL_CMDLINE += cpu_init_udelay=500000
+##############################################################
+# Source: device/intel/mixins/groups/memtrack/true/BoardConfig.mk
+##############################################################
+BOARD_SEPOLICY_DIRS += device/intel/sepolicy/memtrack
 # ------------------ END MIX-IN DEFINITIONS ------------------
 
 # Install Native Bridge
diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 149de46cd..3e7cf9c29 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -159,10 +159,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     device/intel/android_ia/common/graphics/drirc:system/etc/drirc
 
-# Memtrack HAL
-PRODUCT_PACKAGES += \
-    memtrack.android_ia
-
 
 # HWComposer IA
 PRODUCT_PACKAGES += \
@@ -515,6 +511,14 @@ PRODUCT_PACKAGES += \
 	libtrusty
 
 ##############################################################
+# Source: device/intel/mixins/groups/memtrack/true/product.mk
+##############################################################
+# memtrack HAL
+PRODUCT_PACKAGES += \
+	memtrack.android_ia \
+	android.hardware.memtrack@1.0-service \
+	android.hardware.memtrack@1.0-impl
+##############################################################
 # Source: device/intel/mixins/groups/debug-kernel/default/product.mk
 ##############################################################
 ifneq ($(TARGET_BUILD_VARIANT),user)

From 2c671c92b1476e4492a42759adc4162566702bc4 Mon Sep 17 00:00:00 2001
From: "ji, zhenlong z" <zhenlong.z.ji@intel.com>
Date: Mon, 5 Feb 2018 10:37:47 +0800
Subject: [PATCH 172/427] [SELinux] add some selinux rules

These rules are used to address screenshot, Youtube play
and memtrack issues.

Jira: None
Test: The device can boot to UI and there are now obvious
regressions observed.

Signed-off-by: ji, zhenlong z <zhenlong.z.ji@intel.com>
---
 sepolicy/graphics/android_ia/file.te          |  1 +
 sepolicy/graphics/android_ia/mediacodec.te    |  2 ++
 .../graphics/android_ia/surfaceflinger.te     |  1 +
 sepolicy/memtrack/hal_memtrack_default.te     | 19 +++++++++++++++++++
 4 files changed, 23 insertions(+)
 create mode 100644 sepolicy/memtrack/hal_memtrack_default.te

diff --git a/sepolicy/graphics/android_ia/file.te b/sepolicy/graphics/android_ia/file.te
index 7b84fdae2..6899feec7 100644
--- a/sepolicy/graphics/android_ia/file.te
+++ b/sepolicy/graphics/android_ia/file.te
@@ -1 +1,2 @@
 type sysfs_app_readable, fs_type, sysfs_type;
+typeattribute hal_graphics_allocator_default_tmpfs mlstrustedobject;
diff --git a/sepolicy/graphics/android_ia/mediacodec.te b/sepolicy/graphics/android_ia/mediacodec.te
index 877812abc..2451c12a5 100644
--- a/sepolicy/graphics/android_ia/mediacodec.te
+++ b/sepolicy/graphics/android_ia/mediacodec.te
@@ -1,2 +1,4 @@
 allow mediacodec sysfs_app_readable:file r_file_perms;
 allow mediacodec gpu_device:dir r_dir_perms;
+allow mediacodec hal_graphics_allocator_default_tmpfs:file { read write map };
+allow mediacodec hal_graphics_composer_default_tmpfs:file { read write map};
diff --git a/sepolicy/graphics/android_ia/surfaceflinger.te b/sepolicy/graphics/android_ia/surfaceflinger.te
index 641ce3157..e748a0c28 100644
--- a/sepolicy/graphics/android_ia/surfaceflinger.te
+++ b/sepolicy/graphics/android_ia/surfaceflinger.te
@@ -27,5 +27,6 @@ allowxperm surfaceflinger gpu_device:chr_file ioctl {
 	DRM_IOCTL_I915_GEM_CONTEXT_CREATE
 	DRM_IOCTL_I915_GEM_MMAP_GTT
 	DRM_IOCTL_MODE_GETPROPERTY
+	DRM_IOCTL_I915_GEM_WAIT
 	0x6475
 };
diff --git a/sepolicy/memtrack/hal_memtrack_default.te b/sepolicy/memtrack/hal_memtrack_default.te
new file mode 100644
index 000000000..d5a5929f2
--- /dev/null
+++ b/sepolicy/memtrack/hal_memtrack_default.te
@@ -0,0 +1,19 @@
+#
+# hal memtrack default service
+#
+
+# Goes diving into /proc/<pid>/smaps
+typeattribute hal_memtrack_default mlstrustedsubject;
+
+allow hal_memtrack_default domain:dir search;
+allow hal_memtrack_default domain:file r_file_perms;
+
+allow hal_memtrack_default proc_meminfo:file r_file_perms;
+
+# /sys/devices/pci0000:00/0000:00:02.0/drm/card0/gfx_memtrack/3973
+allow hal_memtrack_default sysfs:file r_file_perms;
+
+# /sys/devices/virtual/block/zram0/mem_used_total
+allow hal_memtrack_default sysfs_zram:dir search;
+allow hal_memtrack_default sysfs_zram:file r_file_perms;
+

From 210f485aed05b7893599bf7945b119197aa29f7c Mon Sep 17 00:00:00 2001
From: "Yue, VincentX" <vincentx.yue@intel.com>
Date: Thu, 1 Feb 2018 12:05:38 +0800
Subject: [PATCH 173/427] SELinux: add sepolicy for mediaserver

Add the required sepolicies for KBL NUC, this is for
fix google photo crash when play video

Jira: None
Test: google photo play video

Signed-off-by: Yue, VincentX <vincentx.yue@intel.com>
---
 sepolicy/graphics/android_ia/mediaextractor.te | 1 +
 sepolicy/graphics/android_ia/mediaserver.te    | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 sepolicy/graphics/android_ia/mediaextractor.te

diff --git a/sepolicy/graphics/android_ia/mediaextractor.te b/sepolicy/graphics/android_ia/mediaextractor.te
new file mode 100644
index 000000000..caafd391a
--- /dev/null
+++ b/sepolicy/graphics/android_ia/mediaextractor.te
@@ -0,0 +1 @@
+allow mediaextractor fuse:file r_file_perms;
diff --git a/sepolicy/graphics/android_ia/mediaserver.te b/sepolicy/graphics/android_ia/mediaserver.te
index f78e12b70..23c2bdabb 100644
--- a/sepolicy/graphics/android_ia/mediaserver.te
+++ b/sepolicy/graphics/android_ia/mediaserver.te
@@ -1,2 +1,4 @@
 allow mediadrmserver sysfs_app_readable:file r_file_perms;
 allow mediadrmserver gpu_device:dir r_dir_perms;
+allow mediaserver hal_graphics_allocator_default_tmpfs:file { read write map };
+allow mediaserver gpu_device:dir r_dir_perms;

From c720f9b3c42445427fc1a8a6f90c02cc46ff2feb Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Fri, 9 Feb 2018 11:53:47 +0530
Subject: [PATCH 174/427] [AIA-O] Mixin update for memtrack

Jira: None
Test: Device boots to homescreen

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/BoardConfig.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index b02e7656a..2e997cb46 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -429,7 +429,7 @@ BOARD_KERNEL_CMDLINE += cpu_init_udelay=500000
 ##############################################################
 # Source: device/intel/mixins/groups/memtrack/true/BoardConfig.mk
 ##############################################################
-BOARD_SEPOLICY_DIRS += device/intel/sepolicy/memtrack
+BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/memtrack
 # ------------------ END MIX-IN DEFINITIONS ------------------
 
 # Install Native Bridge

From 0a65e624e130fed6d968f6db307a733bbf2dee75 Mon Sep 17 00:00:00 2001
From: shyjumon <shyjumon.n@intel.com>
Date: Sat, 27 Jan 2018 23:09:42 +0530
Subject: [PATCH 175/427] sdcardfs support enabled

sdcardfs is supported to mount emulated storage with sdcardfs instead of fuse.
To avoid IO overheads and double caching effects

Jira: None
Test: Mount cmd output (should have some partitions with type as sdcardfs)
Signed-off-by: shyjumon <shyjumon.n@intel.com>
---
 kernel_config/kernel_64_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 537579915..a4e34f3e2 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -6281,6 +6281,7 @@ CONFIG_QUOTACTL=y
 CONFIG_QUOTACTL_COMPAT=y
 # CONFIG_AUTOFS4_FS is not set
 CONFIG_FUSE_FS=y
+CONFIG_SDCARD_FS=y
 # CONFIG_CUSE is not set
 # CONFIG_OVERLAY_FS is not set
 

From 2724004064cc5b112defce2f29239fbd7b4c57b3 Mon Sep 17 00:00:00 2001
From: shyjumon <shyjumon.n@intel.com>
Date: Tue, 30 Jan 2018 02:15:47 +0530
Subject: [PATCH 176/427] f2fs filesystem support enabled

f2fs filesystem support is enabled for using in adoptable storage
as per google AOSP CDD adoptable storage shall use both ext4 and f2fs. so enabling f2fs

Jira: None
Test: mount cmd
      1. create a storage volume with mkfs.f2fs utility
      2. mount -t f2fs <dev entry> <mount point>
      3. check mount cmd output and check for mount type as f2fs

Signed-off-by: shyjumon <shyjumon.n@intel.com>
---
 kernel_config/kernel_64_defconfig | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index a4e34f3e2..4703725e2 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -6260,7 +6260,11 @@ CONFIG_BTRFS_FS=m
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_NILFS2_FS is not set
-# CONFIG_F2FS_FS is not set
+CONFIG_F2FS_FS=y
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
 # CONFIG_FS_DAX is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=m

From c5505df7bac8abe4367820b3331d1a37a41adc0a Mon Sep 17 00:00:00 2001
From: Priya Shree <priya.shree@intel.com>
Date: Tue, 6 Feb 2018 00:45:32 +0530
Subject: [PATCH 177/427] [AIA-O] Adding hidl entry for Media

Jira: None
Test: None

Signed-off-by: Priya Shree <priya.shree@intel.com>
---
 manifest.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/manifest.xml b/manifest.xml
index 299863b02..174a4dc14 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -98,4 +98,18 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.media.omx</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IOmx</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IOmxStore</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+
 </manifest>

From 47c7a24e0d1dec7fa414b66f23bb5121cf10ab5d Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Fri, 9 Feb 2018 14:11:11 +0530
Subject: [PATCH 178/427] [AIA-O] Mixinup for media

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/device.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 3e7cf9c29..a2bb57c85 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -215,7 +215,8 @@ PRODUCT_COPY_FILES += \
     frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
     frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \
     device/intel/android_ia/common/media/media_profiles.xml:system/etc/media_profiles.xml \
-    device/intel/android_ia/common/media/media_codecs.xml:system/etc/media_codecs.xml
+    device/intel/android_ia/common/media/media_codecs.xml:system/etc/media_codecs.xml \
+    device/intel/android_ia/common/media/media_codecs_performance.xml:system/etc/media_codecs_performance.xml
 
 #Enable deep buffer for video playback
 PRODUCT_PROPERTY_OVERRIDES += media.stagefright.audio.deep=true

From fe12f08e8a50c510b1c38239d77a57c220e05d1d Mon Sep 17 00:00:00 2001
From: Muhammad Aksar <muhammad.aksar@intel.com>
Date: Wed, 7 Feb 2018 17:09:36 +0530
Subject: [PATCH 179/427] Add SELinux rules for USB Camera

Added sepolicy for USB Camera to avoid the permission
issue on sepolicy 'enforcing' mode.

Jira: None
Test: USB Camera is working fine with 3rd party apps
Signed-off-by: Muhammad Aksar <muhammad.aksar@intel.com>
---
 sepolicy/camera/usbcamera/file_contexts       |  3 +++
 sepolicy/camera/usbcamera/init.te             |  6 ++++++
 sepolicy/camera/usbcamera/untrusted_app_25.te | 11 +++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 sepolicy/camera/usbcamera/file_contexts
 create mode 100644 sepolicy/camera/usbcamera/init.te
 create mode 100644 sepolicy/camera/usbcamera/untrusted_app_25.te

diff --git a/sepolicy/camera/usbcamera/file_contexts b/sepolicy/camera/usbcamera/file_contexts
new file mode 100644
index 000000000..300cccb5f
--- /dev/null
+++ b/sepolicy/camera/usbcamera/file_contexts
@@ -0,0 +1,3 @@
+/dev/video*                 u:object_r:video_device:s0
+/dev/v4l-subdev.*           u:object_r:video_device:s0
+/dev/media([0-9])+          u:object_r:video_device:s0
diff --git a/sepolicy/camera/usbcamera/init.te b/sepolicy/camera/usbcamera/init.te
new file mode 100644
index 000000000..60543c9c0
--- /dev/null
+++ b/sepolicy/camera/usbcamera/init.te
@@ -0,0 +1,6 @@
+#
+# init
+#
+
+# wait on /dev/video0 a shared buffer used for camera processing
+allow init video_device:chr_file getattr;
diff --git a/sepolicy/camera/usbcamera/untrusted_app_25.te b/sepolicy/camera/usbcamera/untrusted_app_25.te
new file mode 100644
index 000000000..25af7b5ee
--- /dev/null
+++ b/sepolicy/camera/usbcamera/untrusted_app_25.te
@@ -0,0 +1,11 @@
+#============= untrusted_app_25 ==============
+
+allow untrusted_app_25 device:dir open;
+allow untrusted_app_25 device:dir read;
+allow untrusted_app_25 video_device:chr_file { ioctl map };
+allow untrusted_app_25 video_device:chr_file open;
+#allow untrusted_app_25 video_device:chr_file read;
+#allow untrusted_app_25 video_device:chr_file write;
+
+#avc: denied { write } for pid=6896 comm="pool-3-thread-1" path=2F64726D206D6D206 dev="tmpfs" ino=56699 scontext=u:r:untrusted_app_25:s0:c512,c768 tcontext=u:object_r:hal_graphics_allocator_default_tmpfs:s0 tclass=file permissive=0
+allow untrusted_app_25 hal_graphics_allocator_default_tmpfs:file write;

From 881e4846103a8c3301df71449d835cb48c423558 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Fri, 9 Feb 2018 14:59:02 +0530
Subject: [PATCH 180/427] [AIA-O] Mixin-up usb-camera

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/BoardConfig.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 2e997cb46..5dd8f0830 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -427,6 +427,10 @@ TRUSTY_ENV_VAR += LKBIN_DIR=$(TRUSTY_BUILDROOT)/build-sand-x86-64/
 #Workaround CPU lost issue on SIMICS, will remove this line below after PO.
 BOARD_KERNEL_CMDLINE += cpu_init_udelay=500000
 ##############################################################
+# Source: device/intel/mixins/groups/camera/usbcamera/BoardConfig.mk
+##############################################################
+BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/camera/usbcamera
+##############################################################
 # Source: device/intel/mixins/groups/memtrack/true/BoardConfig.mk
 ##############################################################
 BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/memtrack

From 889607f05b6a403c253e46cf5b6ad2d0103b77a0 Mon Sep 17 00:00:00 2001
From: saranya <saranya.gopal@intel.com>
Date: Tue, 13 Feb 2018 13:38:24 +0530
Subject: [PATCH 181/427] Enable Multitouch driver

Jira: none
Test: none

Signed-off-by: saranya <saranya.gopal@intel.com>
---
 kernel_config/kernel_64_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 4703725e2..45f56a379 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -4902,7 +4902,7 @@ CONFIG_LOGIWHEELS_FF=y
 CONFIG_HID_MAGICMOUSE=m
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
-CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_MULTITOUCH=y
 CONFIG_HID_NTRIG=m
 CONFIG_HID_ORTEK=m
 CONFIG_HID_PANTHERLORD=m

From 307a16c29a50add39eb7292500cdd7aaeea53898 Mon Sep 17 00:00:00 2001
From: Munish Bhardwaj <munishx.bhardwaj@intel.com>
Date: Wed, 21 Feb 2018 17:21:11 +0530
Subject: [PATCH 182/427] Makes search for hardware composer generic.

Patch lets search for hwcomposer also work with postfix. Path is used for exports
required for HWC Validation.

JIRA:None
Tests:compilation of hwcomposer validation works fine.

Signed-off-by:Munish Bhardwaj<munishx.bhardwaj@intel.com>
---
 androidia_64/hwc-valsetup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/androidia_64/hwc-valsetup.sh b/androidia_64/hwc-valsetup.sh
index b606219a4..7a7356112 100644
--- a/androidia_64/hwc-valsetup.sh
+++ b/androidia_64/hwc-valsetup.sh
@@ -1,5 +1,5 @@
 LOCAL_PATH="$(gettop)"
-HWCOMPOSER_PATH="$(find vendor -name hwcomposer)"
+HWCOMPOSER_PATH="$(find vendor -name hwcomposer*)"
 export HWCVAL_ROOT=$LOCAL_PATH/$HWCOMPOSER_PATH/tests/hwc-val/tests/hwc
 export VAL_HWC_TOP="`( cd "$HWCVAL_ROOT/../.." && pwd)`"
 export PATH=$HWCVAL_ROOT/host_scripts:$HWCVAL_ROOT/tools:$PATH

From a117be25032ead7d1c891342836fedd7915c74a2 Mon Sep 17 00:00:00 2001
From: yayongdx <yayongx.duan@intel.com>
Date: Mon, 5 Feb 2018 17:06:29 +0800
Subject: [PATCH 183/427] Debug: Coredump: enable Coredump on androidia

  This patch enable coredump by adding "debug-coredump: true"
into mixin spec file and enable "ELF_CORE" in kernel config.

Jira: Link to Jira [Default:None.]
Test: Test in on KBL-NUC device, APCOREDUMP can work normally.
Signed-off-by: yayongdx <yayongx.duan@intel.com>
---
 androidia_64/mixins.spec          | 1 +
 kernel_config/kernel_64_defconfig | 2 +-
 sepolicy/coredump/file.te         | 1 +
 sepolicy/coredump/file_contexts   | 2 ++
 sepolicy/coredump/netd.te         | 4 ++++
 5 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 sepolicy/coredump/file.te
 create mode 100644 sepolicy/coredump/file_contexts
 create mode 100644 sepolicy/coredump/netd.te

diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index 9e26ac7ac..53ab19a09 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -35,6 +35,7 @@ vendor-partition: true(partition_size=1500,partition_name=android_vendor)
 factory-partition: true
 debug-crashlogd: true
 debug-logs: true
+debug-coredump: true
 debug-phonedoctor: true
 debug-tools: true
 flashfiles: ini(oemvars=false,version=3.0,fastboot_min_battery_level=3500,installer=true)
diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 45f56a379..a03a2448d 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -190,7 +190,7 @@ CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_PRINTK=y
 CONFIG_PRINTK_NMI=y
 CONFIG_BUG=y
-# CONFIG_ELF_CORE is not set
+CONFIG_ELF_CORE=y
 CONFIG_PCSPKR_PLATFORM=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
diff --git a/sepolicy/coredump/file.te b/sepolicy/coredump/file.te
new file mode 100644
index 000000000..4797e3923
--- /dev/null
+++ b/sepolicy/coredump/file.te
@@ -0,0 +1 @@
+type coredump_log_file, mlstrustedobject, file_type, data_file_type;
diff --git a/sepolicy/coredump/file_contexts b/sepolicy/coredump/file_contexts
new file mode 100644
index 000000000..7070f6e2b
--- /dev/null
+++ b/sepolicy/coredump/file_contexts
@@ -0,0 +1,2 @@
+# Coredump path
+/data/core(/.*)?                u:object_r:coredump_log_file:s0
diff --git a/sepolicy/coredump/netd.te b/sepolicy/coredump/netd.te
new file mode 100644
index 000000000..3840c3291
--- /dev/null
+++ b/sepolicy/coredump/netd.te
@@ -0,0 +1,4 @@
+userdebug_or_eng(`
+	allow netd coredump_log_file:dir create_dir_perms;
+	allow netd coredump_log_file:file create_file_perms;
+')

From 8325b293d0bf1e10ff77015c94284b9e25a2a2d0 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Mon, 26 Feb 2018 09:21:28 +0530
Subject: [PATCH 184/427] [AIA-O] Mixinup coredump

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/.mixins.spec.swp | Bin 0 -> 12288 bytes
 androidia_64/device.mk        |  17 +++++++++++++++++
 androidia_64/init.coredump.rc |  21 +++++++++++++++++++++
 androidia_64/init.rc          |   4 ++++
 4 files changed, 42 insertions(+)
 create mode 100644 androidia_64/.mixins.spec.swp
 create mode 100644 androidia_64/init.coredump.rc

diff --git a/androidia_64/.mixins.spec.swp b/androidia_64/.mixins.spec.swp
new file mode 100644
index 0000000000000000000000000000000000000000..51b7f0d4134cb9e65afacdc3740474b9ac1120ea
GIT binary patch
literal 12288
zcmeI2J&znU7{`4yk$~e>iYNzYcFE4|-U}gFX^RMggb*SE4iHf^^4QPJSnC-NwrB5_
zB1q67K}nH{CK7G(2`DM3fCh<=z!wM&{O4tJcPWBWMtG#Z#`D;I{P_1gKIybhXCJ@w
zUi8M!0mJhgW4Ft1K6~wtzqkIp#aP-XEnEA4Jl(kX)5~vNQ4bw?vl}@5<oyrc{qWkA
zH?K~4C9P31Ry@v?FPd~JX{7{BRpm)<x)a4WO~sRo2h&m=tIF-Tn#4ob3!Q;LATSVU
zd=_8YKHT5iowb%%UwJut@rA>HClCk(0)apv5C{YUfj}S-2n7B|1bn^4zQlf?81}p~
zytf{B51-)`2m}IwKp+qZ1OkCTAP@)y0)apv5C{YUk0Ak$ANW6ilCi5#A$a`$zxn_F
z-m{GT2K@^C4Bdt9KtDp?LtjB9v<?0K3}Zh*cc34j@1O<}&>{2^bPoD@8*4!VI)vVa
z#?X1_9CYt##{PnSf$l;DbPbwAW9WJ4AH;bZx&?g;-GnmeBdFcOc_=)AKp+qZ1OkCT
zAP@)y0)fDz5hx$=q0(C}mh;HlhM3?bSw4>%m-bDjjEJ2UyoxQQ#`t-ZaqWn8ws|Be
z<Bj$Vvz=cLUP>j^(9AS<MW!^ld88^eGE}a(b&Jl)WJT5~Q!Vy)W|NFN-!71ps!CGs
zJ=t}lX+?Um|N3k;!M$0}wI;i0BONnIX_Lp^7!B85@V%ujOhwWNZ|oVnHu>3s!Xh+S
z<t9|#&RNGbw_bUKHP}~FNn;;0kM0jkoce+myKRgowhAB@!zJOQ_b_I{RGG?8d!mY`
znk4fD*^+DUtbI1>?hq%XkyH+w)haLiCVV7k9u>y<3tR{$m0QMXgHGOf11!h2B~v3&
z8|OA#Dh=N)q)}$9pahfJg%^maZX99ofiRX_`x$d9ih1OgnjL8l3hGE7sZ256NM*20
zfAtx6n^~K$Vfcx4)LOOSl5A2Nt;BjUJDyEWSv6IQi?d0|b0v}`trM?GGL2tcnoYQK
zO-V_rj7uDe#-a^>9fygB@jl}LO{yD06?lZ4dZ1xTvK3*wry@d@hf116!`2h*R7p*V
zLA7lb7&9)@q-uF|6$N*3&Sl;j@+8Y#OS{&59ZRa5Y72gI032$E=LG6yqq#>;yK>Bs
zm(37rv)nnCg{aZrUKo%4y2dQuro*$6q{8t#6?$iJaygus?lZx6;!J}~_U19mEw2kD
z+A6r8o>5NK<qJKz;z;cEtyQC!yc*m|TcT&<8wWH``;wc$q1Hz14wN1BshmeODpfhB
zR>V%0I@#o2C2>w$5W`Vt*K=!{+TCERwnjF>@09p+)9)TlcD>|vt*RUY`s?vh;pCpV
QPT$+7y`y%5s&24<0f!+SK>z>%

literal 0
HcmV?d00001

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index a2bb57c85..5a9c7380a 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -477,6 +477,23 @@ CRASHLOGD_MODULE_MODEM ?= true
 CRASHLOGD_USE_SD := false
 endif
 ##############################################################
+# Source: device/intel/mixins/groups/debug-coredump/true/product.mk
+##############################################################
+ifeq ($(MIXIN_DEBUG_LOGS),true)
+PRODUCT_COPY_FILES += $(LOCAL_PATH)/init.coredump.rc:root/init.coredump.rc
+endif
+
+ifeq ($(MIXIN_DEBUG_LOGS),true)
+BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/coredump
+# Enable core dump for eng builds
+ifeq ($(TARGET_BUILD_VARIANT),eng)
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.core.enabled=1
+else
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.core.enabled=0
+endif
+CRASHLOGD_COREDUMP := true
+endif
+##############################################################
 # Source: device/intel/mixins/groups/debug-phonedoctor/true/product.mk
 ##############################################################
 ifeq ($(MIXIN_DEBUG_LOGS),true)
diff --git a/androidia_64/init.coredump.rc b/androidia_64/init.coredump.rc
new file mode 100644
index 000000000..6263c89ca
--- /dev/null
+++ b/androidia_64/init.coredump.rc
@@ -0,0 +1,21 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/debug-coredump/true/init.coredump.rc
+##############################################################
+on early-init
+    setrlimit 4 -1 -1
+
+    # Add code sections in coredump
+    write /proc/self/coredump_filter 0x2F
+
+on post-fs-data
+    mkdir /data/core 0773 root log
+    write /proc/sys/kernel/core_pattern /data/core/%t_%p_%s_%e.core
+
+on property:persist.core.enabled=0
+    setrlimit 4 0 0
+
+on property:persist.core.enabled=1
+    setrlimit 4 -1 -1
+# ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 4c145c051..e3b44f1cc 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -555,6 +555,10 @@ import /init.logs.rc
 ##############################################################
 import /init.crashlogd.rc
 ##############################################################
+# Source: device/intel/mixins/groups/debug-coredump/true/init.rc
+##############################################################
+import /init.coredump.rc
+##############################################################
 # Source: device/intel/mixins/groups/midi/true/init.rc
 ##############################################################
 on property:sys.usb.config=midi

From ba6d8e809e24428738005072d7a129237fdce639 Mon Sep 17 00:00:00 2001
From: shyjumon <shyjumon.n@intel.com>
Date: Fri, 23 Feb 2018 02:15:39 +0530
Subject: [PATCH 185/427] F2FS support disabled

As F2FS userspace utilities are not present.
This is creating issue in adoptable storage, so disabling till userspace readiness.
[Need to bring in when userspace is ready]

Jira: None
Test: None

Signed-off-by: shyjumon <shyjumon.n@intel.com>
---
 kernel_config/kernel_64_defconfig | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index a03a2448d..6d9c6182f 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -6260,11 +6260,11 @@ CONFIG_BTRFS_FS=m
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_NILFS2_FS is not set
-CONFIG_F2FS_FS=y
-CONFIG_F2FS_STAT_FS=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-CONFIG_F2FS_FS_SECURITY=y
+# CONFIG_F2FS_FS is not set
+# CONFIG_F2FS_STAT_FS is not set
+# CONFIG_F2FS_FS_XATTR is not set
+# CONFIG_F2FS_FS_POSIX_ACL is not set
+# CONFIG_F2FS_FS_SECURITY is not set
 # CONFIG_FS_DAX is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=m

From 7ed53c1ef7f4164aab8264704970bb90d1f53749 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Tue, 27 Feb 2018 12:18:55 +0530
Subject: [PATCH 186/427] [AIA] Handle multi touch changes through google_diff

Revert "Enable Multitouch driver"

This reverts commit 889607f05b6a403c253e46cf5b6ad2d0103b77a0.
---
 kernel_config/kernel_64_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 6d9c6182f..726251f34 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -4902,7 +4902,7 @@ CONFIG_LOGIWHEELS_FF=y
 CONFIG_HID_MAGICMOUSE=m
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
-CONFIG_HID_MULTITOUCH=y
+CONFIG_HID_MULTITOUCH=m
 CONFIG_HID_NTRIG=m
 CONFIG_HID_ORTEK=m
 CONFIG_HID_PANTHERLORD=m

From 077eef8bbf613b565f829462826fb57393f22c72 Mon Sep 17 00:00:00 2001
From: "ji, zhenlong z" <zhenlong.z.ji@intel.com>
Date: Mon, 26 Feb 2018 10:40:28 +0800
Subject: [PATCH 187/427] SELinux: allow apps create icmp socket for themselves

kernel 4.14 add a new class of icmp_socket, cts test
suites need the access permissions to this new class
to complete their tests.

Jira: None
Test: The device can boot to UI and there are no obvious
regressions should be found.

Signed-off-by: ji, zhenlong z <zhenlong.z.ji@intel.com>
---
 sepolicy/kernel/appdomain.te | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sepolicy/kernel/appdomain.te b/sepolicy/kernel/appdomain.te
index 3fd8e136f..964be21aa 100644
--- a/sepolicy/kernel/appdomain.te
+++ b/sepolicy/kernel/appdomain.te
@@ -1 +1,2 @@
 allow appdomain proc_version:file r_file_perms;
+allow appdomain self:icmp_socket create_socket_perms_no_ioctl;

From 1e5d969e97e68913e1468209a79f17e24dc9beb0 Mon Sep 17 00:00:00 2001
From: "ji, zhenlong z" <zhenlong.z.ji@intel.com>
Date: Fri, 9 Mar 2018 16:03:55 +0800
Subject: [PATCH 188/427] allow platform app to do GEM GTT MMAP for render
 device

When the keyguard is shown with the music playing underground,
systemui will do some render operations.

Jira: None
Test: When the keyguard is shown with the music playing
underground, the screen shouldn't to flicker.

Signed-off-by: ji, zhenlong z <zhenlong.z.ji@intel.com>
---
 sepolicy/graphics/android_ia/platform_app.te | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sepolicy/graphics/android_ia/platform_app.te b/sepolicy/graphics/android_ia/platform_app.te
index 3416c11c6..c0b2acbf4 100644
--- a/sepolicy/graphics/android_ia/platform_app.te
+++ b/sepolicy/graphics/android_ia/platform_app.te
@@ -26,5 +26,6 @@ allowxperm platform_app gpu_device:chr_file ioctl {
 	DRM_IOCTL_I915_GEM_CONTEXT_DESTROY
 	DRM_IOCTL_I915_GET_RESET_STATS
 	DRM_IOCTL_I915_REG_READ
+	DRM_IOCTL_I915_GEM_MMAP_GTT
 	0x6475
 };

From 9773bd1d20e3bf503e8792eb03f78d9e54486b8c Mon Sep 17 00:00:00 2001
From: "Yue, VincentX" <vincentx.yue@intel.com>
Date: Thu, 8 Mar 2018 11:26:27 +0800
Subject: [PATCH 189/427] Config default wallpaper picker package to
 com.android.wallpaperpicker

Nexus6P and Google emulator all of them are config defalut wallpaper,
it can improve user experience, and avoid to the end user set the live
wallpaper picker as default application.

Due to the AOSP wallpaperpicker not only set wallpaper but also can set
the live wallpaper. So, select the AOSP wallpaperpicker as default is the
best choice.

JIRA:None
Tests:Long press home screen, click wallpaper, don't pop up menu.

Signed-off-by: Yue, VincentX <vincentx.yue@intel.com>
---
 common/overlay/packages/apps/Launcher3/res/values/config.xml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 common/overlay/packages/apps/Launcher3/res/values/config.xml

diff --git a/common/overlay/packages/apps/Launcher3/res/values/config.xml b/common/overlay/packages/apps/Launcher3/res/values/config.xml
new file mode 100644
index 000000000..4e71f19c2
--- /dev/null
+++ b/common/overlay/packages/apps/Launcher3/res/values/config.xml
@@ -0,0 +1,4 @@
+<resources>
+    <!-- Package name of the default wallpaper picker. -->
+    <string name="wallpaper_picker_package" translatable="false">com.android.wallpaperpicker</string>
+</resources>

From a8b86a8b491a7fcd949165cdadf7f7d899aa933c Mon Sep 17 00:00:00 2001
From: Ming Tan <ming.tan@intel.com>
Date: Thu, 1 Feb 2018 10:45:53 +0800
Subject: [PATCH 190/427] Change the sepolicy setting of partitions after
 delete 'android_'.

Jira: None.
Test: Test it in Joule and KBL NUC.

Signed-off-by: Zhou, Lihua <lihuax.zhou@intel.com>
Signed-off-by: Ming Tan <ming.tan@intel.com>
---
 sepolicy/boot-arch/android_ia/file_contexts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sepolicy/boot-arch/android_ia/file_contexts b/sepolicy/boot-arch/android_ia/file_contexts
index 49807ffd8..809a4aaf3 100644
--- a/sepolicy/boot-arch/android_ia/file_contexts
+++ b/sepolicy/boot-arch/android_ia/file_contexts
@@ -2,10 +2,10 @@
 # Block Devices
 #
 
-/dev/block/(pci|platform)(/.*)?/.*/by-name/android_boot       u:object_r:boot_block_device:s0
-/dev/block/(pci|platform)(/.*)?/.*/by-name/android_persistent u:object_r:frp_block_device:s0
-/dev/block/(pci|platform)(/.*)?/.*/by-name/android_recovery   u:object_r:recovery_block_device:s0
-/dev/block/(pci|platform)(/.*)?/.*/by-name/android_metadata   u:object_r:metadata_block_device:s0
-/dev/block/(pci|platform)(/.*)?/.*/by-name/android_cache      u:object_r:cache_block_device:s0
-/dev/block/(pci|platform)(/.*)?/.*/by-name/android_data       u:object_r:userdata_block_device:s0
-/dev/block/(pci|platform)(/.*)?/.*/by-name/android_misc       u:object_r:misc_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/boot       u:object_r:boot_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/persistent u:object_r:frp_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/recovery   u:object_r:recovery_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/metadata   u:object_r:metadata_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/cache      u:object_r:cache_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/data       u:object_r:userdata_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/misc       u:object_r:misc_block_device:s0

From 11713bba713942e216da8af2242e1dac53037531 Mon Sep 17 00:00:00 2001
From: "Zhou, Lihua" <lihuax.zhou@intel.com>
Date: Fri, 23 Feb 2018 10:25:02 +0800
Subject: [PATCH 191/427] Set the sepolicy configuration of directorys in root
 directory.

It is needed for build the system.img after enable AVB and A/B slot.

Jira: None.
Test: Test it in Joule and KBL NUC using kernelflinger.

Signed-off-by: Zhou, Lihua <lihuax.zhou@intel.com>
Signed-off-by: Ming Tan <ming.tan@intel.com>
---
 sepolicy/boot-arch/android_ia/file_contexts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sepolicy/boot-arch/android_ia/file_contexts b/sepolicy/boot-arch/android_ia/file_contexts
index 809a4aaf3..db3f7509d 100644
--- a/sepolicy/boot-arch/android_ia/file_contexts
+++ b/sepolicy/boot-arch/android_ia/file_contexts
@@ -9,3 +9,11 @@
 /dev/block/(pci|platform)(/.*)?/.*/by-name/cache      u:object_r:cache_block_device:s0
 /dev/block/(pci|platform)(/.*)?/.*/by-name/data       u:object_r:userdata_block_device:s0
 /dev/block/(pci|platform)(/.*)?/.*/by-name/misc       u:object_r:misc_block_device:s0
+
+/file_contexts.bin           u:object_r:rootfs:s0
+/metadata                    u:object_r:rootfs:s0
+/misc                        u:object_r:rootfs:s0
+/boot                        u:object_r:rootfs:s0
+/gpt.androidia_64.ini        u:object_r:rootfs:s0
+/persistent                  u:object_r:rootfs:s0
+/tos                         u:object_r:rootfs:s0

From d28dd6b086b66eef68d773952b37cb25b3cc63fa Mon Sep 17 00:00:00 2001
From: Ming Tan <ming.tan@intel.com>
Date: Fri, 15 Dec 2017 13:06:48 +0800
Subject: [PATCH 192/427] Set the vendor partition to use default value in
 mixins.

So if the mixins change the default partition name, need not to modify
this file again.

Jira: None.
Test: Test it in Joule and KBL NUC, can boot to UI.

Signed-off-by: tanminger <ming.tan@intel.com>
---
 androidia_64/mixins.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index 53ab19a09..f01e66d44 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -31,7 +31,7 @@ usb: host+acc
 lights: true
 thermal: dptf(intel_modem=true)
 config-partition: enabled
-vendor-partition: true(partition_size=1500,partition_name=android_vendor)
+vendor-partition: true
 factory-partition: true
 debug-crashlogd: true
 debug-logs: true

From f2e00a334551677e074c6524ed447dfe78ad2ef6 Mon Sep 17 00:00:00 2001
From: Ming Tan <ming.tan@intel.com>
Date: Tue, 6 Feb 2018 14:17:50 +0800
Subject: [PATCH 193/427] Move 'call
 inherit-product,build/target/product/verity.mk' to mixins.

In mixins, only 'call inherit-product,build/target/product/verity.mk'
when use GVB.

Jira: None
Test: Test it Joule, can boot to UI.

Signed-off-by: Ming Tan <ming.tan@intel.com>
---
 androidia_64/device.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 5a9c7380a..efce20f86 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -573,7 +573,6 @@ ifeq ($(ENABLE_NATIVEBRIDGE_64BIT),true)
   PRODUCT_PACKAGES += houdini64
   PRODUCT_PROPERTY_OVERRIDES += ro.dalvik.vm.isa.arm64=x86_64 ro.enable.native.bridge.exec64=1
 endif
-$(call inherit-product,build/target/product/verity.mk)
 ##############################################################
 # Source: device/intel/mixins/groups/debug-phonedoctor/true/product.mk
 ##############################################################

From d3291cc99bc1077327d8bdbedeca948b2ec56bfa Mon Sep 17 00:00:00 2001
From: Ming Tan <ming.tan@intel.com>
Date: Tue, 6 Feb 2018 21:30:18 +0800
Subject: [PATCH 194/427] Move the flash.json to
 mixins/groups/boot-arch/android_ia.

Now use mixin to generate the flash.json according configuration.

Jira: None.
Test: Test it in Joule and KBL NUC using kernelflinger, can boot to UI.

Signed-off-by: Ming Tan <ming.tan@intel.com>
---
 androidia_64/flash.json | 554 ----------------------------------------
 1 file changed, 554 deletions(-)
 delete mode 100644 androidia_64/flash.json

diff --git a/androidia_64/flash.json b/androidia_64/flash.json
deleted file mode 100644
index c38ebb783..000000000
--- a/androidia_64/flash.json
+++ /dev/null
@@ -1,554 +0,0 @@
-{
-    "flash": {
-        "commands": [
-            {
-                "args": "flashing unlock", 
-                "description": "Set device state to unlocked", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "update"
-                ], 
-                "retry": 1, 
-                "timeout": 60000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "args": "flash boot ${boot}", 
-                "description": "Flash boot partition", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "update"
-                ], 
-                "retry": 1, 
-                "timeout": 60000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "args": "flash recovery ${recovery}", 
-                "description": "Flash recovery partition", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "update"
-                ], 
-                "retry": 1, 
-                "timeout": 60000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "args": "flash factory ${factory}", 
-                "description": "Flash factory partition", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "update"
-                ], 
-                "retry": 1, 
-                "timeout": 60000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "args": "flash tos ${tos}", 
-                "description": "Flash tos partition", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "update"
-                ], 
-                "retry": 1, 
-                "timeout": 60000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "args": "flash system ${system}", 
-                "description": "Flash system partition", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "update"
-                ], 
-                "retry": 1, 
-                "timeout": 600000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "args": "flash bootloader ${bootloader}", 
-                "description": "Flash bootloader partition", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "update"
-                ], 
-                "retry": 1, 
-                "timeout": 60000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "args": "flash vendor ${vendor}", 
-                "description": "Flash bootloader partition", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "update"
-                ], 
-                "retry": 1, 
-                "timeout": 60000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "args": "flashing lock", 
-                "description": "Set device state to locked", 
-                "group": "lock-device", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "update"
-                ], 
-                "retry": 1, 
-                "timeout": 60000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "args": "continue", 
-                "description": "Boot to main OS", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "update"
-                ], 
-                "retry": 1, 
-                "timeout": 60000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "description": "Leave time to the BIOS to clear the USB stack", 
-                "duration": 500, 
-                "restrict": [
-                    "blank"
-                ], 
-                "tool": "sleep"
-            }, 
-            {
-                "args": "flashing unlock", 
-                "description": "Set device state to unlocked", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "blank"
-                ], 
-                "retry": 1, 
-                "timeout": 60000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "args": "flash gpt ${gpt}", 
-                "description": "Initialize the partition table", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "blank"
-                ], 
-                "retry": 1, 
-                "timeout": 60000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "args": "erase misc", 
-                "description": "Erase misc partition", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "blank"
-                ], 
-                "retry": 1, 
-                "timeout": 60000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "args": "erase persistent", 
-                "description": "Erase persistent partition", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "blank"
-                ], 
-                "retry": 1, 
-                "timeout": 60000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "args": "erase metadata", 
-                "description": "Erase metadata partition", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "blank"
-                ], 
-                "retry": 1, 
-                "timeout": 60000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "args": "format config", 
-                "description": "Format config partition", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "blank"
-                ], 
-                "retry": 1, 
-                "timeout": 60000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "args": "format cache", 
-                "description": "Format cache partition", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "blank"
-                ], 
-                "retry": 1, 
-                "timeout": 60000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "args": "format data", 
-                "description": "Format data partition", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "blank"
-                ], 
-                "retry": 1, 
-                "timeout": 60000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "args": "flash vendor ${vendor}", 
-                "description": "Flash bootloader partition", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "blank"
-                ], 
-                "retry": 1, 
-                "timeout": 60000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "args": "flash boot ${boot}", 
-                "description": "Flash boot partition", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "blank"
-                ], 
-                "retry": 1, 
-                "timeout": 60000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "args": "flash recovery ${recovery}", 
-                "description": "Flash recovery partition", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "blank"
-                ], 
-                "retry": 1, 
-                "timeout": 60000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "args": "flash factory ${factory}", 
-                "description": "Flash factory partition", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "blank"
-                ], 
-                "retry": 1, 
-                "timeout": 60000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "args": "flash tos ${tos}", 
-                "description": "Flash tos partition", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "blank"
-                ], 
-                "retry": 1, 
-                "timeout": 60000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "args": "flash system ${system}", 
-                "description": "Flash system partition", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "blank"
-                ], 
-                "retry": 1, 
-                "timeout": 600000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "args": "flash bootloader ${bootloader}", 
-                "description": "Flash bootloader partition", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "blank"
-                ], 
-                "retry": 1, 
-                "timeout": 60000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "args": "flashing lock", 
-                "description": "Set device state to locked", 
-                "group": "lock-device", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "blank"
-                ], 
-                "retry": 1, 
-                "timeout": 60000, 
-                "tool": "fastboot"
-            }, 
-            {
-                "args": "continue", 
-                "description": "Boot to main OS", 
-                "mandatory": true, 
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV", 
-                    "expression": "${battery} >= 3500", 
-                    "skipOnFailure": false
-                }, 
-                "restrict": [
-                    "blank"
-                ], 
-                "retry": 1, 
-                "timeout": 60000, 
-                "tool": "fastboot"
-            } 
-        ], 
-        "configurations": {
-            "blank": {
-                "brief": "blank", 
-                "description": "erase and flash all partitions, all data will be lost.", 
-                "groupsState": {
-                    "check-battery": true, 
-                    "erase-efivars": true, 
-                    "lock-device": true
-                }, 
-                "name": "blank", 
-                "startState": "pos"
-            }, 
-            "update": {
-                "brief": "update", 
-                "default": true, 
-                "description": "update phone to new release", 
-                "groupsState": {
-                    "check-battery": true, 
-                    "lock-device": true
-                }, 
-                "name": "update", 
-                "startState": "pos"
-            }
-        }, 
-        "groups": {
-            "check-battery": {
-                "description": "Check battery level before sending fastboot command", 
-                "name": "Check battery level"
-            }, 
-            "erase-efivars": {
-                "description": "Erase all optional efi vars", 
-                "name": "Erase efi vars"
-            }, 
-            "lock-device": {
-                "description": "Put the device in locked state at the end of the flash procedure.", 
-                "name": "Lock the device (it implies the userdata partition wipe)"
-            }
-        }, 
-        "osplatform": "android", 
-        "parameters": {
-            "battery": {
-                "computedValue": "$1", 
-                "description": "Fetch battery", 
-                "filter": "battery-voltage:[\\s]*([0-9]+)mV", 
-                "name": "battery", 
-                "subCommand": {
-                    "args": "getvar battery-voltage", 
-                    "description": "Fetch battery", 
-                    "mandatory": true, 
-                    "retry": 1, 
-                    "timeout": 60000, 
-                    "tool": "fastboot"
-                }, 
-                "type": "variable", 
-                "value": 3500
-            }, 
-            "boot": {
-                "description": "boot.img", 
-                "name": "boot", 
-                "type": "file", 
-                "value": "boot.img"
-            }, 
-            "bootloader": {
-                "description": "bootloader", 
-                "name": "bootloader", 
-                "type": "file", 
-                "value": "bootloader"
-            }, 
-            "gpt": {
-                "description": "gpt.bin", 
-                "name": "gpt", 
-                "type": "file", 
-                "value": "gpt.bin"
-            }, 
-            "recovery": {
-                "description": "recovery.img", 
-                "name": "recovery", 
-                "type": "file", 
-                "value": "recovery.img"
-            }, 
-            "factory": {
-                "description": "factory.img", 
-                "name": "factory", 
-                "type": "file", 
-                "value": "factory.img"
-            }, 
-            "tos": {
-                "description": "tos.img", 
-                "name": "tos", 
-                "type": "file", 
-                "value": "tos.img"
-            }, 
-            "system": {
-                "description": "system.img", 
-                "name": "system", 
-                "type": "file", 
-                "value": "system.img"
-            },
-            "vendor": {
-                "description": "vendor.img", 
-                "name": "vendor", 
-                "type": "file", 
-                "value": "vendor.img"
-            }
-        }, 
-        "version": "3.0"
-    }
-}

From d432dc217f2db5fc49a6229555754f22d7cfb4a2 Mon Sep 17 00:00:00 2001
From: Ming Tan <ming.tan@intel.com>
Date: Wed, 7 Feb 2018 09:40:08 +0800
Subject: [PATCH 195/427] Enable AVB and A/B slot.

Jira: None.
Test: Test it in Joule and KBL NUC using kernelflinger, can boot to UI.

Signed-off-by: Ming Tan <ming.tan@intel.com>
---
 androidia_64/mixins.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index f01e66d44..346a3fbaa 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -45,3 +45,5 @@ slcan: default
 ioc-slcan-reboot: false
 camera: usbcamera
 memtrack: true
+avb: true
+slot-ab: true

From 26cc8c192fe3a2eecc1aae12d0c1f266835c9a53 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Mon, 19 Mar 2018 15:40:46 +0530
Subject: [PATCH 196/427] [AIA] Mxinup for AVB

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/AndroidBoard.mk | 207 ++++++++------
 androidia_64/BoardConfig.mk  | 100 ++++---
 androidia_64/device.mk       |  21 +-
 androidia_64/flash.json      | 509 +++++++++++++++++++++++++++++++++++
 androidia_64/flashfiles.ini  |  78 +++---
 androidia_64/fstab           |  52 ++--
 androidia_64/gpt.ini         |  50 ++--
 androidia_64/init.rc         |  84 +++---
 androidia_64/installer.cmd   |  19 +-
 androidia_64/ueventd.rc      |   2 +-
 10 files changed, 881 insertions(+), 241 deletions(-)
 create mode 100644 androidia_64/flash.json

diff --git a/androidia_64/AndroidBoard.mk b/androidia_64/AndroidBoard.mk
index 271d3e63e..59609096e 100644
--- a/androidia_64/AndroidBoard.mk
+++ b/androidia_64/AndroidBoard.mk
@@ -6,6 +6,17 @@
 droid: flashfiles
 	-$(hide) $(ACP) $(out_flashfiles) $(DIST_DIR)
 ##############################################################
+# Source: device/intel/mixins/groups/slot-ab/true/AndroidBoard.mk
+##############################################################
+
+make_dir_slot_ab:
+	@mkdir -p $(PRODUCT_OUT)/root/boot
+	@mkdir -p $(PRODUCT_OUT)/root/misc
+	@mkdir -p $(PRODUCT_OUT)/root/persistent
+	@mkdir -p $(PRODUCT_OUT)/root/metadata
+
+$(PRODUCT_OUT)/ramdisk.img: make_dir_slot_ab
+##############################################################
 # Source: device/intel/mixins/groups/kernel/android_ia/AndroidBoard.mk
 ##############################################################
 ifneq ($(TARGET_PREBUILT_KERNEL),)
@@ -80,6 +91,96 @@ installclean: FILES += $(KERNEL_OUT) $(PRODUCT_OUT)/kernel
 .PHONY: kernel
 kernel: $(PRODUCT_OUT)/kernel
 ##############################################################
+# Source: device/intel/mixins/groups/factory-partition/true/AndroidBoard.mk
+##############################################################
+INSTALLED_FACTORYIMAGE_TARGET := $(PRODUCT_OUT)/factory.img
+selinux_fc := $(TARGET_ROOT_OUT)/file_contexts.bin
+
+$(INSTALLED_FACTORYIMAGE_TARGET) : PRIVATE_SELINUX_FC := $(selinux_fc)
+$(INSTALLED_FACTORYIMAGE_TARGET) : $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK) $(selinux_fc)
+	$(call pretty,"Target factory fs image: $(INSTALLED_FACTORYIMAGE_TARGET)")
+	@mkdir -p $(PRODUCT_OUT)/factory
+	$(hide)	$(MKEXTUSERIMG) -s \
+		$(PRODUCT_OUT)/factory \
+		$(PRODUCT_OUT)/factory.img \
+		ext4 \
+		factory \
+		$(BOARD_FACTORYIMAGE_PARTITION_SIZE) \
+		$(PRIVATE_SELINUX_FC)
+
+INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_FACTORYIMAGE_TARGET)
+
+selinux_fc :=
+
+.PHONY: factoryimage
+factoryimage: $(INSTALLED_FACTORYIMAGE_TARGET)
+
+make_dir_ab_factory:
+	@mkdir -p $(PRODUCT_OUT)/root/factory
+
+$(PRODUCT_OUT)/ramdisk.img: make_dir_ab_factory
+##############################################################
+# Source: device/intel/mixins/groups/config-partition/enabled/AndroidBoard.mk
+##############################################################
+INSTALLED_CONFIGIMAGE_TARGET := $(PRODUCT_OUT)/config.img
+
+selinux_fc := $(TARGET_ROOT_OUT)/file_contexts.bin
+
+$(INSTALLED_CONFIGIMAGE_TARGET) : PRIVATE_SELINUX_FC := $(selinux_fc)
+$(INSTALLED_CONFIGIMAGE_TARGET) : $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK) $(selinux_fc)
+	$(call pretty,"Target config fs image: $(INSTALLED_CONFIGIMAGE_TARGET)")
+	@mkdir -p $(PRODUCT_OUT)/config
+	$(hide)	PATH=$(HOST_OUT_EXECUTABLES):$$PATH \
+		$(MKEXTUSERIMG) -s \
+		$(PRODUCT_OUT)/config \
+		$(PRODUCT_OUT)/config.img \
+		ext4 \
+		oem_config \
+		$(BOARD_CONFIGIMAGE_PARTITION_SIZE) \
+		$(PRIVATE_SELINUX_FC)
+
+INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_CONFIGIMAGE_TARGET)
+
+selinux_fc :=
+
+selinux_fc :=
+.PHONY: configimage
+configimage: $(INSTALLED_CONFIGIMAGE_TARGET)
+
+make_dir_ab_config:
+	@mkdir -p $(PRODUCT_OUT)/root/oem_config
+
+$(PRODUCT_OUT)/ramdisk.img: make_dir_ab_config
+##############################################################
+# Source: device/intel/mixins/groups/variants/default/AndroidBoard.mk
+##############################################################
+# flashfile_add_blob <blob_name> <path> <mandatory> <var_name>
+# - Delete ::variant:: from <path>
+# - If the result does not exists and <mandatory> is set, error
+# - If <var_name> is set, put the result in <var_name>
+# - Add the pair <result>:<blob_name> in BOARD_FLASHFILES_FIRMWARE
+define flashfile_add_blob
+$(eval blob := $(subst ::variant::,,$(2))) \
+$(if $(wildcard $(blob)), \
+    $(if $(4), $(eval $(4) := $(blob))) \
+    $(eval BOARD_FLASHFILES_FIRMWARE += $(blob):$(1)) \
+    , \
+    $(if $(3), $(error $(blob) does not exist)))
+endef
+
+##############################################################
+# Source: device/intel/mixins/groups/vendor-partition/true/AndroidBoard.mk
+##############################################################
+
+# This is to ensure that kernel modules are installed before
+# vendor.img is generated.
+$(PRODUCT_OUT)/vendor.img : $(KERNEL_MODULES_INSTALL)
+
+make_dir_ab_vendor:
+	@mkdir -p $(PRODUCT_OUT)/root/vendor
+
+$(PRODUCT_OUT)/ramdisk.img: make_dir_ab_vendor
+##############################################################
 # Source: device/intel/mixins/groups/boot-arch/android_ia/AndroidBoard.mk
 ##############################################################
 src_loader_file := $(PRODUCT_OUT)/efi/kernelflinger.efi
@@ -96,7 +197,11 @@ else
 out_flashfiles := $(PRODUCT_OUT)/$(TARGET_PRODUCT).flashfiles.$(TARGET_BUILD_VARIANT).$(USER).zip
 endif
 
-$(PRODUCT_OUT)/efi/installer.cmd:
+$(PRODUCT_OUT)/efi/installer.cmd: $(TARGET_DEVICE_DIR)/$(@F)
+	$(ACP) $(TARGET_DEVICE_DIR)/$(@F) $@
+	sed -i '/#/d' $@
+
+$(PRODUCT_OUT)/efi/flash.json: $(TARGET_DEVICE_DIR)/$(@F)
 	$(ACP) $(TARGET_DEVICE_DIR)/$(@F) $@
 	sed -i '/#/d' $@
 
@@ -242,6 +347,13 @@ $(BOOTLOADER_POLICY_OEMVARS): sign-efi-sig-list
 		$(BOOTLOADER_POLICY_OEMVARS)
 endif
 
+
+GPT_INI2BIN := ./device/intel/common/gpt_bin/gpt_ini2bin.py
+
+$(BOARD_GPT_BIN): $(TARGET_DEVICE_DIR)/gpt.ini
+	$(hide) $(GPT_INI2BIN) $< > $@
+	$(hide) echo GEN $(notdir $@)
+
 ##############################################################
 # Source: device/intel/mixins/groups/audio/android_ia/AndroidBoard.mk
 ##############################################################
@@ -252,81 +364,6 @@ include device/intel/android_ia/common/audio/AndroidBoard.mk
 ##############################################################
 #LOCAL_KERNEL_PATH := $(abspath $(PRODUCT_OUT)/obj/kernel) is not defined yet
 #$(abspath $(PRODUCT_OUT)/obj/kernel)/copy_modules: iwlwifi
-##############################################################
-# Source: device/intel/mixins/groups/config-partition/enabled/AndroidBoard.mk
-##############################################################
-INSTALLED_CONFIGIMAGE_TARGET := $(PRODUCT_OUT)/config.img
-
-selinux_fc := $(TARGET_ROOT_OUT)/file_contexts.bin
-
-$(INSTALLED_CONFIGIMAGE_TARGET) : PRIVATE_SELINUX_FC := $(selinux_fc)
-$(INSTALLED_CONFIGIMAGE_TARGET) : $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK) $(selinux_fc)
-	$(call pretty,"Target config fs image: $(INSTALLED_CONFIGIMAGE_TARGET)")
-	@mkdir -p $(PRODUCT_OUT)/config
-	$(hide)	PATH=$(HOST_OUT_EXECUTABLES):$$PATH \
-		$(MKEXTUSERIMG) -s \
-		$(PRODUCT_OUT)/config \
-		$(PRODUCT_OUT)/config.img \
-		ext4 \
-		oem_config \
-		$(BOARD_CONFIGIMAGE_PARTITION_SIZE) \
-		$(PRIVATE_SELINUX_FC)
-
-INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_CONFIGIMAGE_TARGET)
-
-selinux_fc :=
-
-selinux_fc :=
-.PHONY: configimage
-configimage: $(INSTALLED_CONFIGIMAGE_TARGET)
-##############################################################
-# Source: device/intel/mixins/groups/vendor-partition/true/AndroidBoard.mk
-##############################################################
-
-# This is to ensure that kernel modules are installed before
-# vendor.img is generated.
-$(PRODUCT_OUT)/vendor.img : $(KERNEL_MODULES_INSTALL)
-##############################################################
-# Source: device/intel/mixins/groups/factory-partition/true/AndroidBoard.mk
-##############################################################
-INSTALLED_FACTORYIMAGE_TARGET := $(PRODUCT_OUT)/factory.img
-selinux_fc := $(TARGET_ROOT_OUT)/file_contexts.bin
-
-$(INSTALLED_FACTORYIMAGE_TARGET) : PRIVATE_SELINUX_FC := $(selinux_fc)
-$(INSTALLED_FACTORYIMAGE_TARGET) : $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK) $(selinux_fc)
-	$(call pretty,"Target factory fs image: $(INSTALLED_FACTORYIMAGE_TARGET)")
-	@mkdir -p $(PRODUCT_OUT)/factory
-	$(hide)	$(MKEXTUSERIMG) -s \
-		$(PRODUCT_OUT)/factory \
-		$(PRODUCT_OUT)/factory.img \
-		ext4 \
-		factory \
-		$(BOARD_FACTORYIMAGE_PARTITION_SIZE) \
-		$(PRIVATE_SELINUX_FC)
-
-INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_FACTORYIMAGE_TARGET)
-
-selinux_fc :=
-
-.PHONY: factoryimage
-factoryimage: $(INSTALLED_FACTORYIMAGE_TARGET)
-##############################################################
-# Source: device/intel/mixins/groups/variants/default/AndroidBoard.mk
-##############################################################
-# flashfile_add_blob <blob_name> <path> <mandatory> <var_name>
-# - Delete ::variant:: from <path>
-# - If the result does not exists and <mandatory> is set, error
-# - If <var_name> is set, put the result in <var_name>
-# - Add the pair <result>:<blob_name> in BOARD_FLASHFILES_FIRMWARE
-define flashfile_add_blob
-$(eval blob := $(subst ::variant::,,$(2))) \
-$(if $(wildcard $(blob)), \
-    $(if $(4), $(eval $(4) := $(blob))) \
-    $(eval BOARD_FLASHFILES_FIRMWARE += $(blob):$(1)) \
-    , \
-    $(if $(3), $(error $(blob) does not exist)))
-endef
-
 ##############################################################
 # Source: device/intel/mixins/groups/flashfiles/ini/AndroidBoard.mk
 ##############################################################
@@ -408,12 +445,30 @@ TOS_SIGNING_CERT := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x
 
 .PHONY: tosimage
 tosimage: $(INSTALLED_TOS_IMAGE_TARGET)
+
+ifeq (true,$(BOARD_AVB_ENABLE)) # BOARD_AVB_ENABLE == true
+$(INSTALLED_TOS_IMAGE_TARGET): $(TOS_IMAGE_TARGET) $(MKBOOTIMG) $(AVBTOOL)
+	@echo "mkbootimg to create boot image for TOS file: $@"
+	$(hide) $(MKBOOTIMG) --kernel $(TOS_IMAGE_TARGET) --output $@
+	$(hide) $(AVBTOOL) add_hash_footer \
+		--image $@ \
+		--partition_size $(BOARD_TOSIMAGE_PARTITION_SIZE) \
+		--partition_name tos $(INTERNAL_AVB_SIGNING_ARGS)
+BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --include_descriptors_from_image $(INSTALLED_TOS_IMAGE_TARGET)
+$(INSTALLED_VBMETAIMAGE_TARGET): $(INSTALLED_TOS_IMAGE_TARGET)
+else
 $(INSTALLED_TOS_IMAGE_TARGET): $(TOS_IMAGE_TARGET) $(MKBOOTIMG) $(BOOT_SIGNER)
 	@echo "mkbootimg to create boot image for TOS file: $@"
 	$(hide) $(MKBOOTIMG) --kernel $(TOS_IMAGE_TARGET) --output $@
 	$(if $(filter true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_BOOT_SIGNER)),\
 		@echo "sign prebuilt TOS file: $@" &&\
 		$(BOOT_SIGNER) /tos $@ $(TOS_SIGNING_KEY) $(TOS_SIGNING_CERT) $@)
+endif
 
 INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_TOS_IMAGE_TARGET)
+
+make_dir_ab_tos:
+	@mkdir -p $(PRODUCT_OUT)/root/tos
+
+$(PRODUCT_OUT)/ramdisk.img: make_dir_ab_tos
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 5dd8f0830..b01cfa361 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -67,6 +67,17 @@ DEVICE_PACKAGE_OVERLAYS += device/intel/common/device-type/overlay-tablet
 ##############################################################
 BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/debugfs
 ##############################################################
+# Source: device/intel/mixins/groups/slot-ab/true/BoardConfig.mk
+##############################################################
+AB_OTA_UPDATER := true
+AB_OTA_PARTITIONS := \
+    boot \
+    system
+BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
+TARGET_NO_RECOVERY := true
+BOARD_USES_RECOVERY_AS_BOOT := true
+BOARD_SLOT_AB_ENABLE := true
+##############################################################
 # Source: device/intel/mixins/groups/kernel/android_ia/BoardConfig.mk
 ##############################################################
 TARGET_USES_64_BIT_BINDER := true
@@ -80,7 +91,8 @@ TARGET_NO_KERNEL ?= false
 KERNEL_LOGLEVEL ?= 3
 SERIAL_PARAMETER := console=tty0 console=ttyS2,115200n8
 
-BOARD_KERNEL_CMDLINE += root=/dev/ram0  androidboot.hardware=$(TARGET_PRODUCT) firmware_class.path=/vendor/firmware loglevel=$(KERNEL_LOGLEVEL)
+
+BOARD_KERNEL_CMDLINE += androidboot.hardware=$(TARGET_PRODUCT) firmware_class.path=/vendor/firmware loglevel=$(KERNEL_LOGLEVEL)
 
 ifneq ($(TARGET_BUILD_VARIANT),user)
 ifeq ($(SPARSE_IMG),true)
@@ -105,6 +117,45 @@ BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/bluetooth/common \
 ##############################################################
 BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/set_storage
 ##############################################################
+# Source: device/intel/mixins/groups/factory-partition/true/BoardConfig.mk
+##############################################################
+BOARD_FACTORYIMAGE_PARTITION_SIZE := 10485760
+BOARD_FLASHFILES += $(PRODUCT_OUT)/factory.img
+BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/factory-partition
+BOARD_SEPOLICY_M4DEFS += module_factory_partition=true
+##############################################################
+# Source: device/intel/mixins/groups/config-partition/enabled/BoardConfig.mk
+##############################################################
+BOARD_CONFIGIMAGE_PARTITION_SIZE := 8388608
+BOARD_FLASHFILES += $(PRODUCT_OUT)/config.img
+BOARD_SEPOLICY_M4DEFS += module_config_partition=true
+BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/config-partition
+##############################################################
+# Source: device/intel/mixins/groups/avb/true/BoardConfig.mk
+##############################################################
+BOARD_AVB_ENABLE := true
+
+KERNELFLINGER_AVB_CMDLINE := true
+
+BOARD_VBMETAIMAGE_PARTITION_SIZE := 2097152
+BOARD_FLASHFILES += $(PRODUCT_OUT)/vbmeta.img
+
+# Now use AVB to support A/B slot
+PRODUCT_STATIC_BOOT_CONTROL_HAL := bootctrl.avb libavb_user
+##############################################################
+# Source: device/intel/mixins/groups/vendor-partition/true/BoardConfig.mk
+##############################################################
+# Those 3 lines are required to enable vendor image generation.
+# Remove them if vendor partition is not used.
+TARGET_COPY_OUT_VENDOR := vendor
+BOARD_VENDORIMAGE_PARTITION_SIZE := 1572864000
+ifeq ($(SPARSE_IMG),true)
+BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
+else
+BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := squashfs
+endif
+BOARD_FLASHFILES += $(PRODUCT_OUT)/vendor.img
+##############################################################
 # Source: device/intel/mixins/groups/boot-arch/android_ia/BoardConfig.mk
 ##############################################################
 #TARGET_NO_RECOVERY ?= false
@@ -117,6 +168,8 @@ BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_FLASH_BLOCK_SIZE := 512
 
+BOARD_BOOTIMAGE_PARTITION_SIZE := 31457280
+
 ifeq ($(SPARSE_IMG),true)
 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false
 BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4
@@ -125,7 +178,7 @@ TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
 BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := squashfs
 endif
 
-BOARD_SYSTEMIMAGE_PARTITION_SIZE = 3758096384
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3758096384
 
 BOARD_BOOTLOADER_PARTITION_SIZE ?= 62914560
 BOARD_BOOTLOADER_BLOCK_SIZE := 512
@@ -154,7 +207,7 @@ BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/boot-arch/android_ia
 #PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.frp.pst=/dev/block/by-name/android_persistent
 
 # Specify file for creating final flashfiles
-BOARD_GPT_INI ?= $(TARGET_DEVICE_DIR)/gpt.ini
+# BOARD_GPT_INI ?= $(TARGET_DEVICE_DIR)/gpt.ini
 BOARD_GPT_BIN = $(PRODUCT_OUT)/gpt.bin
 BOARD_FLASHFILES += $(PRODUCT_OUT)/system.img
 BOARD_FLASHFILES += $(PRODUCT_OUT)/gpt.bin
@@ -165,26 +218,15 @@ BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/startup.nsh
 BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/installer.cmd
 BOARD_FLASHFILES += $(PRODUCT_OUT)/bootloader
 BOARD_FLASHFILES += $(PRODUCT_OUT)/fastboot-usb.img
-BOARD_FLASHFILES += $(PRODUCT_OUT)/recovery.img
-BOARD_FLASHFILES += $(PRODUCT_OUT)/cache.img
-BOARD_FLASHFILES += $(PRODUCT_OUT)/config.img
-BOARD_FLASHFILES += $(PRODUCT_OUT)/vendor.img
-BOARD_FLASHFILES += $(PRODUCT_OUT)/factory.img
-BOARD_FLASHFILES += $(TARGET_DEVICE_DIR)/flash.json
+BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/flash.json
 BOARD_FLASHFILES += $(PRODUCT_OUT)/tos.img
 
 # -- OTA RELATED DEFINES --
 # tell build system where to get the recovery.fstab.
-TARGET_RECOVERY_FSTAB ?= $(TARGET_DEVICE_DIR)/fstab 
+TARGET_RECOVERY_FSTAB ?= $(TARGET_DEVICE_DIR)/fstab
 # Used by ota_from_target_files to add platform-specific directives
 # to the OTA updater scripts
 TARGET_RELEASETOOLS_EXTENSIONS ?= device/intel/common/recovery
-# Adds edify commands swap_entries and copy_partition for robust
-# update of the EFI system partition
-TARGET_RECOVERY_UPDATER_LIBS := libupdater_esp
-# Extra libraries needed to be rolled into recovery updater
-# libgpt_static and libefivar are needed by libupdater_esp
-TARGET_RECOVERY_UPDATER_EXTRA_LIBS := libcommon_recovery libgpt_static libefivar
 # By default recovery minui expects RGBA framebuffer
 TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
 
@@ -352,30 +394,6 @@ BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/thermal
 BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/thermal/dptf
 BOARD_KERNEL_CMDLINE += thermal.off=1
 ##############################################################
-# Source: device/intel/mixins/groups/config-partition/enabled/BoardConfig.mk
-##############################################################
-BOARD_CONFIGIMAGE_PARTITION_SIZE := 8388608
-BOARD_SEPOLICY_M4DEFS += module_config_partition=true
-BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/config-partition
-##############################################################
-# Source: device/intel/mixins/groups/vendor-partition/true/BoardConfig.mk
-##############################################################
-# Those 3 lines are required to enable vendor image generation.
-# Remove them if vendor partition is not used.
-TARGET_COPY_OUT_VENDOR := vendor
-BOARD_VENDORIMAGE_PARTITION_SIZE := 1572864000
-ifeq ($(SPARSE_IMG),true)
-BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
-else
-BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := squashfs
-endif
-##############################################################
-# Source: device/intel/mixins/groups/factory-partition/true/BoardConfig.mk
-##############################################################
-BOARD_FACTORYIMAGE_PARTITION_SIZE := 10485760
-BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/factory-partition
-BOARD_SEPOLICY_M4DEFS += module_factory_partition=true
-##############################################################
 # Source: device/intel/mixins/groups/debug-phonedoctor/true/BoardConfig.mk
 ##############################################################
 BOARD_SEPOLICY_M4DEFS += module_debug_phonedoctor=true
@@ -426,6 +444,8 @@ TRUSTY_ENV_VAR += LKBIN_DIR=$(TRUSTY_BUILDROOT)/build-sand-x86-64/
 
 #Workaround CPU lost issue on SIMICS, will remove this line below after PO.
 BOARD_KERNEL_CMDLINE += cpu_init_udelay=500000
+
+BOARD_TOSIMAGE_PARTITION_SIZE := 10485760
 ##############################################################
 # Source: device/intel/mixins/groups/camera/usbcamera/BoardConfig.mk
 ##############################################################
diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index efce20f86..6556fc931 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -264,6 +264,17 @@ ifeq ($(TARGET_BUILD_VARIANT),user)
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.adb.secure=1
 endif
 ##############################################################
+# Source: device/intel/mixins/groups/slot-ab/true/product.mk
+##############################################################
+
+
+# Currently the update_verifier does not support AVB and A/B slot, so do not include it if enable AVB and A/B slot.
+# Will enable it after the update_verifier updated.
+#PRODUCT_PACKAGES += \
+    update_engine \
+    update_engine_client \
+    update_verifier
+##############################################################
 # Source: device/intel/mixins/groups/kernel/android_ia/product.mk
 ##############################################################
 TARGET_KERNEL_ARCH := x86_64
@@ -301,9 +312,13 @@ PRODUCT_PACKAGES += \
 # create primary storage symlink dynamically
 PRODUCT_PACKAGES += set_storage
 ##############################################################
+# Source: device/intel/mixins/groups/vendor-partition/true/product.mk
+##############################################################
+PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/by-name/vendor
+##############################################################
 # Source: device/intel/mixins/groups/boot-arch/android_ia/product.mk
 ##############################################################
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.frp.pst=/dev/block/by-name/android_persistent
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.frp.pst=/dev/block/by-name/persistent
 
 ifeq ($(TARGET_BOOTLOADER_POLICY),$(filter $(TARGET_BOOTLOADER_POLICY),0x0 0x2 0x4 0x6))
 # OEM Unlock reporting 1
@@ -427,10 +442,6 @@ PRODUCT_PACKAGES += esif_ufd \
     jhs
 PRODUCT_COPY_FILES += $(LOCAL_PATH)/dptf.dv:/system/etc/dptf/dv/dptf.dv
 ##############################################################
-# Source: device/intel/mixins/groups/vendor-partition/true/product.mk
-##############################################################
-PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/by-name/android_vendor
-##############################################################
 # Source: device/intel/mixins/groups/debug-logs/true/product.mk
 ##############################################################
 ifneq ($(TARGET_BUILD_VARIANT),user)
diff --git a/androidia_64/flash.json b/androidia_64/flash.json
new file mode 100644
index 000000000..1685e3476
--- /dev/null
+++ b/androidia_64/flash.json
@@ -0,0 +1,509 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/boot-arch/android_ia/flash.json
+##############################################################
+{
+    "flash": {
+        "commands": [
+            {
+                "args": "flashing unlock",
+                "description": "Set device state to unlocked",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash gpt ${gpt}",
+                "description": "Initialize the partition table",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash bootloader ${bootloader}",
+                "description": "Flash bootloader partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "reboot bootloader",
+                "description": "Reboot system to fastboot mode",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "erase misc",
+                "description": "Erase misc partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "erase persistent",
+                "description": "Erase persistent partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "erase metadata",
+                "description": "Erase metadata partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "format config",
+                "description": "Format config partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "format data",
+                "description": "Format data partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash vbmeta_a ${vbmeta}",
+                "description": "Flash vbmeta_a partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash vbmeta_b ${vbmeta}",
+                "description": "Flash vbmeta_b partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash boot_a ${boot}",
+                "description": "Flash boot_a partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash boot_b ${boot}",
+                "description": "Flash boot_b partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash tos_a ${tos}",
+                "description": "Flash tos_a partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash tos_b ${tos}",
+                "description": "Flash tos_b partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash system_a ${system}",
+                "description": "Flash system_a partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 600000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash system_b ${system}",
+                "description": "Flash system_b partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 600000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash vendor_a ${vendor}",
+                "description": "Flash vendor partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash vendor_b ${vendor}",
+                "description": "Flash vendor_b partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash factory ${factory}",
+                "description": "Flash factory partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "set_active a",
+                "description": "Set active slot to a",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "blank"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flashing lock",
+                "description": "Set device state to locked",
+                "group": "lock-device",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "continue",
+                "description": "Boot to main OS",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            }
+        ],
+        "configurations": {
+            "blank": {
+                "brief": "blank",
+                "description": "erase and flash all partitions, all data will be lost.",
+                "groupsState": {
+                    "check-battery": true,
+                    "erase-efivars": true,
+                    "lock-device": true
+                },
+                "name": "blank",
+                "startState": "pos"
+            },
+            "update": {
+                "brief": "update",
+                "default": true,
+                "description": "update phone to new release",
+                "groupsState": {
+                    "check-battery": true,
+                    "lock-device": true
+                },
+                "name": "update",
+                "startState": "pos"
+            }
+        },
+        "groups": {
+            "check-battery": {
+                "description": "Check battery level before sending fastboot command",
+                "name": "Check battery level"
+            },
+            "erase-efivars": {
+                "description": "Erase all optional efi vars",
+                "name": "Erase efi vars"
+            },
+            "lock-device": {
+                "description": "Put the device in locked state at the end of the flash procedure.",
+                "name": "Lock the device (it implies the userdata partition wipe)"
+            }
+        },
+        "osplatform": "android",
+        "parameters": {
+            "battery": {
+                "computedValue": "$1",
+                "description": "Fetch battery",
+                "filter": "battery-voltage:[\\s]*([0-9]+)mV",
+                "name": "battery",
+                "subCommand": {
+                    "args": "getvar battery-voltage",
+                    "description": "Fetch battery",
+                    "mandatory": true,
+                    "retry": 1,
+                    "timeout": 60000,
+                    "tool": "fastboot"
+                },
+                "type": "variable",
+                "value": 3500
+            },
+            "boot": {
+                "description": "boot.img",
+                "name": "boot",
+                "type": "file",
+                "value": "boot.img"
+            },
+            "bootloader": {
+                "description": "bootloader",
+                "name": "bootloader",
+                "type": "file",
+                "value": "bootloader"
+            },
+            "gpt": {
+                "description": "gpt.bin",
+                "name": "gpt",
+                "type": "file",
+                "value": "gpt.bin"
+            },
+            "vbmeta": {
+                "description": "vbmeta.img",
+                "name": "vbmeta",
+                "type": "file",
+                "value": "vbmeta.img"
+            },
+            "recovery": {
+                "description": "recovery.img",
+                "name": "recovery",
+                "type": "file",
+                "value": "recovery.img"
+            },
+            "factory": {
+                "description": "factory.img",
+                "name": "factory",
+                "type": "file",
+                "value": "factory.img"
+            },
+            "system": {
+                "description": "system.img",
+                "name": "system",
+                "type": "file",
+                "value": "system.img"
+            },
+            "vendor": {
+                "description": "vendor.img",
+                "name": "vendor",
+                "type": "file",
+                "value": "vendor.img"
+            },
+            "tos": {
+                "description": "tos.img",
+                "name": "tos",
+                "type": "file",
+                "value": "tos.img"
+            }
+        },
+        "version": "3.0"
+    }
+}
+# ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/flashfiles.ini b/androidia_64/flashfiles.ini
index 094e5c8bf..6b93a0411 100644
--- a/androidia_64/flashfiles.ini
+++ b/androidia_64/flashfiles.ini
@@ -1,25 +1,6 @@
 # ----------------- BEGIN MIX-IN DEFINITIONS -----------------
 # Mix-In definitions are auto-generated by mixin-update
 ##############################################################
-# Source: device/intel/mixins/groups/config-partition/enabled/flashfiles.ini
-##############################################################
-[output.install.cmd]
-additional-files += radio:config.img
-
-[command.format.config]
-tool = fastboot
-arg = format config
-description = Format config partition
-##############################################################
-# Source: device/intel/mixins/groups/vendor-partition/true/flashfiles.ini
-##############################################################
-[command.flash.vendor]
-tool = fastboot
-args = flash vendor $file
-file = images:vendor.img
-timeout = 600000
-description = Flash vendor partition
-##############################################################
 # Source: device/intel/mixins/groups/factory-partition/true/flashfiles.ini
 ##############################################################
 [output.installer.cmd]
@@ -36,6 +17,28 @@ args = format factory
 description = Format factory partition
 group = erase-factory
 ##############################################################
+# Source: device/intel/mixins/groups/config-partition/enabled/flashfiles.ini
+##############################################################
+[output.install.cmd]
+additional-files += radio:config.img
+
+[command.format.config]
+tool = fastboot
+arg = format config
+description = Format config partition
+##############################################################
+# Source: device/intel/mixins/groups/avb/true/flashfiles.ini
+##############################################################
+
+[command.flash.vbmeta]
+tool = fastboot
+args = flash vbmeta_a $file
+file = images:vbmeta.img
+description = Flash vbmeta_a partition
+##############################################################
+# Source: device/intel/mixins/groups/vendor-partition/true/flashfiles.ini
+##############################################################
+##############################################################
 # Source: device/intel/mixins/groups/flashfiles/ini/flashfiles.ini
 ##############################################################
 # This file describe the commands needed to flash the board.
@@ -72,19 +75,19 @@ configurations += update blank
 
 [output.installer.cmd]
 sets = unlock partition erase format flash configure lock reboot
-additional-files += provdatazip:installer.efi provdatazip:startup.nsh images:cache.img
+additional-files += provdatazip:installer.efi provdatazip:startup.nsh
 enable = true
 
 [configuration.update]
 startState = pos
-sets = unlock flash capsule lock reboot
+sets = unlock slot-ab flash capsule lock reboot
 default = true
 description = update phone to new release
 brief = update
 
 [configuration.blank]
 startState = dnx_os
-sets = fw_update bootstrap unlock partition erase format flash capsule configure lock reboot
+sets = fw_update bootstrap unlock partition slot-ab erase format flash capsule configure lock reboot
 description = erase and flash all partitions, all data will be lost.
 brief = blank
 
@@ -129,6 +132,28 @@ description = Check battery level: ${battery}mV
 expression = ${battery} >= 3500
 skipOnFailure = false
 
+[parameter.slot]
+name = slot
+type = variable
+tool = fastboot
+arg = getvar current-slot
+description = Get current slot
+computedValue = $1
+filter = current-slot:[\s]*(_[a-z]+)
+value = _a
+
+[command.slot-ab.get-active]
+tool = setVariable
+variable = slot
+description = Get the active slot
+defaultValue = _a
+mandatory = false
+
+[command.slot-ab.set-active]
+tool = fastboot
+args = --set-active=${slot}
+description = Set the active slot
+
 [command.unlock.unlock]
 tool = fastboot
 args = flashing unlock
@@ -160,10 +185,6 @@ args = oem erase-efivars
 description = Erase all optional efi vars
 group = erase-efivars
 
-[command.format.cache]
-tool = fastboot
-args = format cache
-description = Format cache partition
 
 [command.flash.boot]
 tool = fastboot
@@ -171,11 +192,6 @@ args = flash boot $file
 file = boot:boot:boot.img
 description = Flash boot partition
 
-[command.flash.recovery]
-tool = fastboot
-args = flash recovery $file
-file = boot:recovery:recovery.img
-description = Flash recovery partition
 
 [command.flash.system]
 tool = fastboot
diff --git a/androidia_64/fstab b/androidia_64/fstab
index fcae03c72..ffdb88dfb 100644
--- a/androidia_64/fstab
+++ b/androidia_64/fstab
@@ -6,40 +6,44 @@
 */usb*/*/host*/*/block/sd*              auto             auto    defaults                                   voldmanaged=usbdisk:auto
 */mmc0/*/block/mmcblk*                  auto             auto    defaults                                   voldmanaged=sdcard1:auto,encryptable=userdata
 ##############################################################
-# Source: device/intel/mixins/groups/boot-arch/android_ia/fstab
+# Source: device/intel/mixins/groups/factory-partition/true/fstab
 ##############################################################
-# Android fstab file.
-# <src>                   <mnt_point> <type>  <mnt_flags and options>  <fs_mgr_flags>
-# The filesystem that contains the filesystem checker binary (typically /system) cannot
-# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
-
-/devices/*/usb*/*		auto	auto	defaults		voldmanaged=usb:auto,encryptable=userdata
-/devices/*/*sdmmc*/*		auto	auto	defaults		voldmanaged=sdcard1:auto,encryptable=userdata
-/devices/*/80860F14:01/mmc_*	auto	auto	defaults		voldmanaged=sdcard1:auto,encryptable=userdata
-
-/dev/block/by-name/android_system   	/system         ext4    ro															wait
-/dev/block/by-name/android_cache		/cache          ext4    noatime,nosuid,nodev,errors=panic                           wait,check
-/dev/block/by-name/android_data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,forceencrypt=/dev/block/by-name/android_metadata,quota
-/dev/block/by-name/android_boot         /boot           emmc    defaults                                                    defaults
-/dev/block/by-name/android_recovery     /recovery       emmc    defaults                                                    defaults
-/dev/block/by-name/android_misc         /misc           emmc    defaults                                                    defaults
-/dev/block/by-name/android_bootloader   /bootloader     emmc    defaults                                                    recoveryonly
-/dev/block/by-name/android_bootloader2  /bootloader2    emmc    defaults                                                    recoveryonly
-/dev/block/by-name/android_persistent   /persistent     emmc    defaults                                                    defaults
-/dev/block/by-name/android_metadata     /metadata       emmc    defaults                                                    defaults
+/dev/block/by-name/factory      /factory        ext4    rw,noatime                                                  wait
 ##############################################################
 # Source: device/intel/mixins/groups/config-partition/enabled/fstab
 ##############################################################
-/dev/block/by-name/android_config	/oem_config         ext4    noatime,nosuid,nodev,errors=panic          wait,check
+/dev/block/by-name/config	    /oem_config     ext4    noatime,nosuid,nodev,errors=panic                           wait,check
+##############################################################
+# Source: device/intel/mixins/groups/avb/true/fstab
+##############################################################
+/dev/block/by-name/vbmeta       /vbmeta         emmc    defaults                                                    defaults,slotselect,avb
 ##############################################################
 # Source: device/intel/mixins/groups/vendor-partition/true/fstab
 ##############################################################
 # Following line is required if you use a vendor image.
 # If the vendor image is not used,
 # following line should be commented with the related ones in BoardConfig.mk
-/dev/block/by-name/android_vendor	/vendor         ext4    ro                                         wait
+/dev/block/by-name/vendor	    /vendor         ext4    ro                                                          wait,slotselect,avb
 ##############################################################
-# Source: device/intel/mixins/groups/factory-partition/true/fstab
+# Source: device/intel/mixins/groups/boot-arch/android_ia/fstab
 ##############################################################
-/dev/block/by-name/android_factory      /factory        ext4    rw,noatime                                         wait
+# Android fstab file.
+# <src>                   <mnt_point> <type>  <mnt_flags and options>  <fs_mgr_flags>
+# The filesystem that contains the filesystem checker binary (typically /system) cannot
+# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
+
+/devices/*/usb*/*               auto            auto    defaults                                                    voldmanaged=usb:auto,encryptable=userdata
+/devices/*/*sdmmc*/*            auto            auto    defaults                                                    voldmanaged=sdcard1:auto,encryptable=userdata
+/devices/*/80860F14:01/mmc_*    auto            auto    defaults                                                    voldmanaged=sdcard1:auto,encryptable=userdata
+
+# If enable AVB and A/B slot, then will mount system partition as / through /dev/dm-0
+/dev/block/by-name/system       /               ext4    ro                                                          wait,slotselect,avb
+/dev/block/by-name/data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,forceencrypt=/dev/block/by-name/metadata,quota
+/dev/block/by-name/boot         /boot           emmc    defaults                                                    defaults,slotselect,avb
+/dev/block/by-name/misc         /misc           emmc    defaults                                                    defaults
+/dev/block/by-name/bootloader   /bootloader     emmc    defaults                                                    recoveryonly
+/dev/block/by-name/bootloader2  /bootloader2    emmc    defaults                                                    recoveryonly
+/dev/block/by-name/persistent   /persistent     emmc    defaults                                                    defaults
+/dev/block/by-name/metadata     /metadata       emmc    defaults                                                    defaults
+/dev/block/by-name/tos          /tos            emmc    defaults                                                    defaults,slotselect,avb
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/gpt.ini b/androidia_64/gpt.ini
index e2162cc46..3915a4d82 100644
--- a/androidia_64/gpt.ini
+++ b/androidia_64/gpt.ini
@@ -4,10 +4,12 @@
 # Source: device/intel/mixins/groups/boot-arch/android_ia/gpt.ini
 ##############################################################
 [base]
-partitions = bootloader bootloader2 boot recovery misc metadata system cache persistent vendor config factory tos data
+partitions = bootloader bootloader2 boot  misc metadata system persistent vendor config factory tos vbmeta data
+device = auto
+nb_slot = 2
 
 [partition.bootloader]
-label = android_bootloader
+label = bootloader
 len = 60
 type = esp
 guid = 2568845d-2332-4675-bc39-8fa5a4748d15
@@ -16,80 +18,82 @@ efi_title = Android-IA
 flags = boot
 
 [partition.bootloader2]
-label = android_bootloader2
+label = bootloader2
 len = 60
 type = fat
 guid = 114eaffe-1552-4022-b26e-9b053604cf84
 
 [partition.boot]
-label = android_boot
+label = boot
 len = 30
 type = boot
+has_slot = true
 guid = 49a4d17f-93a3-45c1-a0de-f50b2ebe2599
 
-[partition.recovery]
-label = android_recovery
-len = 30
-type = recovery
-guid = 4177c722-9e92-4aab-8644-43502bfd5506
 
 [partition.misc]
-label = android_misc
+label = misc
 len = 1
 type = misc
 guid = ef32a33b-a409-486c-9141-9ffb711f6266
 
 [partition.metadata]
-label = android_metadata
+label = metadata
 len = 16
 type = metadata
 guid = 20ac26be-20b7-11e3-84c5-6cfdb94711e9
 
 [partition.system]
-label = android_system
+label = system
 len = 3584
 type = linux
+has_slot = true
 guid = 38f428e6-d326-425d-9140-6e0ea133647c
 
-[partition.cache]
-label = android_cache
-len = 100
-type = linux
-guid = a893ef21-e428-470a-9e55-0668fd91a2d9
 
 [partition.data]
-label = android_data
+label = data
 len = -1
 type = linux
 guid = dc76dda9-5ac1-491c-af42-a82591580c0d
 
 [partition.persistent]
-label = android_persistent
+label = persistent
 len = 1
 type = linux
 guid = ebc597d0-2053-4b15-8b64-e0aac75f4db1
 
 [partition.vendor]
-label = android_vendor
+label = vendor
 len = 1500
 type = linux
+has_slot = true
 guid = c5a0aeec-13ea-11e5-a1b1-001e67ca0c3c
 
 [partition.config]
-label = android_config
+label = config
 len = 8
 type = linux
 guid = bd59408b-4514-490d-bf12-9878d963f378
 
 [partition.factory]
-label = android_factory
+label = factory
 len = 10
 type = linux
 guid = 8f68cc74-c5e5-48da-be91-a0c8c15e9c80
 
 [partition.tos]
-label = android_tos
+label = tos
 len = 10
 type = boot
+has_slot = true
 guid = 52cd00fd-f5b0-4061-b3a5-65b07f2179f0
+
+[partition.vbmeta]
+label = vbmeta
+len = 2
+type = linux
+has_slot = true
+# Randum generate a guid
+guid = 7ced364c-3b5a-4eba-9f5c-9fef1327cb50
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index e3b44f1cc..69eff79ef 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -3,10 +3,42 @@
 ##############################################################
 # Source: device/intel/mixins/groups/android_ia/default/init.rc
 ##############################################################
-on fs
-    mount_all /fstab.${ro.hardware}
 
 on init
+    # Android creates by-name disk links with the disk controller
+    # in the generated path, so that the names pulled out of the GPT
+    # can be associated with the correct disk. Create a shortcut to
+    # /dev/block/by-name so that we can use the same fstabs everywhere.
+    mkdir /dev/block 0755 root root
+    exec u:r:set_storage:s0 root root -- /sbin/set_storage
+    # The following line maybe replaced by scripts in SKL.
+    # symlink /dev/block/pci/pci0000:00/0000:00:1c.0/by-name /dev/block/by-name
+
+    # Load persistent dm-verity state and detect if a restart was
+    # triggered after dm-verity detected a corrupted block
+    # And maybe trigger verity-logging if verity mode is not default.
+    # Should wait for setup the by-name block device
+    verity_load_state
+
+    # If verity-logging is triggered, must mount_all after it,
+    # otherwise the warning page maybe can't be shown.
+    trigger mount-all-fs
+
+    # Since the modules are stored in /vendor, not in ram disk,
+    # so need to restart ueventd after mount_all.
+    trigger restart-ueventd
+
+
+on verity-logging
+    exec u:r:slideshow:s0 -- /sbin/slideshow -p -t 30000 warning/verity_red_1 warning/verity_red_2
+
+
+on mount-all-fs
+    mkdir /dev/pstore 0755 root system
+    mount pstore pstore /dev/pstore
+    mount_all /fstab.${ro.hardware}
+
+on restart-ueventd
     rm /dev/.coldboot_done
     restart ueventd
 
@@ -88,11 +120,6 @@ service bugreport /system/bin/dumpstate -d -p -B \
     oneshot
     keycodes 114 115 116
 
-on init
-   # Load persistent dm-verity state and detect if a restart was
-   # triggered after dm-verity detected a corrupted block
-   verity_load_state
-
 on fs
    # Update dm-verity persistent state and set partition.*.verified
    # properties
@@ -416,16 +443,24 @@ service iprenew_bt-pan /system/bin/dhcpcd -n
     disabled
     oneshot
 ##############################################################
-# Source: device/intel/mixins/groups/disk-bus/auto/init.rc
+# Source: device/intel/mixins/groups/factory-partition/true/init.rc
 ##############################################################
+# init.rc for telephony services specific to flashless platforms using /factory partition
+
 on init
-    # Android creates by-name disk links with the disk controller
-    # in the generated path, so that the names pulled out of the GPT
-    # can be associated with the correct disk. Create a shortcut to
-    # /dev/block/by-name so that we can use the same fstabs everywhere.
-    exec u:r:set_storage:s0 root root -- /sbin/set_storage
-    mkdir /dev/block 0755 root root
-    symlink /dev/block/pci/pci0000:00/0000:00:1c.0/by-name /dev/block/by-name
+# Used as mounting point for factory partition.
+# Calibration files configuring IMEI and RF calibration will also be stored on this partition.
+    mkdir /factory 0770 system system
+
+on post-fs
+    restorecon_recursive /factory
+    trigger post-fs-factory
+##############################################################
+# Source: device/intel/mixins/groups/config-partition/enabled/init.rc
+##############################################################
+# Enable SELinux labeling
+on post-fs
+    restorecon_recursive /oem_config
 ##############################################################
 # Source: device/intel/mixins/groups/wlan/iwlwifi/init.rc
 ##############################################################
@@ -528,25 +563,6 @@ on boot
     chown system system /sys/class/powercap/intel-rapl:0/constraint_0_power_limit_uw
     restorecon_recursive /sys/class/powercap
 ##############################################################
-# Source: device/intel/mixins/groups/config-partition/enabled/init.rc
-##############################################################
-# Enable SELinux labeling
-on post-fs
-    restorecon_recursive /oem_config
-##############################################################
-# Source: device/intel/mixins/groups/factory-partition/true/init.rc
-##############################################################
-# init.rc for telephony services specific to flashless platforms using /factory partition
-
-on init
-# Used as mounting point for factory partition.
-# Calibration files configuring IMEI and RF calibration will also be stored on this partition.
-    mkdir /factory 0770 system system
-
-on post-fs
-    restorecon_recursive /factory
-    trigger post-fs-factory
-##############################################################
 # Source: device/intel/mixins/groups/debug-logs/true/init.rc
 ##############################################################
 import /init.logs.rc
diff --git a/androidia_64/installer.cmd b/androidia_64/installer.cmd
index 8abe9b72a..48ba94ea6 100644
--- a/androidia_64/installer.cmd
+++ b/androidia_64/installer.cmd
@@ -9,15 +9,20 @@ erase misc
 erase persistent
 erase metadata
 format config
-format cache
 format data
-flash vendor vendor.img
-flash boot boot.img
-flash recovery recovery.img
-flash system system.img
-flash factory factory.img
 flash bootloader bootloader
-flash tos tos.img
+flash vbmeta_a vbmeta.img
+flash vbmeta_b vbmeta.img
+flash boot_a boot.img
+flash boot_b boot.img
+flash tos_a tos.img
+flash tos_b tos.img
+flash system_a system.img
+flash system_b system.img
+flash vendor_a vendor.img
+flash vendor_b vendor.img
+flash factory factory.img
+set_active a
 flashing lock
 continue
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/ueventd.rc b/androidia_64/ueventd.rc
index c475c350e..a9de93f6d 100644
--- a/androidia_64/ueventd.rc
+++ b/androidia_64/ueventd.rc
@@ -61,7 +61,7 @@
 ##############################################################
 # Source: device/intel/mixins/groups/disk-bus/auto/ueventd.rc
 ##############################################################
-/dev/block/pci/pci0000:00/0000:00:1c.0/by-name/android_persistent   0660 system system
+/dev/block/pci/pci0000:00/0000:00:1c.0/by-name/persistent   0660 system system
 ##############################################################
 # Source: device/intel/mixins/groups/wlan/iwlwifi/ueventd.rc
 ##############################################################

From 3ffa9215abbffdecaca35e04169d079e2ca0ef97 Mon Sep 17 00:00:00 2001
From: shyjumon <shyjumon.n@intel.com>
Date: Mon, 19 Mar 2018 21:48:56 +0530
Subject: [PATCH 197/427] NVMe kernel support enabling

Enables the NVMe based storage device support.
Build cmd:
	make SPARSE_IMG=true flashfiles -j32 | tee build_logs.txt

Jira: None
Test: None

Signed-off-by: shyjumon <shyjumon.n@intel.com>
---
 kernel_config/kernel_64_defconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 726251f34..412c94fa1 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -1463,7 +1463,9 @@ CONFIG_VIRTIO_BLK=y
 # CONFIG_BLK_DEV_HD is not set
 # CONFIG_BLK_DEV_RBD is not set
 # CONFIG_BLK_DEV_RSXX is not set
-# CONFIG_BLK_DEV_NVME is not set
+CONFIG_NVME_CORE=y
+CONFIG_BLK_DEV_NVME=y
+
 # CONFIG_NVME_TARGET is not set
 
 #

From be71f63069168a89b6cce516ce337ba44030ee87 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Mon, 19 Mar 2018 18:11:56 +0530
Subject: [PATCH 198/427] [AIA-O] Clean-up

remove unwanted .swp file

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/.mixins.spec.swp | Bin 12288 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 androidia_64/.mixins.spec.swp

diff --git a/androidia_64/.mixins.spec.swp b/androidia_64/.mixins.spec.swp
deleted file mode 100644
index 51b7f0d4134cb9e65afacdc3740474b9ac1120ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2J&znU7{`4yk$~e>iYNzYcFE4|-U}gFX^RMggb*SE4iHf^^4QPJSnC-NwrB5_
zB1q67K}nH{CK7G(2`DM3fCh<=z!wM&{O4tJcPWBWMtG#Z#`D;I{P_1gKIybhXCJ@w
zUi8M!0mJhgW4Ft1K6~wtzqkIp#aP-XEnEA4Jl(kX)5~vNQ4bw?vl}@5<oyrc{qWkA
zH?K~4C9P31Ry@v?FPd~JX{7{BRpm)<x)a4WO~sRo2h&m=tIF-Tn#4ob3!Q;LATSVU
zd=_8YKHT5iowb%%UwJut@rA>HClCk(0)apv5C{YUfj}S-2n7B|1bn^4zQlf?81}p~
zytf{B51-)`2m}IwKp+qZ1OkCTAP@)y0)apv5C{YUk0Ak$ANW6ilCi5#A$a`$zxn_F
z-m{GT2K@^C4Bdt9KtDp?LtjB9v<?0K3}Zh*cc34j@1O<}&>{2^bPoD@8*4!VI)vVa
z#?X1_9CYt##{PnSf$l;DbPbwAW9WJ4AH;bZx&?g;-GnmeBdFcOc_=)AKp+qZ1OkCT
zAP@)y0)fDz5hx$=q0(C}mh;HlhM3?bSw4>%m-bDjjEJ2UyoxQQ#`t-ZaqWn8ws|Be
z<Bj$Vvz=cLUP>j^(9AS<MW!^ld88^eGE}a(b&Jl)WJT5~Q!Vy)W|NFN-!71ps!CGs
zJ=t}lX+?Um|N3k;!M$0}wI;i0BONnIX_Lp^7!B85@V%ujOhwWNZ|oVnHu>3s!Xh+S
z<t9|#&RNGbw_bUKHP}~FNn;;0kM0jkoce+myKRgowhAB@!zJOQ_b_I{RGG?8d!mY`
znk4fD*^+DUtbI1>?hq%XkyH+w)haLiCVV7k9u>y<3tR{$m0QMXgHGOf11!h2B~v3&
z8|OA#Dh=N)q)}$9pahfJg%^maZX99ofiRX_`x$d9ih1OgnjL8l3hGE7sZ256NM*20
zfAtx6n^~K$Vfcx4)LOOSl5A2Nt;BjUJDyEWSv6IQi?d0|b0v}`trM?GGL2tcnoYQK
zO-V_rj7uDe#-a^>9fygB@jl}LO{yD06?lZ4dZ1xTvK3*wry@d@hf116!`2h*R7p*V
zLA7lb7&9)@q-uF|6$N*3&Sl;j@+8Y#OS{&59ZRa5Y72gI032$E=LG6yqq#>;yK>Bs
zm(37rv)nnCg{aZrUKo%4y2dQuro*$6q{8t#6?$iJaygus?lZx6;!J}~_U19mEw2kD
z+A6r8o>5NK<qJKz;z;cEtyQC!yc*m|TcT&<8wWH``;wc$q1Hz14wN1BshmeODpfhB
zR>V%0I@#o2C2>w$5W`Vt*K=!{+TCERwnjF>@09p+)9)TlcD>|vt*RUY`s?vh;pCpV
QPT$+7y`y%5s&24<0f!+SK>z>%


From 793a9df49e179a344ada2e1a86c8b3b2dd33b9f5 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Wed, 21 Mar 2018 11:44:54 +0530
Subject: [PATCH 199/427] [AIA-O] Mixinup for a/b remove cache

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/BoardConfig.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index b01cfa361..473e76f2f 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -164,8 +164,6 @@ TARGET_BOARD_PLATFORM := android_ia
 
 TARGET_USERIMAGES_USE_EXT4 := true
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
-BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
-BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_FLASH_BLOCK_SIZE := 512
 
 BOARD_BOOTIMAGE_PARTITION_SIZE := 31457280

From 0ceb6f2935381a6328cd4db55a2e65f700a4f12e Mon Sep 17 00:00:00 2001
From: "Yue, VincentX" <vincentx.yue@intel.com>
Date: Thu, 18 Jan 2018 18:15:43 +0800
Subject: [PATCH 200/427] Turn off auto-rotation in IA

Due to IA don't support sensor to auto rotate, turn off
auto rotate for recoverying default screen orientation.

Jira: None
Test: None

Signed-off-by: Yue, VincentX <vincentx.yue@intel.com>
---
 .../base/packages/SettingsProvider/res/values/defaults.xml     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/common/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index 86897374a..0312fe395 100644
--- a/common/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/common/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -22,4 +22,7 @@
 
     <!-- Disable Lock Screen -->
     <bool name="def_lockscreen_disabled">true</bool>
+
+    <!-- Do not enable auto rotation switching -->
+    <bool name="def_accelerometer_rotation">false</bool>
 </resources>

From a15cc7b544af350841045f3468c08182bf6ba432 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Sun, 28 Jan 2018 16:05:51 +0530
Subject: [PATCH 201/427] Set DISABLE_MEDIA_COMPOSITOR true

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/BoardConfig.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 473e76f2f..8e07c113c 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -45,6 +45,8 @@ BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/graphics/android_ia
 BOARD_USES_DRM_HWCOMPOSER := false
 BOARD_USES_IA_HWCOMPOSER := true
 
+DISABLE_MEDIA_COMPOSITOR := true
+
 BOARD_USES_MINIGBM := true
 BOARD_ENABLE_EXPLICIT_SYNC := true
 INTEL_MINIGBM := external/minigbm

From 1d18682908f6a52d55e8a6f01574c56a81529bc7 Mon Sep 17 00:00:00 2001
From: Jeevaka Prabu Badrappan <jeevaka.badrappan@intel.com>
Date: Thu, 1 Feb 2018 21:43:09 +0530
Subject: [PATCH 202/427] [REVERTME] Temp workaround to load wifi module
 manually

To be reverted after modprobe issue is fixed

Jira: None
Test: None

Signed-off-by: Jeevaka Prabu Badrappan <jeevaka.badrappan@intel.com>
---
 androidia_64/device.mk | 2 --
 androidia_64/init.rc   | 6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 6556fc931..47fa78ca0 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -363,8 +363,6 @@ PRODUCT_PACKAGES += \
     wpa_cli \
     iw
    
-	
-
 # FW and PNVM
 PRODUCT_PACKAGES += \
     iwl-fw          \
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 69eff79ef..83edb4b23 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -510,6 +510,12 @@ service iprenew_p2p /system/bin/dhcpcd -n
     oneshot
 
 
+on post-fs
+    insmod /vendor/lib/modules/kernel/net/wireless/cfg80211.ko
+    insmod /vendor/lib/modules/kernel/net/mac80211/mac80211.ko
+    insmod /vendor/lib/modules/kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+    insmod /vendor/lib/modules/kernel/drivers/net/wireless/intel/iwlwifi/mvm/iwlmvm.ko
+
 ##############################################################
 # Source: device/intel/mixins/groups/cpuset/4cores/init.rc
 ##############################################################

From 3c59c3eac9d3179c55db4c466c9c236006611cae Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 8 Feb 2018 08:43:01 +0530
Subject: [PATCH 203/427] [REVERTME] Keep SND HDA modules in-built

This patch has to be reverted once modprobe issue is
fixed

Jira: None
Test: None
---
 kernel_config/kernel_64_defconfig | 1390 +++++++++++++++++++----------
 1 file changed, 932 insertions(+), 458 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 412c94fa1..fc4ac9016 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -1,5 +1,10 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86_64 4.14.0 Kernel Configuration
+#
 CONFIG_64BIT=y
 CONFIG_X86_64=y
+CONFIG_X86=y
 CONFIG_INSTRUCTION_DECODER=y
 CONFIG_OUTPUT_FORMAT="elf64-x86-64"
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
@@ -35,11 +40,11 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_X86_64_SMP=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_DEBUG_RODATA=y
 CONFIG_PGTABLE_LEVELS=4
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
+CONFIG_THREAD_INFO_IN_TASK=y
 
 #
 # General setup
@@ -47,6 +52,8 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
+CONFIG_LOCALVERSION="-android_ia_64"
+CONFIG_LOCALVERSION_AUTO=y
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
@@ -59,6 +66,7 @@ CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_XZ is not set
 # CONFIG_KERNEL_LZO is not set
 # CONFIG_KERNEL_LZ4 is not set
+CONFIG_DEFAULT_HOSTNAME="android_ia_64"
 CONFIG_SWAP=y
 # CONFIG_SYSVIPC is not set
 # CONFIG_POSIX_MQUEUE is not set
@@ -76,7 +84,9 @@ CONFIG_AUDIT_TREE=y
 #
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
 CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_GENERIC_IRQ_MIGRATION=y
 CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y
@@ -85,6 +95,7 @@ CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
 # CONFIG_IRQ_DOMAIN_DEBUG is not set
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
+# CONFIG_GENERIC_IRQ_DEBUGFS is not set
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_ARCH_CLOCKSOURCE_DATA=y
 CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
@@ -104,6 +115,7 @@ CONFIG_NO_HZ_IDLE=y
 # CONFIG_NO_HZ_FULL is not set
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
+# CONFIG_ANDROID_AUTO_SUSPEND_BEHAVIOR is not set
 
 #
 # CPU/Task time and stats accounting
@@ -111,6 +123,7 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
+# CONFIG_SCHED_WALT is not set
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 CONFIG_TASKSTATS=y
@@ -124,34 +137,36 @@ CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_PREEMPT_RCU=y
 # CONFIG_RCU_EXPERT is not set
 CONFIG_SRCU=y
-# CONFIG_TASKS_RCU is not set
+CONFIG_TREE_SRCU=y
+CONFIG_TASKS_RCU=y
 CONFIG_RCU_STALL_COMMON=y
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_RCU_EXPEDITE_BOOT is not set
+CONFIG_RCU_NEED_SEGCBLIST=y
 # CONFIG_BUILD_BIN2C is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_NMI_LOG_BUF_SHIFT=13
+CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_CGROUPS=y
+CONFIG_CGROUP_DEBUG=y
+CONFIG_CGROUP_FREEZER=y
+# CONFIG_CGROUP_PIDS is not set
+# CONFIG_CGROUP_DEVICE is not set
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
 # CONFIG_MEMCG is not set
 # CONFIG_BLK_CGROUP is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_CFS_BANDWIDTH is not set
 CONFIG_RT_GROUP_SCHED=y
-# CONFIG_CGROUP_PIDS is not set
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CPUSETS=y
-CONFIG_SCHEDTUNE=y
-# CONFIG_CGROUP_DEVICE is not set
-CONFIG_CGROUP_CPUACCT=y
+# CONFIG_CGROUP_RDMA is not set
 # CONFIG_CGROUP_PERF is not set
-CONFIG_CGROUP_DEBUG=y
+# CONFIG_SOCK_CGROUP_DATA is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
@@ -159,6 +174,8 @@ CONFIG_NAMESPACES=y
 # CONFIG_PID_NS is not set
 # CONFIG_NET_NS is not set
 # CONFIG_SCHED_AUTOGROUP is not set
+# CONFIG_SCHED_TUNE is not set
+# CONFIG_DEFAULT_USE_ENERGY_AWARE is not set
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
@@ -183,6 +200,7 @@ CONFIG_MULTIUSER=y
 CONFIG_SGETMASK_SYSCALL=y
 CONFIG_SYSFS_SYSCALL=y
 CONFIG_SYSCTL_SYSCALL=y
+CONFIG_POSIX_TIMERS=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
@@ -194,6 +212,7 @@ CONFIG_ELF_CORE=y
 CONFIG_PCSPKR_PLATFORM=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_FUTEX_PI=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
@@ -207,6 +226,7 @@ CONFIG_PCI_QUIRKS=y
 CONFIG_MEMBARRIER=y
 CONFIG_EMBEDDED=y
 CONFIG_HAVE_PERF_EVENTS=y
+# CONFIG_PC104 is not set
 
 #
 # Kernel Performance Events And Counters
@@ -214,20 +234,22 @@ CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_PERF_EVENTS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_COMPAT_BRK is not set
 CONFIG_SLAB=y
 # CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
-# CONFIG_SYSTEM_DATA_VERIFICATION is not set
+CONFIG_SLAB_MERGE_DEFAULT=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
-CONFIG_KEXEC_CORE=y
 CONFIG_OPROFILE=y
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 CONFIG_HAVE_OPROFILE=y
 CONFIG_OPROFILE_NMI_TIMER=y
 # CONFIG_KPROBES is not set
 # CONFIG_JUMP_LABEL is not set
-# CONFIG_UPROBES is not set
+CONFIG_UPROBES=y
 # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
@@ -240,6 +262,8 @@ CONFIG_HAVE_NMI=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_SET_MEMORY=y
 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_CLK=y
@@ -248,25 +272,35 @@ CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
 CONFIG_HAVE_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y
 CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_RCU_TABLE_FREE=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
 CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGINS is not set
 CONFIG_HAVE_CC_STACKPROTECTOR=y
+CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_CC_STACKPROTECTOR_NONE is not set
+# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
+CONFIG_CC_STACKPROTECTOR_STRONG=y
+CONFIG_THIN_ARCHIVES=y
 CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
 CONFIG_HAVE_ARCH_SOFT_DIRTY=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
@@ -275,6 +309,7 @@ CONFIG_HAVE_EXIT_THREAD=y
 CONFIG_ARCH_MMAP_RND_BITS=28
 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
+CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y
 CONFIG_HAVE_COPY_THREAD_TLS=y
 CONFIG_HAVE_STACK_VALIDATION=y
 # CONFIG_HAVE_ARCH_HASH is not set
@@ -282,6 +317,15 @@ CONFIG_HAVE_STACK_VALIDATION=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_COMPAT_OLD_SIGACTION=y
 # CONFIG_CPU_NO_EFFICIENT_FFS is not set
+CONFIG_HAVE_ARCH_VMAP_STACK=y
+CONFIG_VMAP_STACK=y
+# CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set
+# CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set
+CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
+CONFIG_STRICT_KERNEL_RWX=y
+CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
+CONFIG_STRICT_MODULE_RWX=y
+# CONFIG_REFCOUNT_FULL is not set
 
 #
 # GCOV-based kernel profiling
@@ -298,13 +342,27 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
+CONFIG_MODULE_SIG=y
+CONFIG_MODULE_SIG_FORCE=y
+CONFIG_MODULE_SIG_ALL=y
+# CONFIG_MODULE_SIG_SHA1 is not set
+# CONFIG_MODULE_SIG_SHA224 is not set
+# CONFIG_MODULE_SIG_SHA256 is not set
+# CONFIG_MODULE_SIG_SHA384 is not set
+CONFIG_MODULE_SIG_SHA512=y
+CONFIG_MODULE_SIG_HASH="sha512"
 # CONFIG_MODULE_COMPRESS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
+CONFIG_BLK_SCSI_REQUEST=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_BLK_DEV_BSGLIB is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
+# CONFIG_BLK_DEV_ZONED is not set
 # CONFIG_BLK_CMDLINE_PARSER is not set
+# CONFIG_BLK_WBT is not set
+CONFIG_BLK_DEBUG_FS=y
+# CONFIG_BLK_SED_OPAL is not set
 
 #
 # Partition Types
@@ -330,6 +388,8 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_BLOCK_COMPAT=y
+CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_MQ_VIRTIO=y
 
 #
 # IO Schedulers
@@ -341,6 +401,10 @@ CONFIG_IOSCHED_CFQ=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_MQ_IOSCHED_DEADLINE=y
+CONFIG_MQ_IOSCHED_KYBER=y
+# CONFIG_IOSCHED_BFQ is not set
+CONFIG_ASN1=y
 CONFIG_UNINLINE_SPIN_UNLOCK=y
 CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
@@ -362,6 +426,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y
 # CONFIG_X86_X2APIC is not set
 CONFIG_X86_MPPARSE=y
 # CONFIG_GOLDFISH is not set
+# CONFIG_INTEL_RDT is not set
 CONFIG_X86_EXTENDED_PLATFORM=y
 # CONFIG_X86_VSMP is not set
 # CONFIG_X86_GOLDFISH is not set
@@ -373,7 +438,14 @@ CONFIG_IOSF_MBI=y
 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_HYPERVISOR_GUEST=y
-# CONFIG_PARAVIRT is not set
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_DEBUG is not set
+# CONFIG_PARAVIRT_SPINLOCKS is not set
+# CONFIG_XEN is not set
+CONFIG_KVM_GUEST=y
+# CONFIG_KVM_DEBUG_FS is not set
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+CONFIG_PARAVIRT_CLOCK=y
 CONFIG_NO_BOOTMEM=y
 # CONFIG_MK8 is not set
 # CONFIG_MPSC is not set
@@ -402,6 +474,7 @@ CONFIG_IOMMU_HELPER=y
 CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
+CONFIG_SCHED_MC_PRIO=y
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
@@ -410,6 +483,7 @@ CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 # CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
 CONFIG_X86_MCE=y
+# CONFIG_X86_MCELOG_LEGACY is not set
 CONFIG_X86_MCE_INTEL=y
 CONFIG_X86_MCE_AMD=y
 CONFIG_X86_MCE_THRESHOLD=y
@@ -434,9 +508,12 @@ CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
 CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
+# CONFIG_X86_5LEVEL is not set
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_X86_DIRECT_GBPAGES=y
+CONFIG_ARCH_HAS_MEM_ENCRYPT=y
+# CONFIG_AMD_MEM_ENCRYPT is not set
 # CONFIG_NUMA is not set
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
@@ -453,6 +530,7 @@ CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_HAVE_GENERIC_GUP=y
 CONFIG_ARCH_DISCARD_MEMBLOCK=y
 # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
 # CONFIG_MEMORY_HOTPLUG is not set
@@ -467,9 +545,11 @@ CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 # CONFIG_MEMORY_FAILURE is not set
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_ARCH_WANTS_THP_SWAP=y
 CONFIG_CLEANCACHE=y
 CONFIG_FRONTSWAP=y
 # CONFIG_CMA is not set
@@ -477,12 +557,15 @@ CONFIG_FRONTSWAP=y
 # CONFIG_ZPOOL is not set
 # CONFIG_ZBUD is not set
 # CONFIG_ZSMALLOC is not set
+# CONFIG_DEBUG_PANIC_ON_BAD_PAGE is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_ARCH_HAS_ZONE_DEVICE=y
 CONFIG_FRAME_VECTOR=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 CONFIG_ARCH_HAS_PKEYS=y
+# CONFIG_PERCPU_STATS is not set
 # CONFIG_X86_PMEM_LEGACY is not set
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_RESERVE_LOW=64
@@ -492,6 +575,7 @@ CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
 # CONFIG_X86_SMAP is not set
+# CONFIG_X86_INTEL_UMIP is not set
 # CONFIG_X86_INTEL_MPX is not set
 CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
 CONFIG_EFI=y
@@ -504,14 +588,20 @@ CONFIG_SECCOMP=y
 CONFIG_HZ_1000=y
 CONFIG_HZ=1000
 CONFIG_SCHED_HRTICK=y
+# CONFIG_KEXEC is not set
 # CONFIG_KEXEC_FILE is not set
 # CONFIG_CRASH_DUMP is not set
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_RELOCATABLE=y
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_X86_NEED_RELOCS=y
 CONFIG_PHYSICAL_ALIGN=0x200000
+CONFIG_RANDOMIZE_MEMORY=y
+CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0x0
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
+# CONFIG_COMPAT_VDSO is not set
 # CONFIG_LEGACY_VSYSCALL_NATIVE is not set
 CONFIG_LEGACY_VSYSCALL_EMULATE=y
 # CONFIG_LEGACY_VSYSCALL_NONE is not set
@@ -519,6 +609,7 @@ CONFIG_LEGACY_VSYSCALL_EMULATE=y
 CONFIG_MODIFY_LDT_SYSCALL=y
 CONFIG_HAVE_LIVEPATCH=y
 # CONFIG_LIVEPATCH is not set
+CONFIG_ARCH_HAS_ADD_PAGES=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
 #
@@ -527,6 +618,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 # CONFIG_SUSPEND_SKIP_SYNC is not set
+# CONFIG_HIBERNATION is not set
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_AUTOSLEEP=y
@@ -561,6 +653,7 @@ CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_CPU_FREQ_PSS=y
 CONFIG_ACPI_PROCESSOR_CSTATE=y
 CONFIG_ACPI_PROCESSOR_IDLE=y
+CONFIG_ACPI_CPPC_LIB=y
 CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_PROCESSOR_AGGREGATOR=y
@@ -575,18 +668,21 @@ CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_HOTPLUG_IOAPIC=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_HED=m
+# CONFIG_ACPI_CUSTOM_METHOD is not set
 # CONFIG_ACPI_BGRT is not set
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
 # CONFIG_ACPI_NFIT is not set
 CONFIG_HAVE_ACPI_APEI=y
 CONFIG_HAVE_ACPI_APEI_NMI=y
 CONFIG_ACPI_APEI=y
+# CONFIG_ACPI_APEI_GHES is not set
+# CONFIG_ACPI_APEI_PCIEAER is not set
+# CONFIG_ACPI_APEI_EINJ is not set
+# CONFIG_ACPI_APEI_ERST_DEBUG is not set
 # CONFIG_DPTF_POWER is not set
-# CONFIG_ACPI_EXTLOG is not set
 CONFIG_PMIC_OPREGION=y
 CONFIG_CRC_PMIC_OPREGION=y
-CONFIG_XPOWER_PMIC_OPREGION=y
-CONFIG_BXT_WC_PMIC_OPREGION=y
+# CONFIG_ACPI_CONFIGFS is not set
 # CONFIG_SFI is not set
 
 #
@@ -596,20 +692,22 @@ CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_GOV_ATTR_SET=y
 CONFIG_CPU_FREQ_GOV_COMMON=y
 CONFIG_CPU_FREQ_STAT=y
-CONFIG_CPU_FREQ_STAT_DETAILS=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHED is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-# CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set
+# CONFIG_CPU_FREQ_GOV_SCHED is not set
 CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
+# CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set
 
 #
 # CPU frequency scaling drivers
@@ -638,11 +736,6 @@ CONFIG_CPU_IDLE_GOV_MENU=y
 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 CONFIG_INTEL_IDLE=y
 
-#
-# Memory power savings
-#
-# CONFIG_I7300_IDLE is not set
-
 #
 # Bus options (PCI etc.)
 #
@@ -660,9 +753,11 @@ CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 # CONFIG_PCIE_DPC is not set
+# CONFIG_PCIE_PTM is not set
 CONFIG_PCI_BUS_ADDR_T_64BIT=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
@@ -670,6 +765,7 @@ CONFIG_PCI_MSI_IRQ_DOMAIN=y
 # CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
 # CONFIG_PCI_STUB is not set
 CONFIG_HT_IRQ=y
+CONFIG_PCI_LOCKLESS_CONFIG=y
 # CONFIG_PCI_IOV is not set
 # CONFIG_PCI_PRI is not set
 # CONFIG_PCI_PASID is not set
@@ -682,9 +778,24 @@ CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 CONFIG_HOTPLUG_PCI_SHPC=m
 
 #
-# PCI host controller drivers
+# DesignWare PCI Core Support
 #
 # CONFIG_PCIE_DW_PLAT is not set
+
+#
+# PCI host controller drivers
+#
+# CONFIG_VMD is not set
+
+#
+# PCI Endpoint
+#
+# CONFIG_PCI_ENDPOINT is not set
+
+#
+# PCI switch controller drivers
+#
+# CONFIG_PCI_SW_SWITCHTEC is not set
 # CONFIG_ISA_BUS is not set
 CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
@@ -716,15 +827,15 @@ CONFIG_COMPAT_BINFMT_ELF=y
 CONFIG_ELFCORE=y
 CONFIG_BINFMT_SCRIPT=y
 # CONFIG_HAVE_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
 CONFIG_COREDUMP=y
 CONFIG_IA32_EMULATION=y
 # CONFIG_IA32_AOUT is not set
 CONFIG_X86_X32=y
+CONFIG_COMPAT_32=y
 CONFIG_COMPAT=y
 CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
 CONFIG_X86_DEV_DMA_OPS=y
-CONFIG_PMC_ATOM=y
-# CONFIG_VMD is not set
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
@@ -737,6 +848,7 @@ CONFIG_PACKET=y
 # CONFIG_PACKET_DIAG is not set
 CONFIG_UNIX=y
 # CONFIG_UNIX_DIAG is not set
+# CONFIG_TLS is not set
 CONFIG_XFRM=y
 CONFIG_XFRM_ALGO=y
 CONFIG_XFRM_USER=y
@@ -761,20 +873,24 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_NET_IPGRE_DEMUX is not set
 CONFIG_NET_IP_TUNNEL=y
 # CONFIG_IP_MROUTE is not set
+CONFIG_SYN_COOKIES=y
 # CONFIG_NET_IPVTI is not set
 CONFIG_NET_UDP_TUNNEL=m
 # CONFIG_NET_FOU is not set
 # CONFIG_NET_FOU_IP_TUNNELS is not set
 # CONFIG_INET_AH is not set
 CONFIG_INET_ESP=y
+# CONFIG_INET_ESP_OFFLOAD is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
 CONFIG_INET_TUNNEL=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
 # CONFIG_INET_XFRM_MODE_BEET is not set
-CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_UDP_DIAG=m
+# CONFIG_INET_RAW_DIAG is not set
 CONFIG_INET_DIAG_DESTROY=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
@@ -786,6 +902,7 @@ CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y
 CONFIG_INET6_AH=y
 CONFIG_INET6_ESP=y
+# CONFIG_INET6_ESP_OFFLOAD is not set
 CONFIG_INET6_IPCOMP=y
 CONFIG_IPV6_MIP6=y
 # CONFIG_IPV6_ILA is not set
@@ -805,13 +922,14 @@ CONFIG_IPV6_TUNNEL=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
 # CONFIG_IPV6_SUBTREES is not set
 # CONFIG_IPV6_MROUTE is not set
+# CONFIG_IPV6_SEG6_LWTUNNEL is not set
+# CONFIG_IPV6_SEG6_HMAC is not set
 # CONFIG_NETLABEL is not set
 CONFIG_ANDROID_PARANOID_NETWORK=y
 CONFIG_NETWORK_SECMARK=y
 CONFIG_NET_PTP_CLASSIFY=y
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
 CONFIG_NETFILTER_ADVANCED=y
 CONFIG_BRIDGE_NETFILTER=m
 
@@ -824,6 +942,7 @@ CONFIG_NETFILTER_NETLINK=y
 CONFIG_NETFILTER_NETLINK_QUEUE=y
 CONFIG_NETFILTER_NETLINK_LOG=y
 CONFIG_NF_CONNTRACK=y
+# CONFIG_NF_LOG_NETDEV is not set
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_PROCFS=y
@@ -934,7 +1053,10 @@ CONFIG_NETFILTER_XT_MATCH_MARK=y
 CONFIG_NETFILTER_XT_MATCH_POLICY=y
 # CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
+CONFIG_NETFILTER_XT_MATCH_QTAGUID=y
 CONFIG_NETFILTER_XT_MATCH_QUOTA=y
+CONFIG_NETFILTER_XT_MATCH_QUOTA2=y
+CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y
 # CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
 # CONFIG_NETFILTER_XT_MATCH_REALM is not set
 # CONFIG_NETFILTER_XT_MATCH_RECENT is not set
@@ -955,7 +1077,6 @@ CONFIG_NETFILTER_XT_MATCH_U32=y
 CONFIG_NF_DEFRAG_IPV4=y
 CONFIG_NF_CONNTRACK_IPV4=y
 CONFIG_NF_SOCKET_IPV4=y
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 # CONFIG_NF_DUP_IPV4 is not set
 # CONFIG_NF_LOG_ARP is not set
 # CONFIG_NF_LOG_IPV4 is not set
@@ -1031,6 +1152,7 @@ CONFIG_STP=m
 CONFIG_BRIDGE=m
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_HAVE_NET_DSA=y
+# CONFIG_NET_DSA is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set
 CONFIG_LLC=m
@@ -1071,6 +1193,7 @@ CONFIG_NET_SCH_HTB=y
 # CONFIG_NET_SCH_PIE is not set
 CONFIG_NET_SCH_INGRESS=y
 # CONFIG_NET_SCH_PLUG is not set
+# CONFIG_NET_SCH_DEFAULT is not set
 
 #
 # Classification
@@ -1102,6 +1225,7 @@ CONFIG_NET_ACT_POLICE=y
 CONFIG_NET_ACT_GACT=y
 # CONFIG_GACT_PROB is not set
 CONFIG_NET_ACT_MIRRED=y
+# CONFIG_NET_ACT_SAMPLE is not set
 # CONFIG_NET_ACT_IPT is not set
 # CONFIG_NET_ACT_NAT is not set
 # CONFIG_NET_ACT_PEDIT is not set
@@ -1111,15 +1235,19 @@ CONFIG_NET_ACT_MIRRED=y
 # CONFIG_NET_ACT_VLAN is not set
 # CONFIG_NET_ACT_BPF is not set
 # CONFIG_NET_ACT_CONNMARK is not set
+# CONFIG_NET_ACT_SKBMOD is not set
 # CONFIG_NET_ACT_IFE is not set
+# CONFIG_NET_ACT_TUNNEL_KEY is not set
 # CONFIG_NET_CLS_IND is not set
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_DCB is not set
+# CONFIG_DNS_RESOLVER is not set
 # CONFIG_BATMAN_ADV is not set
 # CONFIG_OPENVSWITCH is not set
 # CONFIG_VSOCKETS is not set
 # CONFIG_NETLINK_DIAG is not set
 # CONFIG_MPLS is not set
+# CONFIG_NET_NSH is not set
 # CONFIG_HSR is not set
 # CONFIG_NET_SWITCHDEV is not set
 # CONFIG_NET_L3_MASTER_DEV is not set
@@ -1127,7 +1255,6 @@ CONFIG_NET_SCH_FIFO=y
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
-# CONFIG_SOCK_CGROUP_DATA is not set
 # CONFIG_CGROUP_NET_PRIO is not set
 # CONFIG_CGROUP_NET_CLASSID is not set
 CONFIG_NET_RX_BUSY_POLL=y
@@ -1142,7 +1269,6 @@ CONFIG_NET_FLOW_LIMIT=y
 # CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_CAN is not set
-# CONFIG_IRDA is not set
 CONFIG_BT=m
 CONFIG_BT_BREDR=y
 CONFIG_BT_RFCOMM=m
@@ -1172,12 +1298,11 @@ CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_HCIUART_3WIRE=y
 CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_BCM=y
 CONFIG_BT_HCIUART_QCA=y
 # CONFIG_BT_HCIUART_AG6XX is not set
+# CONFIG_BT_HCIUART_MRVL is not set
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
@@ -1192,6 +1317,7 @@ CONFIG_BT_ATH3K=m
 CONFIG_BT_WILINK=m
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AF_KCM is not set
+# CONFIG_STREAM_PARSER is not set
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_EXT=y
@@ -1230,16 +1356,19 @@ CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
 CONFIG_WIMAX=m
 CONFIG_WIMAX_DEBUG_LEVEL=8
 CONFIG_RFKILL=y
+CONFIG_RFKILL_PM=y
 CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
-# CONFIG_RFKILL_REGULATOR is not set
 CONFIG_RFKILL_GPIO=m
 # CONFIG_NET_9P is not set
 # CONFIG_CAIF is not set
 # CONFIG_CEPH_LIB is not set
 # CONFIG_NFC is not set
+# CONFIG_PSAMPLE is not set
+# CONFIG_NET_IFE is not set
 # CONFIG_LWTUNNEL is not set
 CONFIG_DST_CACHE=y
+CONFIG_GRO_CELLS=y
 # CONFIG_NET_DEVLINK is not set
 CONFIG_MAY_USE_DEVLINK=y
 CONFIG_HAVE_EBPF_JIT=y
@@ -1265,6 +1394,8 @@ CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
@@ -1273,12 +1404,15 @@ CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPI=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
+# CONFIG_REGMAP_SDW is not set
 CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_FENCE_TRACE is not set
+# CONFIG_DMA_FENCE_TRACE is not set
 
 #
 # Bus devices
 #
+# CONFIG_SIMPLE_PM_BUS is not set
+# CONFIG_DVC_TRACE_BUS is not set
 CONFIG_CONNECTOR=m
 CONFIG_MTD=m
 # CONFIG_MTD_TESTS is not set
@@ -1287,6 +1421,10 @@ CONFIG_MTD=m
 CONFIG_MTD_OF_PARTS=m
 # CONFIG_MTD_AR7_PARTS is not set
 
+#
+# Partition parsers
+#
+
 #
 # User Modules And Translation Layers
 #
@@ -1336,6 +1474,7 @@ CONFIG_MTD_CFI_I2=y
 #
 # CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_MCHP23K256 is not set
 # CONFIG_MTD_SST25L is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_PHRAM is not set
@@ -1346,6 +1485,7 @@ CONFIG_MTD_CFI_I2=y
 # Disk-On-Chip Device Drivers
 #
 # CONFIG_MTD_DOCG3 is not set
+CONFIG_MTD_NAND_IDS=m
 CONFIG_MTD_NAND_ECC=m
 # CONFIG_MTD_NAND_ECC_SMC is not set
 CONFIG_MTD_NAND=m
@@ -1355,15 +1495,12 @@ CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_DENALI_DT is not set
 # CONFIG_MTD_NAND_GPIO is not set
 # CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set
-CONFIG_MTD_NAND_IDS=m
 # CONFIG_MTD_NAND_RICOH is not set
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_DOCG4 is not set
 # CONFIG_MTD_NAND_CAFE is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
-# CONFIG_MTD_NAND_HISI504 is not set
-# CONFIG_MTD_NAND_MTK is not set
 CONFIG_MTD_ONENAND=m
 # CONFIG_MTD_ONENAND_VERIFY_WRITE is not set
 # CONFIG_MTD_ONENAND_GENERIC is not set
@@ -1391,7 +1528,6 @@ CONFIG_OF_NET=y
 CONFIG_OF_MDIO=m
 CONFIG_OF_PCI=y
 CONFIG_OF_PCI_IRQ=y
-CONFIG_OF_MTD=y
 # CONFIG_OF_OVERLAY is not set
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 CONFIG_PARPORT=m
@@ -1443,7 +1579,6 @@ CONFIG_PARIDE_PD=m
 # CONFIG_PARIDE_ON20 is not set
 # CONFIG_PARIDE_ON26 is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-# CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
@@ -1460,7 +1595,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 CONFIG_VIRTIO_BLK=y
-# CONFIG_BLK_DEV_HD is not set
+# CONFIG_VIRTIO_BLK_SCSI is not set
 # CONFIG_BLK_DEV_RBD is not set
 # CONFIG_BLK_DEV_RSXX is not set
 CONFIG_NVME_CORE=y
@@ -1488,23 +1623,19 @@ CONFIG_APDS9802ALS=m
 CONFIG_ISL29003=m
 CONFIG_ISL29020=m
 CONFIG_SENSORS_TSL2550=m
-CONFIG_SENSORS_BH1780=m
 CONFIG_SENSORS_BH1770=m
 CONFIG_SENSORS_APDS990X=m
 CONFIG_HMC6352=m
 # CONFIG_DS1682 is not set
 # CONFIG_TI_DAC7512 is not set
 CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=m
-CONFIG_BMP085_I2C=m
-CONFIG_BMP085_SPI=m
 CONFIG_USB_SWITCH_FSA9480=m
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 # CONFIG_SRAM is not set
-CONFIG_PANEL=m
-CONFIG_PANEL_PARPORT=0
-CONFIG_PANEL_PROFILE=5
-# CONFIG_PANEL_CHANGE_MESSAGE is not set
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_UID_SYS_STATS=y
+# CONFIG_UID_SYS_STATS_DEBUG is not set
+CONFIG_MEMORY_STATE_TIME=y
 CONFIG_C2PORT=m
 CONFIG_C2PORT_DURAMAR_2150=m
 
@@ -1517,6 +1648,7 @@ CONFIG_EEPROM_AT24=m
 # CONFIG_EEPROM_MAX6875 is not set
 CONFIG_EEPROM_93CX6=m
 # CONFIG_EEPROM_93XX46 is not set
+# CONFIG_EEPROM_IDT_89HPESX is not set
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -1574,6 +1706,7 @@ CONFIG_VMWARE_VMCI=m
 CONFIG_ECHO=m
 # CONFIG_CXL_BASE is not set
 # CONFIG_CXL_AFU_DRIVER_OPS is not set
+# CONFIG_CXL_LIB is not set
 CONFIG_HAVE_IDE=y
 CONFIG_IDE=m
 
@@ -1692,9 +1825,9 @@ CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_MEGARAID_SAS is not set
 # CONFIG_SCSI_MPT3SAS is not set
 # CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_SMARTPQI is not set
 CONFIG_SCSI_UFSHCD=y
 # CONFIG_SCSI_UFSHCD_PCI is not set
-# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
 # CONFIG_SCSI_UFSHCD_PLATFORM is not set
 # CONFIG_SCSI_HPTIOP is not set
 # CONFIG_SCSI_BUSLOGIC is not set
@@ -1716,6 +1849,7 @@ CONFIG_HYPERV_STORAGE=y
 # CONFIG_SCSI_IPR is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
 # CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_QEDI is not set
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_AM53C974 is not set
 # CONFIG_SCSI_WD719X is not set
@@ -1835,7 +1969,7 @@ CONFIG_BLK_DEV_DM=y
 # CONFIG_DM_MQ_DEFAULT is not set
 CONFIG_DM_DEBUG=y
 CONFIG_DM_BUFIO=y
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
 CONFIG_DM_CRYPT=y
 # CONFIG_DM_SNAPSHOT is not set
 # CONFIG_DM_THIN_PROVISIONING is not set
@@ -1849,9 +1983,12 @@ CONFIG_DM_CRYPT=y
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_FLAKEY is not set
 CONFIG_DM_VERITY=y
+# CONFIG_DM_VERITY_HASH_PREFETCH_MIN_SIZE_128 is not set
+CONFIG_DM_VERITY_HASH_PREFETCH_MIN_SIZE=1
 CONFIG_DM_VERITY_FEC=y
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
+# CONFIG_DM_INTEGRITY is not set
 # CONFIG_TARGET_CORE is not set
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=y
@@ -1883,7 +2020,6 @@ CONFIG_NET_TEAM=m
 # CONFIG_NET_TEAM_MODE_LOADBALANCE is not set
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
-# CONFIG_IPVLAN is not set
 # CONFIG_VXLAN is not set
 # CONFIG_GENEVE is not set
 # CONFIG_GTP is not set
@@ -1893,11 +2029,11 @@ CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETPOLL=y
 CONFIG_NET_POLL_CONTROLLER=y
 CONFIG_TUN=y
+CONFIG_TAP=m
 # CONFIG_TUN_VNET_CROSS_LE is not set
 CONFIG_VETH=m
 CONFIG_VIRTIO_NET=m
 # CONFIG_NLMON is not set
-CONFIG_SUNGEM_PHY=m
 CONFIG_ARCNET=m
 CONFIG_ARCNET_1201=m
 CONFIG_ARCNET_1051=m
@@ -1920,25 +2056,25 @@ CONFIG_ARCNET_COM20020_PCI=m
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 # CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_PCMCIA_3C574 is not set
-# CONFIG_PCMCIA_3C589 is not set
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
 # CONFIG_NET_VENDOR_ADAPTEC is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
 CONFIG_NET_VENDOR_AGERE=y
 CONFIG_ET131X=m
+CONFIG_NET_VENDOR_ALACRITECH=y
+CONFIG_SLICOSS=m
 CONFIG_NET_VENDOR_ALTEON=y
 # CONFIG_ACENIC is not set
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
 CONFIG_ALTERA_TSE=m
+CONFIG_NET_VENDOR_AMAZON=y
+# CONFIG_ENA_ETHERNET is not set
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_AMD8111_ETH=m
 CONFIG_PCNET32=m
 CONFIG_PCMCIA_NMCLAN=m
+# CONFIG_AMD_XGBE is not set
+# CONFIG_AMD_XGBE_HAVE_ECC is not set
+CONFIG_NET_VENDOR_AQUANTIA=y
+# CONFIG_AQTION is not set
 CONFIG_NET_VENDOR_ARC=y
-# CONFIG_ARC_EMAC is not set
-# CONFIG_EMAC_ROCKCHIP is not set
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ATL2=m
 CONFIG_ATL1=m
@@ -1949,6 +2085,8 @@ CONFIG_NET_VENDOR_AURORA=y
 CONFIG_AURORA_NB8800=m
 CONFIG_NET_CADENCE=y
 CONFIG_MACB=m
+CONFIG_MACB_USE_HWSTAMP=y
+# CONFIG_MACB_PCI is not set
 CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_B44=m
 CONFIG_B44_PCI_AUTOSELECT=y
@@ -1961,13 +2099,16 @@ CONFIG_CNIC=m
 # CONFIG_BNX2X is not set
 # CONFIG_SYSTEMPORT is not set
 CONFIG_BNXT=m
+CONFIG_BNXT_FLOWER_OFFLOAD=y
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_BNA=m
 CONFIG_NET_VENDOR_CAVIUM=y
 CONFIG_THUNDER_NIC_PF=m
 # CONFIG_THUNDER_NIC_VF is not set
 CONFIG_THUNDER_NIC_BGX=m
+CONFIG_THUNDER_NIC_RGX=m
 CONFIG_LIQUIDIO=m
+# CONFIG_LIQUIDIO_VF is not set
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
@@ -2008,6 +2149,8 @@ CONFIG_NET_VENDOR_FUJITSU=y
 CONFIG_PCMCIA_FMVJ18X=m
 CONFIG_NET_VENDOR_HP=y
 CONFIG_HP100=m
+CONFIG_NET_VENDOR_HUAWEI=y
+# CONFIG_HINIC is not set
 CONFIG_NET_VENDOR_INTEL=y
 # CONFIG_E100 is not set
 CONFIG_E1000=m
@@ -2029,7 +2172,6 @@ CONFIG_NET_VENDOR_I825XX=y
 CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_MVMDIO=m
-# CONFIG_MVNETA_BM is not set
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
 # CONFIG_SKGE_GENESIS is not set
@@ -2040,10 +2182,18 @@ CONFIG_MLX4_EN=m
 CONFIG_MLX4_CORE=m
 CONFIG_MLX4_DEBUG=y
 CONFIG_MLX5_CORE=m
+# CONFIG_MLX5_FPGA is not set
 CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_MPFS=y
+CONFIG_MLX5_ESWITCH=y
+# CONFIG_MLX5_CORE_IPOIB is not set
 CONFIG_MLXSW_CORE=m
 CONFIG_MLXSW_CORE_HWMON=y
+CONFIG_MLXSW_CORE_THERMAL=y
 CONFIG_MLXSW_PCI=m
+CONFIG_MLXSW_I2C=m
+CONFIG_MLXSW_MINIMAL=m
+# CONFIG_MLXFW is not set
 CONFIG_NET_VENDOR_MICREL=y
 CONFIG_KS8842=m
 CONFIG_KS8851=m
@@ -2061,7 +2211,7 @@ CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
 CONFIG_NET_VENDOR_NETRONOME=y
-# CONFIG_NFP_NETVF is not set
+# CONFIG_NFP is not set
 CONFIG_NET_VENDOR_8390=y
 CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
@@ -2082,7 +2232,9 @@ CONFIG_NETXEN_NIC=m
 CONFIG_QED=m
 CONFIG_QEDE=m
 CONFIG_NET_VENDOR_QUALCOMM=y
-# CONFIG_QCA7000 is not set
+# CONFIG_QCA7000_SPI is not set
+# CONFIG_QCOM_EMAC is not set
+# CONFIG_RMNET is not set
 CONFIG_NET_VENDOR_REALTEK=y
 CONFIG_ATP=m
 CONFIG_8139CP=m
@@ -2104,10 +2256,12 @@ CONFIG_SC92031=m
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_SIS900=m
 CONFIG_SIS190=m
+CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
 CONFIG_SFC_MCDI_MON=y
 CONFIG_SFC_MCDI_LOGGING=y
+# CONFIG_SFC_FALCON is not set
 CONFIG_NET_VENDOR_SMSC=y
 # CONFIG_PCMCIA_SMC91C92 is not set
 CONFIG_EPIC100=m
@@ -2117,17 +2271,11 @@ CONFIG_SMSC9420=m
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
 CONFIG_STMMAC_PLATFORM=m
+# CONFIG_DWMAC_DWC_QOS_ETH is not set
 CONFIG_DWMAC_GENERIC=m
 CONFIG_STMMAC_PCI=m
 # CONFIG_NET_VENDOR_SUN is not set
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NIU=m
-CONFIG_NET_VENDOR_SYNOPSYS=y
-CONFIG_SYNOPSYS_DWC_ETH_QOS=m
 # CONFIG_NET_VENDOR_TEHUTI is not set
-# CONFIG_TEHUTI is not set
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_ALE is not set
 CONFIG_TLAN=m
@@ -2144,51 +2292,60 @@ CONFIG_WIZNET_BUS_ANY=y
 # CONFIG_WIZNET_W5100_SPI is not set
 CONFIG_NET_VENDOR_XIRCOM=y
 CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_NET_VENDOR_SYNOPSYS=y
+# CONFIG_DWC_XLGMAC is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 CONFIG_NET_SB1000=m
+CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_BUS=m
+CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_MDIO_BITBANG=m
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+CONFIG_MDIO_CAVIUM=m
+CONFIG_MDIO_GPIO=m
+# CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_OCTEON=m
+CONFIG_MDIO_THUNDER=m
 CONFIG_PHYLIB=m
 CONFIG_SWPHY=y
+# CONFIG_LED_TRIGGER_PHY is not set
 
 #
 # MII PHY device drivers
 #
+CONFIG_AMD_PHY=m
 # CONFIG_AQUANTIA_PHY is not set
 CONFIG_AT803X_PHY=m
-CONFIG_AMD_PHY=m
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-# CONFIG_TERANETICS_PHY is not set
-CONFIG_SMSC_PHY=m
-CONFIG_BCM_NET_PHYLIB=m
-CONFIG_BROADCOM_PHY=m
 CONFIG_BCM7XXX_PHY=m
 CONFIG_BCM87XX_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_MICREL_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_CICADA_PHY=m
+# CONFIG_CORTINA_PHY is not set
+CONFIG_DAVICOM_PHY=m
 # CONFIG_DP83848_PHY is not set
 # CONFIG_DP83867_PHY is not set
-CONFIG_MICROCHIP_PHY=m
 CONFIG_FIXED_PHY=m
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO_GPIO=m
-CONFIG_MDIO_CAVIUM=m
-CONFIG_MDIO_OCTEON=m
-CONFIG_MDIO_THUNDER=m
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-# CONFIG_MDIO_BCM_UNIMAC is not set
+CONFIG_ICPLUS_PHY=m
 # CONFIG_INTEL_XWAY_PHY is not set
-# CONFIG_MDIO_HISI_FEMAC is not set
-# CONFIG_MDIO_XGENE is not set
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_MARVELL_PHY=m
+# CONFIG_MARVELL_10G_PHY is not set
+CONFIG_MICREL_PHY=m
+CONFIG_MICROCHIP_PHY=m
+# CONFIG_MICROSEMI_PHY is not set
+CONFIG_NATIONAL_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+# CONFIG_ROCKCHIP_PHY is not set
+CONFIG_SMSC_PHY=m
+CONFIG_STE10XP=m
+# CONFIG_TERANETICS_PHY is not set
+CONFIG_VITESSE_PHY=m
+# CONFIG_XILINX_GMII2RGMII is not set
 CONFIG_MICREL_KS8995MA=m
 CONFIG_PLIP=m
 CONFIG_PPP=y
@@ -2199,10 +2356,12 @@ CONFIG_PPP_MPPE=y
 CONFIG_PPP_MULTILINK=y
 CONFIG_PPPOE=y
 CONFIG_PPPOL2TP=m
+CONFIG_PPPOLAC=y
+CONFIG_PPPOPNS=y
 CONFIG_PPP_ASYNC=m
 CONFIG_PPP_SYNC_TTY=m
 CONFIG_SLIP=m
-CONFIG_SLHC=m
+CONFIG_SLHC=y
 # CONFIG_SLIP_COMPRESSED is not set
 # CONFIG_SLIP_SMART is not set
 # CONFIG_SLIP_MODE_SLIP6 is not set
@@ -2230,7 +2389,7 @@ CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
 CONFIG_USB_NET_MCS7830=m
-# CONFIG_USB_NET_RNDIS_HOST=m
+# CONFIG_USB_NET_RNDIS_HOST is not set
 CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
 CONFIG_USB_NET_CDC_SUBSET=m
 CONFIG_USB_ALI_M5632=y
@@ -2251,6 +2410,7 @@ CONFIG_USB_SIERRA_NET=m
 CONFIG_USB_VL600=m
 CONFIG_USB_NET_CH9200=m
 CONFIG_WLAN=y
+# CONFIG_WIRELESS_WDS is not set
 CONFIG_WLAN_VENDOR_ADMTEK=y
 CONFIG_ADM8211=m
 CONFIG_ATH_COMMON=m
@@ -2288,9 +2448,12 @@ CONFIG_AR5523=m
 CONFIG_WIL6210=m
 CONFIG_WIL6210_ISR_COR=y
 CONFIG_WIL6210_TRACING=y
+CONFIG_WIL6210_DEBUGFS=y
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 # CONFIG_ATH10K_AHB is not set
+# CONFIG_ATH10K_SDIO is not set
+# CONFIG_ATH10K_USB is not set
 # CONFIG_ATH10K_DEBUG is not set
 # CONFIG_ATH10K_DEBUGFS is not set
 # CONFIG_ATH10K_TRACING is not set
@@ -2341,7 +2504,6 @@ CONFIG_BRCMFMAC_USB=y
 CONFIG_BRCMFMAC_PCIE=y
 # CONFIG_BRCM_TRACING is not set
 # CONFIG_BRCMDBG is not set
-CONFIG_WL=m
 CONFIG_WLAN_VENDOR_CISCO=y
 CONFIG_AIRO=m
 CONFIG_AIRO_CS=m
@@ -2493,10 +2655,13 @@ CONFIG_WLAN_VENDOR_ZYDAS=y
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_WLAN_VENDOR_QUANTENNA=y
+# CONFIG_QTNFMAC_PEARL_PCIE is not set
 CONFIG_PCMCIA_RAYCS=m
 CONFIG_PCMCIA_WL3501=m
 CONFIG_MAC80211_HWSIM=m
-# CONFIG_USB_NET_RNDIS_WLAN=m
+# CONFIG_USB_NET_RNDIS_WLAN is not set
+# CONFIG_BCMDHD is not set
 
 #
 # WiMAX Wireless Broadband devices
@@ -2531,16 +2696,20 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
+CONFIG_INPUT_KEYRESET=y
+CONFIG_INPUT_KEYCOMBO=y
 
 #
 # Input Device Drivers
 #
 CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADC is not set
 # CONFIG_KEYBOARD_ADP5588 is not set
 # CONFIG_KEYBOARD_ADP5589 is not set
 CONFIG_KEYBOARD_ATKBD=m
 CONFIG_KEYBOARD_QT1070=m
 CONFIG_KEYBOARD_QT2160=m
+# CONFIG_KEYBOARD_DLINK_DIR685 is not set
 # CONFIG_KEYBOARD_LKKBD is not set
 CONFIG_KEYBOARD_GPIO=m
 # CONFIG_KEYBOARD_GPIO_POLLED is not set
@@ -2558,6 +2727,7 @@ CONFIG_KEYBOARD_MATRIX=m
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_OMAP4 is not set
+# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
 CONFIG_KEYBOARD_XTKBD=m
 # CONFIG_KEYBOARD_CROS_EC is not set
 # CONFIG_KEYBOARD_CAP11XX is not set
@@ -2568,6 +2738,7 @@ CONFIG_MOUSE_PS2_ALPS=y
 CONFIG_MOUSE_PS2_BYD=y
 CONFIG_MOUSE_PS2_LOGIPS2PP=y
 CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
 CONFIG_MOUSE_PS2_CYPRESS=y
 CONFIG_MOUSE_PS2_LIFEBOOK=y
 CONFIG_MOUSE_PS2_TRACKPOINT=y
@@ -2576,6 +2747,7 @@ CONFIG_MOUSE_PS2_SENTELIC=y
 CONFIG_MOUSE_PS2_TOUCHKIT=y
 CONFIG_MOUSE_PS2_FOCALTECH=y
 # CONFIG_MOUSE_PS2_VMMOUSE is not set
+CONFIG_MOUSE_PS2_SMBUS=y
 CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_APPLETOUCH=m
 CONFIG_MOUSE_BCM5974=m
@@ -2618,6 +2790,7 @@ CONFIG_JOYSTICK_XPAD=m
 CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_JOYSTICK_XPAD_LEDS=y
 CONFIG_JOYSTICK_WALKERA0701=m
+# CONFIG_JOYSTICK_PSXPAD_SPI is not set
 CONFIG_INPUT_TABLET=y
 CONFIG_TABLET_USB_ACECAD=m
 CONFIG_TABLET_USB_AIPTEK=m
@@ -2635,6 +2808,7 @@ CONFIG_TOUCHSCREEN_AD7879_I2C=m
 CONFIG_TOUCHSCREEN_AD7879_SPI=m
 # CONFIG_TOUCHSCREEN_AR1021_I2C is not set
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
 CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
 CONFIG_TOUCHSCREEN_BU21013=m
 CONFIG_TOUCHSCREEN_CHIPONE_ICN8318=m
@@ -2650,11 +2824,11 @@ CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 CONFIG_TOUCHSCREEN_EETI=m
 CONFIG_TOUCHSCREEN_EGALAX=m
 # CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
-CONFIG_TOUCHSCREEN_FT6236=m
 CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GOODIX=m
 CONFIG_TOUCHSCREEN_ILI210X=m
 CONFIG_TOUCHSCREEN_GUNZE=m
+# CONFIG_TOUCHSCREEN_EKTF2127 is not set
 CONFIG_TOUCHSCREEN_ELAN=m
 CONFIG_TOUCHSCREEN_ELO=m
 CONFIG_TOUCHSCREEN_WACOM_W8001=m
@@ -2703,14 +2877,17 @@ CONFIG_TOUCHSCREEN_TSC200X_CORE=m
 CONFIG_TOUCHSCREEN_TSC2004=m
 CONFIG_TOUCHSCREEN_TSC2005=m
 CONFIG_TOUCHSCREEN_TSC2007=m
+# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
 # CONFIG_TOUCHSCREEN_RM_TS is not set
 CONFIG_TOUCHSCREEN_SILEAD=m
 # CONFIG_TOUCHSCREEN_SIS_I2C is not set
 CONFIG_TOUCHSCREEN_ST1232=m
+# CONFIG_TOUCHSCREEN_STMFTS is not set
 CONFIG_TOUCHSCREEN_SUR40=m
 CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
 CONFIG_TOUCHSCREEN_SX8654=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
+# CONFIG_TOUCHSCREEN_ZET6223 is not set
 CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TOUCHSCREEN_ROHM_BU21023=m
 CONFIG_INPUT_MISC=y
@@ -2724,13 +2901,14 @@ CONFIG_INPUT_BMA150=m
 # CONFIG_INPUT_E3X0_BUTTON is not set
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_MMA8450=m
-CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_GP2A=m
 # CONFIG_INPUT_GPIO_BEEPER is not set
 CONFIG_INPUT_GPIO_TILT_POLLED=m
+# CONFIG_INPUT_GPIO_DECODER is not set
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYCHORD=y
 CONFIG_INPUT_KEYSPAN_REMOTE=m
 CONFIG_INPUT_KXTJ9=m
 # CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
@@ -2740,8 +2918,10 @@ CONFIG_INPUT_CM109=m
 CONFIG_INPUT_REGULATOR_HAPTIC=m
 CONFIG_INPUT_TPS65218_PWRBUTTON=m
 CONFIG_INPUT_UINPUT=y
+CONFIG_INPUT_GPIO=y
 CONFIG_INPUT_PCF8574=m
 # CONFIG_INPUT_PWM_BEEPER is not set
+# CONFIG_INPUT_PWM_VIBRA is not set
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
 CONFIG_INPUT_ADXL34X=m
 CONFIG_INPUT_ADXL34X_I2C=m
@@ -2751,11 +2931,22 @@ CONFIG_INPUT_CMA3000=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
 CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_INPUT_SURFACE3_BUTTON_ARRAY=m
 CONFIG_INPUT_DRV260X_HAPTICS=m
 CONFIG_INPUT_DRV2665_HAPTICS=m
 CONFIG_INPUT_DRV2667_HAPTICS=m
-# CONFIG_RMI4_CORE is not set
+CONFIG_RMI4_CORE=m
+# CONFIG_RMI4_I2C is not set
+# CONFIG_RMI4_SPI is not set
+# CONFIG_RMI4_SMB is not set
+CONFIG_RMI4_F03=y
+CONFIG_RMI4_F03_SERIO=m
+CONFIG_RMI4_2D_SENSOR=y
+CONFIG_RMI4_F11=y
+CONFIG_RMI4_F12=y
+CONFIG_RMI4_F30=y
+# CONFIG_RMI4_F34 is not set
+# CONFIG_RMI4_F54 is not set
+# CONFIG_RMI4_F55 is not set
 
 #
 # Hardware I/O ports
@@ -2774,6 +2965,7 @@ CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_APBPS2 is not set
 CONFIG_HYPERV_KEYBOARD=y
+# CONFIG_SERIO_GPIO_PS2 is not set
 # CONFIG_USERIO is not set
 CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
@@ -2812,17 +3004,20 @@ CONFIG_SERIAL_8250_PNP=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_DMA=y
 CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_EXAR=m
 # CONFIG_SERIAL_8250_CS is not set
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
+# CONFIG_SERIAL_8250_ASPEED_VUART is not set
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 CONFIG_SERIAL_8250_DETECT_IRQ=y
 CONFIG_SERIAL_8250_RSA=y
 # CONFIG_SERIAL_8250_FSL is not set
 CONFIG_SERIAL_8250_DW=y
 # CONFIG_SERIAL_8250_RT288X is not set
+CONFIG_SERIAL_8250_LPSS=y
 # CONFIG_SERIAL_8250_MID is not set
 # CONFIG_SERIAL_8250_MOXA is not set
 # CONFIG_SERIAL_OF_PLATFORM is not set
@@ -2846,7 +3041,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_RP2 is not set
 # CONFIG_SERIAL_FSL_LPUART is not set
 # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
-CONFIG_SERIAL_MCTRL_GPIO=y
+# CONFIG_SERIAL_DEV_BUS is not set
 # CONFIG_TTY_PRINTK is not set
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
@@ -2870,6 +3065,7 @@ CONFIG_NVRAM=m
 # CONFIG_SYNCLINK_CS is not set
 # CONFIG_CARDMAN_4000 is not set
 # CONFIG_CARDMAN_4040 is not set
+# CONFIG_SCR24X is not set
 # CONFIG_IPWIRELESS is not set
 # CONFIG_MWAVE is not set
 CONFIG_RAW_DRIVER=m
@@ -2881,6 +3077,9 @@ CONFIG_HANGCHECK_TIMER=m
 # CONFIG_TELCLOCK is not set
 # CONFIG_DEVPORT is not set
 # CONFIG_XILLYBUS is not set
+CONFIG_RPMB=y
+# CONFIG_RPMB_INTF_DEV is not set
+# CONFIG_RPMB_SIM is not set
 
 #
 # I2C support
@@ -2897,14 +3096,17 @@ CONFIG_I2C_MUX=m
 #
 # CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
 CONFIG_I2C_MUX_GPIO=m
+# CONFIG_I2C_MUX_GPMUX is not set
+# CONFIG_I2C_MUX_LTC4306 is not set
 CONFIG_I2C_MUX_PCA9541=m
 CONFIG_I2C_MUX_PCA954x=m
 CONFIG_I2C_MUX_PINCTRL=m
 CONFIG_I2C_MUX_REG=m
 # CONFIG_I2C_DEMUX_PINCTRL is not set
+# CONFIG_I2C_MUX_MLXCPLD is not set
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
-CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_ALGOPCA=m
 
 #
@@ -2941,8 +3143,9 @@ CONFIG_I2C_SCMI=m
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
 CONFIG_I2C_CBUS_GPIO=m
-CONFIG_I2C_DESIGNWARE_CORE=m
-CONFIG_I2C_DESIGNWARE_PLATFORM=m
+CONFIG_I2C_DESIGNWARE_CORE=y
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
+# CONFIG_I2C_DESIGNWARE_SLAVE is not set
 CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
 CONFIG_I2C_EMEV2=m
@@ -2967,6 +3170,7 @@ CONFIG_I2C_TINY_USB=m
 #
 # Other I2C/SMBus bus drivers
 #
+# CONFIG_I2C_MLXCPLD is not set
 CONFIG_I2C_CROS_EC_TUNNEL=m
 # CONFIG_I2C_STUB is not set
 CONFIG_I2C_SLAVE=y
@@ -3008,12 +3212,9 @@ CONFIG_SPI_PXA2XX_PCI=m
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_LOOPBACK_TEST is not set
 # CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_SLAVE is not set
 # CONFIG_SPMI is not set
 # CONFIG_HSI is not set
-
-#
-# PPS support
-#
 CONFIG_PPS=m
 # CONFIG_PPS_DEBUG is not set
 
@@ -3037,24 +3238,32 @@ CONFIG_PTP_1588_CLOCK=m
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PINCTRL=y
 
 #
 # Pin controllers
 #
+CONFIG_GENERIC_PINCTRL_GROUPS=y
 CONFIG_PINMUX=y
+CONFIG_GENERIC_PINMUX_FUNCTIONS=y
 CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
 CONFIG_PINCTRL_AMD=y
+# CONFIG_PINCTRL_MCP23S08 is not set
 CONFIG_PINCTRL_SINGLE=m
+# CONFIG_PINCTRL_SX150X is not set
 CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_CHERRYVIEW=y
 CONFIG_PINCTRL_INTEL=y
 CONFIG_PINCTRL_BROXTON=y
+# CONFIG_PINCTRL_CANNONLAKE is not set
+# CONFIG_PINCTRL_DENVERTON is not set
+# CONFIG_PINCTRL_GEMINILAKE is not set
+# CONFIG_PINCTRL_LEWISBURG is not set
 CONFIG_PINCTRL_SUNRISEPOINT=m
 CONFIG_GPIOLIB=y
-CONFIG_GPIO_DEVRES=y
 CONFIG_OF_GPIO=y
 CONFIG_GPIO_ACPI=y
 CONFIG_GPIOLIB_IRQCHIP=y
@@ -3070,14 +3279,16 @@ CONFIG_GPIO_MAX730X=m
 # CONFIG_GPIO_ALTERA is not set
 # CONFIG_GPIO_AMDPT is not set
 CONFIG_GPIO_DWAPB=m
+# CONFIG_GPIO_EXAR is not set
+# CONFIG_GPIO_FTGPIO010 is not set
 CONFIG_GPIO_GENERIC_PLATFORM=m
 # CONFIG_GPIO_GRGPIO is not set
 CONFIG_GPIO_ICH=m
 CONFIG_GPIO_LYNXPOINT=m
+# CONFIG_GPIO_MOCKUP is not set
 CONFIG_GPIO_SYSCON=m
 CONFIG_GPIO_VX855=m
 CONFIG_GPIO_XILINX=m
-# CONFIG_GPIO_ZX is not set
 
 #
 # Port-mapped I/O GPIO drivers
@@ -3112,6 +3323,7 @@ CONFIG_GPIO_UCB1400=m
 #
 CONFIG_GPIO_AMD8111=m
 CONFIG_GPIO_ML_IOH=m
+# CONFIG_GPIO_PCI_IDIO_16 is not set
 CONFIG_GPIO_RDC321X=m
 # CONFIG_GPIO_SODAVILLE is not set
 
@@ -3122,16 +3334,14 @@ CONFIG_GPIO_RDC321X=m
 CONFIG_GPIO_MAX7301=m
 CONFIG_GPIO_MC33880=m
 # CONFIG_GPIO_PISOSR is not set
-
-#
-# SPI or I2C GPIO expanders
-#
-CONFIG_GPIO_MCP23S08=m
+# CONFIG_GPIO_XRA1403 is not set
 
 #
 # USB GPIO expanders
 #
 # CONFIG_W1 is not set
+CONFIG_POWER_AVS=y
+# CONFIG_POWER_RESET is not set
 CONFIG_POWER_SUPPLY=y
 CONFIG_POWER_SUPPLY_DEBUG=y
 CONFIG_PDA_POWER=y
@@ -3140,7 +3350,9 @@ CONFIG_PDA_POWER=y
 # CONFIG_BATTERY_DS2780 is not set
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_SBS is not set
+# CONFIG_CHARGER_SBS is not set
 # CONFIG_BATTERY_BQ27XXX is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
@@ -3149,6 +3361,8 @@ CONFIG_PDA_POWER=y
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_MANAGER is not set
+# CONFIG_CHARGER_LTC3651 is not set
+# CONFIG_CHARGER_DETECTOR_MAX14656 is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24190 is not set
 # CONFIG_CHARGER_BQ24257 is not set
@@ -3158,8 +3372,6 @@ CONFIG_CHARGER_SMB347=m
 # CONFIG_CHARGER_TPS65217 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_CHARGER_RT9455 is not set
-# CONFIG_POWER_RESET is not set
-CONFIG_POWER_AVS=y
 CONFIG_HWMON=m
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -3190,6 +3402,7 @@ CONFIG_HWMON_VID=m
 # CONFIG_SENSORS_FAM15H_POWER is not set
 CONFIG_SENSORS_APPLESMC=m
 # CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ASPEED is not set
 # CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_DS620 is not set
 # CONFIG_SENSORS_DS1621 is not set
@@ -3233,6 +3446,7 @@ CONFIG_SENSORS_DELL_SMM=m
 # CONFIG_SENSORS_MAX6697 is not set
 # CONFIG_SENSORS_MAX31790 is not set
 # CONFIG_SENSORS_MCP3021 is not set
+# CONFIG_SENSORS_TC654 is not set
 # CONFIG_SENSORS_MENF21BMC_HWMON is not set
 # CONFIG_SENSORS_ADCXX is not set
 # CONFIG_SENSORS_LM63 is not set
@@ -3276,6 +3490,7 @@ CONFIG_SENSORS_LM85=m
 # CONFIG_SENSORS_SCH56XX_COMMON is not set
 # CONFIG_SENSORS_SCH5627 is not set
 # CONFIG_SENSORS_SCH5636 is not set
+# CONFIG_SENSORS_STTS751 is not set
 # CONFIG_SENSORS_SMM665 is not set
 # CONFIG_SENSORS_ADC128D818 is not set
 # CONFIG_SENSORS_ADS1015 is not set
@@ -3289,6 +3504,7 @@ CONFIG_SENSORS_LM85=m
 # CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_TMP102 is not set
 # CONFIG_SENSORS_TMP103 is not set
+# CONFIG_SENSORS_TMP108 is not set
 # CONFIG_SENSORS_TMP401 is not set
 # CONFIG_SENSORS_TMP421 is not set
 # CONFIG_SENSORS_VIA_CPUTEMP is not set
@@ -3304,6 +3520,7 @@ CONFIG_SENSORS_LM85=m
 # CONFIG_SENSORS_W83L786NG is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_SENSORS_XGENE is not set
 
 #
 # ACPI drivers
@@ -3311,6 +3528,7 @@ CONFIG_SENSORS_LM85=m
 CONFIG_SENSORS_ACPI_POWER=m
 # CONFIG_SENSORS_ATK0110 is not set
 CONFIG_THERMAL=y
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_OF=y
 CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
@@ -3323,7 +3541,10 @@ CONFIG_THERMAL_GOV_BANG_BANG=y
 CONFIG_THERMAL_GOV_USER_SPACE=y
 # CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
 # CONFIG_CPU_THERMAL is not set
+# CONFIG_CLOCK_THERMAL is not set
+# CONFIG_DEVFREQ_THERMAL is not set
 # CONFIG_THERMAL_EMULATION is not set
+# CONFIG_QORIQ_THERMAL is not set
 CONFIG_INTEL_POWERCLAMP=m
 CONFIG_X86_PKG_TEMP_THERMAL=y
 CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
@@ -3337,9 +3558,19 @@ CONFIG_ACPI_THERMAL_REL=m
 # CONFIG_INT3406_THERMAL is not set
 CONFIG_INTEL_PCH_THERMAL=m
 # CONFIG_GENERIC_ADC_THERMAL is not set
+
+#
+# Trusty
+#
+CONFIG_TRUSTY=y
+CONFIG_TRUSTY_LOG=y
+CONFIG_TRUSTY_VIRTIO=y
+CONFIG_TRUSTY_VIRTIO_IPC=y
+CONFIG_TRUSTY_BACKUP_TIMER=y
 CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_CORE is not set
+CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 # CONFIG_WATCHDOG_SYSFS is not set
 
 #
@@ -3348,6 +3579,7 @@ CONFIG_WATCHDOG=y
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_MENF21BMC_WATCHDOG is not set
+# CONFIG_WDAT_WDT is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ZIIRAVE_WATCHDOG is not set
 # CONFIG_CADENCE_WATCHDOG is not set
@@ -3368,6 +3600,7 @@ CONFIG_WATCHDOG=y
 # CONFIG_I6300ESB_WDT is not set
 # CONFIG_IE6XX_WDT is not set
 CONFIG_ITCO_WDT=y
+# CONFIG_ITCO_VENDOR_SUPPORT is not set
 # CONFIG_IT8712F_WDT is not set
 # CONFIG_IT87_WDT is not set
 # CONFIG_HP_WATCHDOG is not set
@@ -3385,6 +3618,7 @@ CONFIG_ITCO_WDT=y
 # CONFIG_MACHZ_WDT is not set
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set
 # CONFIG_NI903X_WDT is not set
+# CONFIG_NIC7018_WDT is not set
 # CONFIG_MEN_A21_WDT is not set
 
 #
@@ -3397,6 +3631,11 @@ CONFIG_ITCO_WDT=y
 # USB-based Watchdog Cards
 #
 # CONFIG_USBPCWATCHDOG is not set
+
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
 CONFIG_SSB_POSSIBLE=y
 
 #
@@ -3418,10 +3657,6 @@ CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_DRIVER_PCICORE=y
 # CONFIG_SSB_DRIVER_GPIO is not set
 CONFIG_BCMA_POSSIBLE=y
-
-#
-# Broadcom specific AMBA
-#
 CONFIG_BCMA=m
 CONFIG_BCMA_BLOCKIO=y
 CONFIG_BCMA_HOST_PCI_POSSIBLE=y
@@ -3445,6 +3680,7 @@ CONFIG_MFD_CORE=y
 # CONFIG_MFD_ATMEL_FLEXCOM is not set
 # CONFIG_MFD_ATMEL_HLCDC is not set
 # CONFIG_MFD_BCM590XX is not set
+# CONFIG_MFD_BD9571MWV is not set
 # CONFIG_MFD_AXP20X_I2C is not set
 CONFIG_MFD_CROS_EC=m
 CONFIG_MFD_CROS_EC_I2C=m
@@ -3466,10 +3702,11 @@ CONFIG_MFD_CROS_EC_I2C=m
 CONFIG_LPC_ICH=m
 CONFIG_LPC_SCH=m
 CONFIG_INTEL_SOC_PMIC=y
+# CONFIG_INTEL_SOC_PMIC_BXTWC is not set
+# CONFIG_INTEL_SOC_PMIC_CHTWC is not set
 CONFIG_MFD_INTEL_LPSS=y
 CONFIG_MFD_INTEL_LPSS_ACPI=m
 CONFIG_MFD_INTEL_LPSS_PCI=y
-CONFIG_BXT_WC_PMIC_OPREGION=y
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
 CONFIG_MFD_88PM800=m
@@ -3487,6 +3724,7 @@ CONFIG_MFD_MAX8907=m
 CONFIG_MFD_MT6397=m
 CONFIG_MFD_MENF21BMC=m
 # CONFIG_EZX_PCAP is not set
+# CONFIG_MFD_CPCAP is not set
 # CONFIG_MFD_VIPERBOARD is not set
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_PCF50633 is not set
@@ -3509,6 +3747,7 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_LP3943 is not set
 # CONFIG_MFD_LP8788 is not set
+# CONFIG_MFD_TI_LMU is not set
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_TPS6105X is not set
 # CONFIG_TPS65010 is not set
@@ -3516,6 +3755,9 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TPS65086 is not set
 # CONFIG_MFD_TPS65090 is not set
 CONFIG_MFD_TPS65217=m
+# CONFIG_MFD_TPS68470 is not set
+# CONFIG_MFD_TI_LP873X is not set
+# CONFIG_MFD_TI_LP87565 is not set
 CONFIG_MFD_TPS65218=m
 # CONFIG_MFD_TPS6586X is not set
 # CONFIG_MFD_TPS65910 is not set
@@ -3551,7 +3793,8 @@ CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
 # CONFIG_REGULATOR_ACT8865 is not set
 # CONFIG_REGULATOR_AD5398 is not set
 # CONFIG_REGULATOR_ANATOP is not set
-# CONFIG_REGULATOR_ARIZONA is not set
+# CONFIG_REGULATOR_ARIZONA_LDO1 is not set
+# CONFIG_REGULATOR_ARIZONA_MICSUPP is not set
 # CONFIG_REGULATOR_DA9210 is not set
 # CONFIG_REGULATOR_DA9211 is not set
 # CONFIG_REGULATOR_FAN53555 is not set
@@ -3563,6 +3806,7 @@ CONFIG_REGULATOR_GPIO=m
 # CONFIG_REGULATOR_LP872X is not set
 # CONFIG_REGULATOR_LP8755 is not set
 # CONFIG_REGULATOR_LTC3589 is not set
+# CONFIG_REGULATOR_LTC3676 is not set
 # CONFIG_REGULATOR_MAX1586 is not set
 # CONFIG_REGULATOR_MAX8649 is not set
 # CONFIG_REGULATOR_MAX8660 is not set
@@ -3585,9 +3829,47 @@ CONFIG_REGULATOR_GPIO=m
 CONFIG_REGULATOR_TPS62360=m
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_TPS65132 is not set
 # CONFIG_REGULATOR_TPS65217 is not set
 # CONFIG_REGULATOR_TPS65218 is not set
 # CONFIG_REGULATOR_TPS6524X is not set
+# CONFIG_REGULATOR_VCTRL is not set
+CONFIG_RC_CORE=y
+CONFIG_RC_MAP=m
+CONFIG_RC_DECODERS=y
+CONFIG_LIRC=m
+CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=y
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_XMP_DECODER=y
+CONFIG_RC_DEVICES=y
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_IR_ENE=m
+# CONFIG_IR_HIX5HD2 is not set
+CONFIG_IR_IMON=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_FINTEK=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_REDRAT3=m
+# CONFIG_IR_SPI is not set
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
+# CONFIG_IR_IGORPLUGUSB is not set
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_IR_GPIO_CIR=m
+# CONFIG_IR_GPIO_TX is not set
+# CONFIG_IR_PWM_TX is not set
+# CONFIG_IR_SERIAL is not set
+# CONFIG_IR_SIR is not set
 CONFIG_MEDIA_SUPPORT=y
 
 #
@@ -3598,8 +3880,7 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
 CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 CONFIG_MEDIA_RADIO_SUPPORT=y
 # CONFIG_MEDIA_SDR_SUPPORT is not set
-CONFIG_MEDIA_RC_SUPPORT=y
-CONFIG_MEDIA_CEC_EDID=y
+# CONFIG_MEDIA_CEC_SUPPORT is not set
 CONFIG_MEDIA_CONTROLLER=y
 # CONFIG_MEDIA_CONTROLLER_DVB is not set
 CONFIG_VIDEO_DEV=y
@@ -3607,7 +3888,9 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_VIDEO_V4L2=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_PCI_SKELETON is not set
 CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_FWNODE=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_VMALLOC=m
@@ -3623,41 +3906,11 @@ CONFIG_DVB_NET=y
 CONFIG_TTPCI_EEPROM=m
 CONFIG_DVB_MAX_ADAPTERS=8
 # CONFIG_DVB_DYNAMIC_MINORS is not set
+# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
 
 #
 # Media drivers
 #
-CONFIG_RC_CORE=y
-CONFIG_RC_MAP=m
-CONFIG_RC_DECODERS=y
-CONFIG_LIRC=m
-CONFIG_IR_LIRC_CODEC=m
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_SHARP_DECODER=y
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_IR_XMP_DECODER=y
-CONFIG_RC_DEVICES=y
-CONFIG_RC_ATI_REMOTE=m
-CONFIG_IR_ENE=m
-# CONFIG_IR_HIX5HD2 is not set
-CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_ITE_CIR=m
-CONFIG_IR_FINTEK=m
-CONFIG_IR_NUVOTON=m
-CONFIG_IR_REDRAT3=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_WINBOND_CIR=m
-# CONFIG_IR_IGORPLUGUSB is not set
-CONFIG_IR_IGUANA=m
-CONFIG_IR_TTUSBIR=m
-CONFIG_RC_LOOPBACK=m
-CONFIG_IR_GPIO_CIR=m
 CONFIG_MEDIA_USB_SUPPORT=y
 
 #
@@ -3750,6 +4003,7 @@ CONFIG_VIDEO_TM6000_DVB=m
 #
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_DIB3000MC=m
 CONFIG_DVB_USB_A800=m
 CONFIG_DVB_USB_DIBUSB_MB=m
 CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
@@ -3788,6 +4042,7 @@ CONFIG_DVB_USB_LME2510=m
 CONFIG_DVB_USB_MXL111SF=m
 CONFIG_DVB_USB_RTL28XXU=m
 # CONFIG_DVB_USB_DVBSKY is not set
+# CONFIG_DVB_USB_ZD1301 is not set
 # CONFIG_DVB_TTUSB_BUDGET is not set
 CONFIG_DVB_TTUSB_DEC=m
 CONFIG_SMS_USB_DRV=m
@@ -3810,6 +4065,7 @@ CONFIG_MEDIA_PCI_SUPPORT=y
 #
 CONFIG_VIDEO_MEYE=m
 # CONFIG_VIDEO_SOLO6X10 is not set
+# CONFIG_VIDEO_TW5864 is not set
 # CONFIG_VIDEO_TW68 is not set
 # CONFIG_VIDEO_TW686X is not set
 # CONFIG_VIDEO_ZORAN is not set
@@ -3850,14 +4106,11 @@ CONFIG_VIDEO_SAA7164=m
 #
 # Media digital TV PCI Adapters
 #
-# CONFIG_DVB_AV7110_IR is not set
 # CONFIG_DVB_AV7110 is not set
-# CONFIG_DVB_AV7110_OSD is not set
 CONFIG_DVB_BUDGET_CORE=m
 CONFIG_DVB_BUDGET=m
 CONFIG_DVB_BUDGET_CI=m
 CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
 CONFIG_DVB_B2C2_FLEXCOP_PCI=m
 # CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
 CONFIG_DVB_PLUTO2=m
@@ -3869,17 +4122,21 @@ CONFIG_DVB_MANTIS=m
 CONFIG_DVB_HOPPER=m
 CONFIG_DVB_NGENE=m
 CONFIG_DVB_DDBRIDGE=m
+# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
 # CONFIG_DVB_SMIPCIE is not set
 # CONFIG_DVB_NETUP_UNIDVB is not set
 CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_CAFE_CCIC=m
 CONFIG_VIDEO_VIA_CAMERA=m
+# CONFIG_VIDEO_MUX is not set
 CONFIG_SOC_CAMERA=m
 CONFIG_SOC_CAMERA_PLATFORM=m
 # CONFIG_VIDEO_XILINX is not set
 # CONFIG_V4L_MEM2MEM_DRIVERS is not set
 CONFIG_V4L_TEST_DRIVERS=y
+# CONFIG_VIDEO_VIMC is not set
 CONFIG_VIDEO_VIVID=m
+# CONFIG_VIDEO_VIVID_CEC is not set
 CONFIG_VIDEO_VIVID_MAX_DEVS=2
 # CONFIG_VIDEO_VIM2M is not set
 # CONFIG_DVB_PLATFORM_DRIVERS is not set
@@ -3926,14 +4183,14 @@ CONFIG_SMS_SIANO_RC=y
 CONFIG_VIDEO_V4L2_TPG=m
 
 #
-# Media ancillary drivers (tuners, sensors, i2c, frontends)
+# Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
 #
 # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
 CONFIG_MEDIA_ATTACH=y
 CONFIG_VIDEO_IR_I2C=m
 
 #
-# Encoders, decoders, sensors and other helper chips
+# I2C Encoders, decoders, sensors and other helper chips
 #
 
 #
@@ -3965,13 +4222,17 @@ CONFIG_VIDEO_CS5345=m
 #
 CONFIG_VIDEO_ADV7180=m
 CONFIG_VIDEO_ADV7183=m
+# CONFIG_VIDEO_ADV748X is not set
 CONFIG_VIDEO_ADV7604=m
+# CONFIG_VIDEO_ADV7604_CEC is not set
 # CONFIG_VIDEO_ADV7842 is not set
 CONFIG_VIDEO_BT819=m
 CONFIG_VIDEO_BT856=m
 CONFIG_VIDEO_BT866=m
 CONFIG_VIDEO_KS0127=m
 # CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_AD5820 is not set
+# CONFIG_VIDEO_DW9714 is not set
 CONFIG_VIDEO_SAA7110=m
 CONFIG_VIDEO_SAA711X=m
 # CONFIG_VIDEO_TC358743 is not set
@@ -4007,12 +4268,20 @@ CONFIG_VIDEO_AK881X=m
 # Camera sensor devices
 #
 CONFIG_VIDEO_APTINA_PLL=m
+# CONFIG_VIDEO_OV2640 is not set
 # CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV5640 is not set
+# CONFIG_VIDEO_OV5645 is not set
+# CONFIG_VIDEO_OV5647 is not set
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV5670 is not set
 # CONFIG_VIDEO_OV7640 is not set
 CONFIG_VIDEO_OV7670=m
 # CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_OV13858 is not set
 CONFIG_VIDEO_VS6624=m
 CONFIG_VIDEO_MT9M032=m
+CONFIG_VIDEO_MT9M111=m
 CONFIG_VIDEO_MT9P031=m
 CONFIG_VIDEO_MT9T001=m
 CONFIG_VIDEO_MT9V011=m
@@ -4025,6 +4294,7 @@ CONFIG_VIDEO_S5K6AA=m
 CONFIG_VIDEO_S5K4ECGX=m
 # CONFIG_VIDEO_S5K5BAF is not set
 # CONFIG_VIDEO_SMIAPP is not set
+# CONFIG_VIDEO_ET8EK8 is not set
 # CONFIG_VIDEO_S5C73M3 is not set
 
 #
@@ -4046,6 +4316,10 @@ CONFIG_VIDEO_S5K4ECGX=m
 #
 # CONFIG_VIDEO_SAA6752HS is not set
 
+#
+# SDR tuner chips
+#
+
 #
 # Miscellaneous helper chips
 #
@@ -4065,14 +4339,17 @@ CONFIG_SOC_CAMERA_MT9M111=m
 CONFIG_SOC_CAMERA_MT9T031=m
 CONFIG_SOC_CAMERA_MT9T112=m
 CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_OV2640=m
 CONFIG_SOC_CAMERA_OV5642=m
-CONFIG_SOC_CAMERA_OV6650=m
 CONFIG_SOC_CAMERA_OV772X=m
 CONFIG_SOC_CAMERA_OV9640=m
 CONFIG_SOC_CAMERA_OV9740=m
 CONFIG_SOC_CAMERA_RJ54N1=m
 CONFIG_SOC_CAMERA_TW9910=m
+
+#
+# SPI helper chips
+#
+# CONFIG_VIDEO_GS1662 is not set
 CONFIG_MEDIA_TUNER=y
 
 #
@@ -4124,7 +4401,10 @@ CONFIG_MEDIA_TUNER_QM1D1C0042=m
 CONFIG_DVB_STB0899=m
 CONFIG_DVB_STB6100=m
 CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV0910=m
 CONFIG_DVB_STV6110x=m
+CONFIG_DVB_STV6111=m
+CONFIG_DVB_MXL5XX=m
 CONFIG_DVB_M88DS3103=m
 
 #
@@ -4189,7 +4469,6 @@ CONFIG_DVB_DIB9000=m
 CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
-CONFIG_DVB_HD29L2=m
 CONFIG_DVB_STV0367=m
 CONFIG_DVB_CXD2820R=m
 CONFIG_DVB_CXD2841ER=m
@@ -4197,6 +4476,8 @@ CONFIG_DVB_RTL2830=m
 CONFIG_DVB_RTL2832=m
 CONFIG_DVB_SI2168=m
 CONFIG_DVB_AS102_FE=m
+CONFIG_DVB_ZD1301_DEMOD=m
+CONFIG_DVB_GP8PSK_FE=m
 
 #
 # DVB-C (cable) frontends
@@ -4285,11 +4566,15 @@ CONFIG_VGA_SWITCHEROO=y
 CONFIG_DRM=y
 CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
+# CONFIG_DRM_DEBUG_MM is not set
+# CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 CONFIG_DRM_TTM=m
+CONFIG_DRM_VM=y
 
 #
 # I2C encoder or helper chips
@@ -4297,15 +4582,12 @@ CONFIG_DRM_TTM=m
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
 # CONFIG_DRM_RADEON is not set
-# CONFIG_DRM_RADEON_USERPTR is not set
 CONFIG_DRM_AMDGPU=m
+# CONFIG_DRM_AMDGPU_SI is not set
 CONFIG_DRM_AMDGPU_CIK=y
 # CONFIG_DRM_AMDGPU_USERPTR is not set
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
-# CONFIG_DRM_AMD_POWERPLAY is not set
 
 #
 # ACP (Audio CoProcessor) Configuration
@@ -4316,7 +4598,9 @@ CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_I915=y
-CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=y
+# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
+CONFIG_DRM_I915_CAPTURE_ERROR=y
+CONFIG_DRM_I915_COMPRESS_ERROR=y
 CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_I915_GVT is not set
 
@@ -4325,10 +4609,11 @@ CONFIG_DRM_I915_USERPTR=y
 #
 # CONFIG_DRM_I915_WERROR is not set
 # CONFIG_DRM_I915_DEBUG is not set
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
+# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
+# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
+# CONFIG_DRM_I915_SELFTEST is not set
+# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
+# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VMWGFX=m
 CONFIG_DRM_VMWGFX_FBCON=y
@@ -4339,6 +4624,7 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_CIRRUS_QEMU is not set
+# CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_QXL is not set
 CONFIG_DRM_BOCHS=m
 CONFIG_DRM_VIRTIO_GPU=m
@@ -4347,25 +4633,41 @@ CONFIG_DRM_PANEL=y
 #
 # Display Panels
 #
+# CONFIG_DRM_PANEL_LVDS is not set
 # CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
+# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
 # CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 CONFIG_DRM_BRIDGE=y
+CONFIG_DRM_PANEL_BRIDGE=y
 
 #
 # Display Interface Bridges
 #
 # CONFIG_DRM_ANALOGIX_ANX78XX is not set
+# CONFIG_DRM_DUMB_VGA_DAC is not set
+# CONFIG_DRM_LVDS_ENCODER is not set
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PARADE_PS8622 is not set
+# CONFIG_DRM_SIL_SII8620 is not set
 # CONFIG_DRM_SII902X is not set
 # CONFIG_DRM_TOSHIBA_TC358767 is not set
+# CONFIG_DRM_TI_TFP410 is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
 # CONFIG_DRM_ARCPGU is not set
+# CONFIG_DRM_HISI_HIBMC is not set
+# CONFIG_DRM_MXSFB is not set
+# CONFIG_DRM_TINYDRM is not set
+# CONFIG_DRM_LEGACY is not set
+# CONFIG_DRM_LIB_RANDOM is not set
 
 #
 # Frame buffer Devices
@@ -4380,11 +4682,12 @@ CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
+# CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA is not set
 # CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_SVGALIB=m
 # CONFIG_FB_MACMODES is not set
@@ -4416,7 +4719,6 @@ CONFIG_FB_RIVA=m
 CONFIG_FB_RIVA_BACKLIGHT=y
 # CONFIG_FB_I740 is not set
 # CONFIG_FB_LE80578 is not set
-# CONFIG_FB_INTEL is not set
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -4496,6 +4798,7 @@ CONFIG_BACKLIGHT_TPS65217=m
 CONFIG_BACKLIGHT_GPIO=m
 CONFIG_BACKLIGHT_LV5207LP=m
 CONFIG_BACKLIGHT_BD6107=m
+# CONFIG_BACKLIGHT_ARCXCNN is not set
 CONFIG_VGASTATE=m
 CONFIG_HDMI=y
 
@@ -4511,29 +4814,27 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 # CONFIG_LOGO is not set
-CONFIG_SOUND=m
+CONFIG_SOUND=y
 CONFIG_SOUND_OSS_CORE=y
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
 CONFIG_SND_PCM_ELD=y
-CONFIG_SND_DMAENGINE_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_COMPRESS_OFFLOAD=m
+CONFIG_SND_PCM_IEC958=y
+CONFIG_SND_DMAENGINE_PCM=y
+CONFIG_SND_HWDEP=y
+CONFIG_SND_SEQ_DEVICE=y
+CONFIG_SND_RAWMIDI=y
+CONFIG_SND_COMPRESS_OFFLOAD=y
 CONFIG_SND_JACK=y
 CONFIG_SND_JACK_INPUT_DEV=y
-CONFIG_SND_SEQUENCER=m
-# CONFIG_SND_SEQ_DUMMY is not set
 CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
+CONFIG_SND_MIXER_OSS=y
+CONFIG_SND_PCM_OSS=y
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_PCM_TIMER=y
-# CONFIG_SND_SEQUENCER_OSS is not set
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_HRTIMER=y
 CONFIG_SND_DYNAMIC_MINORS=y
 CONFIG_SND_MAX_CARDS=32
 # CONFIG_SND_SUPPORT_OLD_API is not set
@@ -4543,13 +4844,18 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_DEBUG is not set
 CONFIG_SND_VMASTER=y
 CONFIG_SND_DMA_SGBUF=y
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-# CONFIG_SND_OPL4_LIB_SEQ is not set
-# CONFIG_SND_SBAWE_SEQ is not set
-CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_SEQUENCER=y
+# CONFIG_SND_SEQ_DUMMY is not set
+# CONFIG_SND_SEQUENCER_OSS is not set
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_SEQ_MIDI_EVENT=y
+CONFIG_SND_SEQ_MIDI=y
+CONFIG_SND_SEQ_MIDI_EMUL=m
+CONFIG_SND_SEQ_VIRMIDI=m
 CONFIG_SND_MPU401_UART=m
 CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+# CONFIG_SND_OPL4_LIB_SEQ is not set
 CONFIG_SND_VX_LIB=m
 CONFIG_SND_AC97_CODEC=m
 CONFIG_SND_DRIVERS=y
@@ -4603,6 +4909,7 @@ CONFIG_SND_INDIGODJ=m
 CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGODJX=m
 CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1_SEQ=m
 CONFIG_SND_EMU10K1X=m
 CONFIG_SND_ENS1370=m
 CONFIG_SND_ENS1371=m
@@ -4622,7 +4929,6 @@ CONFIG_SND_INTEL8X0M=m
 CONFIG_SND_LOLA=m
 CONFIG_SND_LX6464ES=m
 # CONFIG_SND_MAESTRO3 is not set
-CONFIG_SND_MAESTRO3_INPUT=y
 CONFIG_SND_MIXART=m
 CONFIG_SND_NM256=m
 CONFIG_SND_PCXHR=m
@@ -4641,39 +4947,39 @@ CONFIG_SND_VX222=m
 #
 # HD-Audio
 #
-CONFIG_SND_HDA=m
-CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA=y
+CONFIG_SND_HDA_INTEL=y
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_RECONFIG=y
 # CONFIG_SND_HDA_INPUT_BEEP is not set
 CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_SIGMATEL=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_CODEC_CIRRUS=m
-CONFIG_SND_HDA_CODEC_CONEXANT=m
-CONFIG_SND_HDA_CODEC_CA0110=m
-CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_CODEC_ANALOG=y
+CONFIG_SND_HDA_CODEC_SIGMATEL=y
+CONFIG_SND_HDA_CODEC_VIA=y
+CONFIG_SND_HDA_CODEC_HDMI=y
+CONFIG_SND_HDA_CODEC_CIRRUS=y
+CONFIG_SND_HDA_CODEC_CONEXANT=y
+CONFIG_SND_HDA_CODEC_CA0110=y
+CONFIG_SND_HDA_CODEC_CA0132=y
 CONFIG_SND_HDA_CODEC_CA0132_DSP=y
-CONFIG_SND_HDA_CODEC_CMEDIA=m
-CONFIG_SND_HDA_CODEC_SI3054=m
-CONFIG_SND_HDA_GENERIC=m
+CONFIG_SND_HDA_CODEC_CMEDIA=y
+CONFIG_SND_HDA_CODEC_SI3054=y
+CONFIG_SND_HDA_GENERIC=y
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=3
-CONFIG_SND_HDA_CORE=m
+CONFIG_SND_HDA_CORE=y
 CONFIG_SND_HDA_DSP_LOADER=y
 CONFIG_SND_HDA_I915=y
 CONFIG_SND_HDA_EXT_CORE=m
 CONFIG_SND_HDA_PREALLOC_SIZE=64
 # CONFIG_SND_SPI is not set
 CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_AUDIO=y
+CONFIG_SND_USB_UA101=y
+CONFIG_SND_USB_USX2Y=y
 CONFIG_SND_USB_CAIAQ=m
 # CONFIG_SND_USB_CAIAQ_INPUT is not set
-CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_US122L=y
 CONFIG_SND_USB_6FIRE=m
 CONFIG_SND_USB_HIFACE=m
 CONFIG_SND_BCD2000=m
@@ -4685,7 +4991,7 @@ CONFIG_SND_USB_VARIAX=m
 CONFIG_SND_PCMCIA=y
 CONFIG_SND_VXPOCKET=m
 CONFIG_SND_PDAUDIOCF=m
-CONFIG_SND_SOC=m
+CONFIG_SND_SOC=y
 CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 CONFIG_SND_SOC_COMPRESS=y
@@ -4708,8 +5014,9 @@ CONFIG_SND_DESIGNWARE_I2S=m
 # CONFIG_SND_SOC_FSL_SPDIF is not set
 # CONFIG_SND_SOC_FSL_ESAI is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
+# CONFIG_SND_I2S_HI6210_I2S is not set
 # CONFIG_SND_SOC_IMG is not set
-CONFIG_SND_SST_MFLD_PLATFORM=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
 CONFIG_SND_SST_IPC=m
 CONFIG_SND_SST_IPC_ACPI=m
 CONFIG_SND_SOC_INTEL_SST=m
@@ -4720,31 +5027,44 @@ CONFIG_SND_SOC_INTEL_HASWELL=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 # CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set
 # CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set
+# CONFIG_SND_SOC_INTEL_BXT_TDF8532_MACH is not set
+# CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
 # CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH is not set
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
+# CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH is not set
+# CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH is not set
+# CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set
+# CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH is not set
+# CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH is not set
 CONFIG_SND_SOC_INTEL_SKYLAKE=m
 CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
 # CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH is not set
 # CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH is not set
+# CONFIG_SND_SOC_INTEL_CNL_FPGA is not set
+# CONFIG_SND_SOC_INTEL_CNL_CS42L42_MACH is not set
+# CONFIG_SND_SOC_INTEL_CNL_RT700_MACH is not set
+# CONFIG_SND_SOC_INTEL_CNL_SVFPGA_MACH is not set
+# CONFIG_SND_SOC_INTEL_CNL_RT274_MACH is not set
+# CONFIG_SND_SOC_SDW_AGGM1M2 is not set
 
 #
-# Allwinner SoC Audio support
+# STMicroelectronics STM32 SOC audio support
 #
-# CONFIG_SND_SUN4I_CODEC is not set
-# CONFIG_SND_SUN4I_I2S is not set
-# CONFIG_SND_SUN4I_SPDIF is not set
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
-CONFIG_SND_SOC_I2C_AND_SPI=m
+# CONFIG_ZX_TDM is not set
+CONFIG_SND_SOC_I2C_AND_SPI=y
 
 #
 # CODEC drivers
 #
 CONFIG_SND_SOC_AC97_CODEC=m
 CONFIG_SND_SOC_ADAU1701=m
+# CONFIG_SND_SOC_ADAU1761_I2C is not set
+# CONFIG_SND_SOC_ADAU1761_SPI is not set
 # CONFIG_SND_SOC_ADAU7002 is not set
 CONFIG_SND_SOC_AK4104=m
 CONFIG_SND_SOC_AK4554=m
@@ -4755,6 +5075,12 @@ CONFIG_SND_SOC_ALC5623=m
 # CONFIG_SND_SOC_BT_SCO is not set
 CONFIG_SND_SOC_CS35L32=m
 # CONFIG_SND_SOC_CS35L33 is not set
+# CONFIG_SND_SOC_CS35L34 is not set
+# CONFIG_SND_SOC_CS35L35 is not set
+# CONFIG_SND_SOC_CS42L42 is not set
+# CONFIG_SND_SOC_SVFPGA is not set
+# CONFIG_SND_SOC_SVFPGA_SDW is not set
+# CONFIG_SND_SOC_SVFPGA_I2C is not set
 CONFIG_SND_SOC_CS42L51=m
 CONFIG_SND_SOC_CS42L51_I2C=m
 CONFIG_SND_SOC_CS42L52=m
@@ -4767,16 +5093,24 @@ CONFIG_SND_SOC_CS4271_I2C=m
 CONFIG_SND_SOC_CS4271_SPI=m
 CONFIG_SND_SOC_CS42XX8=m
 CONFIG_SND_SOC_CS42XX8_I2C=m
+# CONFIG_SND_SOC_CS43130 is not set
 CONFIG_SND_SOC_CS4349=m
 # CONFIG_SND_SOC_CS53L30 is not set
+# CONFIG_SND_SOC_DIO2125 is not set
 CONFIG_SND_SOC_DMIC=m
-CONFIG_SND_SOC_ES8328=m
+CONFIG_SND_SOC_HDMI_CODEC=m
+# CONFIG_SND_SOC_ES7134 is not set
+# CONFIG_SND_SOC_ES8316 is not set
+# CONFIG_SND_SOC_ES8328_I2C is not set
+# CONFIG_SND_SOC_ES8328_SPI is not set
 # CONFIG_SND_SOC_GTM601 is not set
 CONFIG_SND_SOC_HDAC_HDMI=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 CONFIG_SND_SOC_MAX98090=m
 # CONFIG_SND_SOC_MAX98504 is not set
+# CONFIG_SND_SOC_MAX98927 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
+# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 CONFIG_SND_SOC_PCM1681=m
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X_SPI is not set
@@ -4794,6 +5128,8 @@ CONFIG_SND_SOC_RT5640=m
 CONFIG_SND_SOC_RT5645=m
 CONFIG_SND_SOC_RT5670=m
 # CONFIG_SND_SOC_RT5677_SPI is not set
+# CONFIG_SND_SOC_RT700 is not set
+# CONFIG_SND_SOC_RT700_SDW is not set
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SIGMADSP=m
 CONFIG_SND_SOC_SIGMADSP_I2C=m
@@ -4819,6 +5155,7 @@ CONFIG_SND_SOC_TLV320AIC3X=m
 CONFIG_SND_SOC_TS3A227E=m
 CONFIG_SND_SOC_WM8510=m
 CONFIG_SND_SOC_WM8523=m
+# CONFIG_SND_SOC_WM8524 is not set
 CONFIG_SND_SOC_WM8580=m
 CONFIG_SND_SOC_WM8711=m
 CONFIG_SND_SOC_WM8728=m
@@ -4838,11 +5175,20 @@ CONFIG_SND_SOC_WM8962=m
 # CONFIG_SND_SOC_WM8974 is not set
 CONFIG_SND_SOC_WM8978=m
 # CONFIG_SND_SOC_WM8985 is not set
+# CONFIG_SND_SOC_ZX_AUD96P22 is not set
+# CONFIG_SND_SOC_NAU8540 is not set
+# CONFIG_SND_SOC_NAU8810 is not set
+# CONFIG_SND_SOC_NAU8824 is not set
 CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
-# CONFIG_SOUND_PRIME is not set
-CONFIG_AC97_BUS=m
+# CONFIG_SND_SIMPLE_SCU_CARD is not set
+# CONFIG_SND_AUDIO_GRAPH_CARD is not set
+# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
+CONFIG_SND_X86=y
+# CONFIG_HDMI_LPE_AUDIO is not set
+CONFIG_SND_SYNTH_EMUX=m
+CONFIG_AC97_BUS=y
 
 #
 # HID support
@@ -4857,6 +5203,7 @@ CONFIG_HID_GENERIC=y
 # Special HID drivers
 #
 CONFIG_HID_A4TECH=m
+# CONFIG_HID_ACCUTOUCH is not set
 CONFIG_HID_ACRUX=m
 CONFIG_HID_ACRUX_FF=y
 CONFIG_HID_APPLE=m
@@ -4889,6 +5236,7 @@ CONFIG_HID_UCLOGIC=m
 CONFIG_HID_WALTOP=m
 CONFIG_HID_GYRATION=m
 CONFIG_HID_ICADE=m
+# CONFIG_HID_ITE is not set
 CONFIG_HID_TWINHAN=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_LCPOWER=m
@@ -4902,9 +5250,11 @@ CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIWHEELS_FF=y
 CONFIG_HID_MAGICMOUSE=m
+# CONFIG_HID_MAYFLASH is not set
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
 CONFIG_HID_MULTITOUCH=m
+# CONFIG_HID_NTI is not set
 CONFIG_HID_NTRIG=m
 CONFIG_HID_ORTEK=m
 CONFIG_HID_PANTHERLORD=m
@@ -4919,6 +5269,7 @@ CONFIG_HID_PICOLCD_LEDS=y
 CONFIG_HID_PICOLCD_CIR=y
 CONFIG_HID_PLANTRONICS=m
 CONFIG_HID_PRIMAX=m
+# CONFIG_HID_RETRODE is not set
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
@@ -4938,6 +5289,7 @@ CONFIG_HID_TOPSEED=m
 CONFIG_HID_THINGM=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
+# CONFIG_HID_UDRAW_PS3 is not set
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
 CONFIG_HID_XINMO=m
@@ -4959,11 +5311,17 @@ CONFIG_USB_HIDDEV=y
 # I2C HID support
 #
 CONFIG_I2C_HID=m
+
+#
+# Intel ISH HID support
+#
+# CONFIG_INTEL_ISH_HID is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=y
+CONFIG_USB_PCI=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 
 #
@@ -4975,7 +5333,7 @@ CONFIG_USB_OTG=y
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 # CONFIG_USB_OTG_FSM is not set
-# CONFIG_USB_ULPI_BUS is not set
+# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
 CONFIG_USB_MON=y
 # CONFIG_USB_WUSB_CBAF is not set
 
@@ -4985,7 +5343,7 @@ CONFIG_USB_MON=y
 # CONFIG_USB_C67X00_HCD is not set
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_PCI=y
-CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_XHCI_PLATFORM=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
@@ -5048,6 +5406,8 @@ CONFIG_USB_MDC800=m
 # CONFIG_USB_MICROTEK is not set
 CONFIG_USBIP_CORE=m
 CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_VHCI_HC_PORTS=8
+CONFIG_USBIP_VHCI_NR_HCS=1
 CONFIG_USBIP_HOST=m
 # CONFIG_USBIP_VUDC is not set
 # CONFIG_USBIP_DEBUG is not set
@@ -5099,6 +5459,7 @@ CONFIG_USB_SERIAL_IR=m
 # CONFIG_USB_SERIAL_EDGEPORT is not set
 # CONFIG_USB_SERIAL_EDGEPORT_TI is not set
 CONFIG_USB_SERIAL_F81232=m
+# CONFIG_USB_SERIAL_F8153X is not set
 CONFIG_USB_SERIAL_GARMIN=m
 CONFIG_USB_SERIAL_IPW=m
 CONFIG_USB_SERIAL_IUU=m
@@ -5133,6 +5494,7 @@ CONFIG_USB_SERIAL_XSENS_MT=m
 CONFIG_USB_SERIAL_WISHBONE=m
 CONFIG_USB_SERIAL_SSU100=m
 CONFIG_USB_SERIAL_QT2=m
+# CONFIG_USB_SERIAL_UPD78F0730 is not set
 # CONFIG_USB_SERIAL_DEBUG is not set
 
 #
@@ -5159,18 +5521,21 @@ CONFIG_USB_APPLEDISPLAY=m
 # CONFIG_USB_ISIGHTFW is not set
 # CONFIG_USB_YUREX is not set
 CONFIG_USB_EZUSB_FX2=m
+# CONFIG_USB_HUB_USB251XB is not set
 # CONFIG_USB_HSIC_USB3503 is not set
+# CONFIG_USB_HSIC_USB4604 is not set
 # CONFIG_USB_LINK_LAYER_TEST is not set
 # CONFIG_USB_CHAOSKEY is not set
-# CONFIG_UCSI is not set
 
 #
 # USB Physical Layer drivers
 #
 CONFIG_USB_PHY=y
+CONFIG_USB_OTG_WAKELOCK=y
 CONFIG_NOP_USB_XCEIV=m
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_ISP1301 is not set
+# CONFIG_DUAL_ROLE_USB_INTF is not set
 CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
 CONFIG_USB_GADGET_DEBUG_FILES=y
@@ -5187,6 +5552,7 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_PXA27X is not set
 # CONFIG_USB_MV_UDC is not set
 # CONFIG_USB_MV_U3D is not set
+# CONFIG_USB_SNP_UDC_PLAT is not set
 # CONFIG_USB_M66592 is not set
 # CONFIG_USB_BDC_UDC is not set
 # CONFIG_USB_AMD5536UDC is not set
@@ -5199,11 +5565,38 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 CONFIG_USB_LIBCOMPOSITE=y
 CONFIG_USB_U_ETHER=y
 CONFIG_USB_F_RNDIS=y
-CONFIG_USB_F_UVC=m
 CONFIG_USB_F_FS=y
+CONFIG_USB_F_UVC=m
+CONFIG_USB_F_MIDI=y
+CONFIG_USB_F_MTP=y
+CONFIG_USB_F_PTP=y
+CONFIG_USB_F_AUDIO_SRC=y
 CONFIG_USB_F_ACC=y
 CONFIG_USB_CONFIGFS=y
+# CONFIG_USB_CONFIGFS_SERIAL is not set
+# CONFIG_USB_CONFIGFS_ACM is not set
+# CONFIG_USB_CONFIGFS_OBEX is not set
+# CONFIG_USB_CONFIGFS_NCM is not set
+# CONFIG_USB_CONFIGFS_ECM is not set
+# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
+CONFIG_USB_CONFIGFS_RNDIS=y
+# CONFIG_USB_CONFIGFS_EEM is not set
+# CONFIG_USB_CONFIGFS_PHONET is not set
+# CONFIG_USB_CONFIGFS_MASS_STORAGE is not set
+# CONFIG_USB_CONFIGFS_F_LB_SS is not set
 CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_MTP=y
+CONFIG_USB_CONFIGFS_F_PTP=y
+CONFIG_USB_CONFIGFS_F_ACC=y
+CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
+CONFIG_USB_CONFIGFS_UEVENT=y
+# CONFIG_USB_CONFIGFS_F_UAC1 is not set
+# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
+# CONFIG_USB_CONFIGFS_F_UAC2 is not set
+CONFIG_USB_CONFIGFS_F_MIDI=y
+# CONFIG_USB_CONFIGFS_F_HID is not set
+# CONFIG_USB_CONFIGFS_F_UVC is not set
+# CONFIG_USB_CONFIGFS_F_PRINTER is not set
 # CONFIG_USB_ZERO is not set
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_ETH is not set
@@ -5223,31 +5616,28 @@ CONFIG_USB_CONFIGFS_F_FS=y
 CONFIG_USB_G_WEBCAM=m
 
 #
-# USB PD and Type-C drivers
+# USB Power Delivery and Type-C drivers
 #
-CONFIG_TYPEC=y
-CONFIG_USB_PD_SINK=y
-CONFIG_TYPEC_WCOVE=y
-
+# CONFIG_TYPEC_UCSI is not set
 # CONFIG_USB_LED_TRIG is not set
+# CONFIG_USB_ULPI_BUS is not set
 # CONFIG_UWB is not set
 CONFIG_MMC=y
-# CONFIG_MMC_DEBUG is not set
 CONFIG_PWRSEQ_EMMC=y
+# CONFIG_PWRSEQ_SD8787 is not set
 CONFIG_PWRSEQ_SIMPLE=y
-
-#
-# MMC/SD/SDIO Card Drivers
-#
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_SDIO_UART=m
 # CONFIG_MMC_TEST is not set
+# CONFIG_MMC_EMBEDDED_SDIO is not set
+# CONFIG_MMC_PARANOID_SD_INIT is not set
+# CONFIG_MMC_SIMULATE_MAX_SPEED is not set
 
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
+# CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PCI=y
 CONFIG_MMC_RICOH_MMC=y
@@ -5255,6 +5645,7 @@ CONFIG_MMC_SDHCI_ACPI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 # CONFIG_MMC_SDHCI_OF_ARASAN is not set
 # CONFIG_MMC_SDHCI_OF_AT91 is not set
+# CONFIG_MMC_SDHCI_CADENCE is not set
 CONFIG_MMC_SDHCI_F_SDH30=m
 CONFIG_MMC_WBSD=m
 CONFIG_MMC_TIFM_SD=m
@@ -5269,6 +5660,7 @@ CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_TOSHIBA_PCI=m
 CONFIG_MMC_MTK=m
+# CONFIG_MMC_SDHCI_XENON is not set
 CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set
 
@@ -5290,6 +5682,7 @@ CONFIG_MEMSTICK_REALTEK_USB=m
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_CLASS_FLASH is not set
+# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
 
 #
 # LED drivers
@@ -5299,6 +5692,7 @@ CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_LM3530 is not set
 # CONFIG_LEDS_LM3533 is not set
 # CONFIG_LEDS_LM3642 is not set
+# CONFIG_LEDS_MT6323 is not set
 # CONFIG_LEDS_PCA9532 is not set
 CONFIG_LEDS_GPIO=m
 # CONFIG_LEDS_LP3944 is not set
@@ -5321,6 +5715,7 @@ CONFIG_LEDS_GPIO=m
 # CONFIG_LEDS_TLC591XX is not set
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_MENF21BMC is not set
+# CONFIG_LEDS_IS31FL319X is not set
 # CONFIG_LEDS_IS31FL32XX is not set
 
 #
@@ -5328,6 +5723,9 @@ CONFIG_LEDS_GPIO=m
 #
 # CONFIG_LEDS_BLINKM is not set
 # CONFIG_LEDS_SYSCON is not set
+# CONFIG_LEDS_MLXCPLD is not set
+# CONFIG_LEDS_USER is not set
+# CONFIG_LEDS_NIC78BX is not set
 
 #
 # LED Triggers
@@ -5362,6 +5760,7 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTC_DEBUG=y
+CONFIG_RTC_NVMEM=y
 
 #
 # RTC interfaces
@@ -5380,6 +5779,7 @@ CONFIG_RTC_DRV_ABB5ZES3=m
 # CONFIG_RTC_DRV_ABX80X is not set
 CONFIG_RTC_DRV_DS1307=m
 CONFIG_RTC_DRV_DS1307_HWMON=y
+# CONFIG_RTC_DRV_DS1307_CENTURY is not set
 CONFIG_RTC_DRV_DS1374=m
 # CONFIG_RTC_DRV_DS1374_WDT is not set
 CONFIG_RTC_DRV_DS1672=m
@@ -5389,7 +5789,6 @@ CONFIG_RTC_DRV_MAX8907=m
 CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_ISL1208=m
 CONFIG_RTC_DRV_ISL12022=m
-# CONFIG_RTC_DRV_ISL12057 is not set
 CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_PCF8523=m
 CONFIG_RTC_DRV_PCF85063=m
@@ -5431,6 +5830,7 @@ CONFIG_RTC_I2C_AND_SPI=y
 # SPI and I2C RTC drivers
 #
 CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_DS3232_HWMON=y
 CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_RV3029C2=m
 CONFIG_RTC_DRV_RV3029_HWMON=y
@@ -5465,8 +5865,10 @@ CONFIG_RTC_DRV_V3020=m
 #
 # on-CPU RTC drivers
 #
+# CONFIG_RTC_DRV_FTRTC010 is not set
 # CONFIG_RTC_DRV_SNVS is not set
 # CONFIG_RTC_DRV_MT6397 is not set
+# CONFIG_RTC_DRV_R7301 is not set
 
 #
 # HID Sensor RTC drivers
@@ -5481,14 +5883,15 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 CONFIG_DMA_ACPI=y
 CONFIG_DMA_OF=y
+# CONFIG_ALTERA_MSGDMA is not set
 # CONFIG_FSL_EDMA is not set
 # CONFIG_INTEL_IDMA64 is not set
 CONFIG_INTEL_IOATDMA=m
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_HIDMA is not set
-CONFIG_DW_DMAC_CORE=m
+CONFIG_DW_DMAC_CORE=y
 CONFIG_DW_DMAC=m
-CONFIG_DW_DMAC_PCI=m
+CONFIG_DW_DMAC_PCI=y
 
 #
 # DMA Clients
@@ -5500,8 +5903,15 @@ CONFIG_DMA_ENGINE_RAID=y
 #
 # DMABUF options
 #
+CONFIG_SYNC_FILE=y
+CONFIG_SW_SYNC=y
 CONFIG_DCA=m
 # CONFIG_AUXDISPLAY is not set
+CONFIG_CHARLCD=m
+CONFIG_PANEL=m
+CONFIG_PANEL_PARPORT=0
+CONFIG_PANEL_PROFILE=5
+# CONFIG_PANEL_CHANGE_MESSAGE is not set
 CONFIG_UIO=m
 # CONFIG_UIO_CIF is not set
 # CONFIG_UIO_PDRV_GENIRQ is not set
@@ -5512,6 +5922,7 @@ CONFIG_UIO=m
 # CONFIG_UIO_NETX is not set
 # CONFIG_UIO_PRUSS is not set
 # CONFIG_UIO_MF624 is not set
+# CONFIG_UIO_HV_GENERIC is not set
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VIRTIO=y
 
@@ -5529,10 +5940,11 @@ CONFIG_VIRTIO_MMIO=m
 # Microsoft Hyper-V guest support
 #
 CONFIG_HYPERV=y
+CONFIG_HYPERV_TSCPAGE=y
 CONFIG_HYPERV_UTILS=m
 CONFIG_HYPERV_BALLOON=m
 CONFIG_STAGING=y
-CONFIG_SLICOSS=m
+# CONFIG_IRDA is not set
 CONFIG_PRISM2_USB=m
 CONFIG_COMEDI=m
 # CONFIG_COMEDI_DEBUG is not set
@@ -5551,16 +5963,11 @@ CONFIG_RTLLIB_CRYPTO_CCMP=m
 CONFIG_RTLLIB_CRYPTO_TKIP=m
 CONFIG_RTLLIB_CRYPTO_WEP=m
 CONFIG_RTL8192E=m
+CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
-CONFIG_R8723AU=m
-CONFIG_8723AU_AP_MODE=y
-CONFIG_8723AU_BT_COEXIST=y
-CONFIG_RTL8723BS=m
-CONFIG_RTL8723BU=m
-CONFIG_RTL8821AU=m
-CONFIG_WLAN_SDIO=y
+# CONFIG_R8822BE is not set
 CONFIG_RTS5208=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
@@ -5576,7 +5983,6 @@ CONFIG_ADIS16201=m
 CONFIG_ADIS16203=m
 CONFIG_ADIS16209=m
 CONFIG_ADIS16240=m
-CONFIG_SCA3000=m
 
 #
 # Analog to digital converters
@@ -5620,9 +6026,6 @@ CONFIG_ADIS16060=m
 #
 # Light sensors
 #
-CONFIG_SENSORS_ISL29018=m
-CONFIG_SENSORS_ISL29028=m
-CONFIG_TSL2583=m
 CONFIG_TSL2x7x=m
 
 #
@@ -5652,10 +6055,9 @@ CONFIG_FB_XGI=m
 #
 # CONFIG_SPEAKUP is not set
 CONFIG_STAGING_MEDIA=y
+# CONFIG_INTEL_ATOMISP is not set
 # CONFIG_I2C_BCM2048 is not set
-# CONFIG_MEDIA_CEC is not set
 CONFIG_DVB_CXD2099=m
-# CONFIG_VIDEO_TW686X_KH is not set
 # CONFIG_LIRC_STAGING is not set
 
 #
@@ -5663,6 +6065,14 @@ CONFIG_DVB_CXD2099=m
 #
 CONFIG_ASHMEM=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
+CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
+CONFIG_SYNC=y
+CONFIG_ION=y
+# CONFIG_ION_SYSTEM_HEAP is not set
+# CONFIG_ION_CARVEOUT_HEAP is not set
+# CONFIG_ION_CHUNK_HEAP is not set
+# CONFIG_ABL_BOOTLOADER_CONTROL is not set
+# CONFIG_FIQ_WATCHDOG is not set
 # CONFIG_STAGING_BOARD is not set
 # CONFIG_LTE_GDM724X is not set
 # CONFIG_MTD_SPINAND_MT29F is not set
@@ -5677,17 +6087,26 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 # CONFIG_WILC1000_SPI is not set
 # CONFIG_MOST is not set
 # CONFIG_KS7010 is not set
+# CONFIG_GREYBUS is not set
+
+#
+# USB Power Delivery and Type-C drivers
+#
+# CONFIG_TYPEC_TCPM is not set
+# CONFIG_DRM_VBOXVIDEO is not set
+# CONFIG_PI433 is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
 CONFIG_ALIENWARE_WMI=m
 CONFIG_ASUS_LAPTOP=m
-# CONFIG_DELL_SMBIOS is not set
+# CONFIG_DELL_LAPTOP is not set
+# CONFIG_DELL_WMI is not set
 CONFIG_DELL_WMI_AIO=m
+# CONFIG_DELL_WMI_LED is not set
 CONFIG_DELL_SMO8800=m
 CONFIG_DELL_RBTN=m
 CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
 CONFIG_FUJITSU_TABLET=m
 CONFIG_AMILO_RFKILL=m
 CONFIG_HP_ACCEL=m
@@ -5699,6 +6118,7 @@ CONFIG_COMPAL_LAPTOP=m
 CONFIG_SONY_LAPTOP=m
 CONFIG_SONYPI_COMPAT=y
 CONFIG_IDEAPAD_LAPTOP=m
+# CONFIG_SURFACE3_WMI is not set
 CONFIG_THINKPAD_ACPI=m
 CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
 # CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
@@ -5714,13 +6134,17 @@ CONFIG_ASUS_NB_WMI=m
 CONFIG_EEEPC_WMI=m
 # CONFIG_ASUS_WIRELESS is not set
 CONFIG_ACPI_WMI=m
+CONFIG_WMI_BMOF=m
 CONFIG_MSI_WMI=m
+# CONFIG_PEAQ_WMI is not set
 CONFIG_TOPSTAR_LAPTOP=m
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_TOSHIBA_BT_RFKILL=m
 CONFIG_TOSHIBA_HAPS=m
 CONFIG_TOSHIBA_WMI=m
 CONFIG_ACPI_CMPC=m
+# CONFIG_INTEL_CHT_INT33FE is not set
+# CONFIG_INTEL_INT0002_VGPIO is not set
 # CONFIG_INTEL_HID_EVENT is not set
 # CONFIG_INTEL_VBTN is not set
 CONFIG_INTEL_IPS=m
@@ -5736,8 +6160,15 @@ CONFIG_INTEL_SMARTCONNECT=m
 CONFIG_PVPANIC=m
 CONFIG_INTEL_PMC_IPC=y
 CONFIG_SURFACE_PRO3_BUTTON=m
+# CONFIG_SURFACE_3_BUTTON is not set
 CONFIG_INTEL_PUNIT_IPC=y
 CONFIG_INTEL_TELEMETRY=y
+# CONFIG_MLX_PLATFORM is not set
+# CONFIG_MLX_CPLD_PLATFORM is not set
+# CONFIG_INTEL_TURBO_MAX_3 is not set
+# CONFIG_SILEAD_DMI is not set
+# CONFIG_INTEL_PSTORE_PRAM is not set
+CONFIG_PMC_ATOM=y
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
 # CONFIG_CHROMEOS_PSTORE is not set
@@ -5752,6 +6183,7 @@ CONFIG_COMMON_CLK=y
 #
 # Common Clock Framework
 #
+# CONFIG_CLK_HSDK is not set
 # CONFIG_COMMON_CLK_SI5351 is not set
 # CONFIG_COMMON_CLK_SI514 is not set
 # CONFIG_COMMON_CLK_SI570 is not set
@@ -5763,11 +6195,8 @@ CONFIG_COMMON_CLK=y
 # CONFIG_COMMON_CLK_PWM is not set
 # CONFIG_COMMON_CLK_PXA is not set
 # CONFIG_COMMON_CLK_PIC32 is not set
-# CONFIG_SUNXI_CCU is not set
-
-#
-# Hardware Spinlock drivers
-#
+# CONFIG_COMMON_CLK_VC5 is not set
+# CONFIG_HWSPINLOCK is not set
 
 #
 # Clock Source drivers
@@ -5780,7 +6209,11 @@ CONFIG_CLKBLD_I8253=y
 # CONFIG_SH_TIMER_MTU2 is not set
 # CONFIG_SH_TIMER_TMU is not set
 # CONFIG_EM_TIMER_STI is not set
-# CONFIG_MAILBOX is not set
+CONFIG_MAILBOX=y
+# CONFIG_PLATFORM_MHU is not set
+CONFIG_PCC=y
+# CONFIG_ALTERA_MBOX is not set
+# CONFIG_MAILBOX_TEST is not set
 CONFIG_IOMMU_SUPPORT=y
 
 #
@@ -5793,19 +6226,32 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # Remoteproc drivers
 #
-# CONFIG_STE_MODEM_RPROC is not set
+# CONFIG_REMOTEPROC is not set
 
 #
 # Rpmsg drivers
 #
+# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 
 #
 # SOC (System On Chip) specific Drivers
 #
 
+#
+# Amlogic SoC drivers
+#
+
 #
 # Broadcom SoC drivers
 #
+
+#
+# i.MX SoC drivers
+#
+
+#
+# Qualcomm SoC drivers
+#
 # CONFIG_SUNXI_SRAM is not set
 # CONFIG_SOC_TI is not set
 CONFIG_PM_DEVFREQ=y
@@ -5823,7 +6269,7 @@ CONFIG_DEVFREQ_GOV_POWERSAVE=m
 # DEVFREQ Drivers
 #
 # CONFIG_PM_DEVFREQ_EVENT is not set
-CONFIG_EXTCON=m
+CONFIG_EXTCON=y
 
 #
 # Extcon Device Drivers
@@ -5831,10 +6277,13 @@ CONFIG_EXTCON=m
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_ARIZONA=m
 CONFIG_EXTCON_GPIO=m
+# CONFIG_EXTCON_INTEL_INT3496 is not set
 # CONFIG_EXTCON_MAX3355 is not set
 CONFIG_EXTCON_RT8973A=m
 CONFIG_EXTCON_SM5502=m
 CONFIG_EXTCON_USB_GPIO=m
+# CONFIG_EXTCON_USBC_CROS_EC is not set
+# CONFIG_EXTCON_INTEL_USB is not set
 # CONFIG_MEMORY is not set
 CONFIG_IIO=m
 CONFIG_IIO_BUFFER=y
@@ -5855,12 +6304,20 @@ CONFIG_BMA180=m
 CONFIG_BMC150_ACCEL=m
 CONFIG_BMC150_ACCEL_I2C=m
 CONFIG_BMC150_ACCEL_SPI=m
+# CONFIG_DA280 is not set
+# CONFIG_DA311 is not set
+# CONFIG_DMARD06 is not set
+# CONFIG_DMARD09 is not set
+# CONFIG_DMARD10 is not set
 CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_IIO_ST_ACCEL_3AXIS=m
 CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
 CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
 CONFIG_KXSD9=m
+CONFIG_KXSD9_SPI=m
+CONFIG_KXSD9_I2C=m
 CONFIG_KXCJK1013=m
+# CONFIG_MC3230 is not set
 # CONFIG_MMA7455_I2C is not set
 # CONFIG_MMA7455_SPI is not set
 # CONFIG_MMA7660 is not set
@@ -5870,6 +6327,7 @@ CONFIG_MMA9551=m
 CONFIG_MMA9553=m
 CONFIG_MXC4005=m
 # CONFIG_MXC6255 is not set
+CONFIG_SCA3000=m
 CONFIG_STK8312=m
 CONFIG_STK8BA50=m
 
@@ -5881,24 +6339,39 @@ CONFIG_AD_SIGMA_DELTA=m
 # CONFIG_AD7291 is not set
 # CONFIG_AD7298 is not set
 # CONFIG_AD7476 is not set
+# CONFIG_AD7766 is not set
 # CONFIG_AD7791 is not set
 # CONFIG_AD7793 is not set
 # CONFIG_AD7887 is not set
 # CONFIG_AD7923 is not set
 # CONFIG_AD799X is not set
 # CONFIG_CC10001_ADC is not set
+# CONFIG_ENVELOPE_DETECTOR is not set
 # CONFIG_HI8435 is not set
+# CONFIG_HX711 is not set
 # CONFIG_INA2XX_ADC is not set
+# CONFIG_LTC2471 is not set
+# CONFIG_LTC2485 is not set
+# CONFIG_LTC2497 is not set
 # CONFIG_MAX1027 is not set
+# CONFIG_MAX11100 is not set
+# CONFIG_MAX1118 is not set
 # CONFIG_MAX1363 is not set
+# CONFIG_MAX9611 is not set
 # CONFIG_MCP320X is not set
 # CONFIG_MCP3422 is not set
 # CONFIG_NAU7802 is not set
 # CONFIG_TI_ADC081C is not set
 # CONFIG_TI_ADC0832 is not set
+# CONFIG_TI_ADC084S021 is not set
+# CONFIG_TI_ADC12138 is not set
+# CONFIG_TI_ADC108S102 is not set
 # CONFIG_TI_ADC128S052 is not set
+# CONFIG_TI_ADC161S626 is not set
 # CONFIG_TI_ADS1015 is not set
+# CONFIG_TI_ADS7950 is not set
 # CONFIG_TI_ADS8688 is not set
+# CONFIG_TI_TLC4541 is not set
 # CONFIG_VF610_ADC is not set
 
 #
@@ -5910,8 +6383,10 @@ CONFIG_AD_SIGMA_DELTA=m
 # Chemical Sensors
 #
 # CONFIG_ATLAS_PH_SENSOR is not set
+# CONFIG_CCS811 is not set
 # CONFIG_IAQCORE is not set
 # CONFIG_VZ89X is not set
+# CONFIG_IIO_CROS_EC_SENSORS_CORE is not set
 
 #
 # Hid Sensor IIO Common
@@ -5929,6 +6404,10 @@ CONFIG_IIO_ST_SENSORS_I2C=m
 CONFIG_IIO_ST_SENSORS_SPI=m
 CONFIG_IIO_ST_SENSORS_CORE=m
 
+#
+# Counters
+#
+
 #
 # Digital to analog converters
 #
@@ -5942,12 +6421,15 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_AD5593R is not set
 # CONFIG_AD5504 is not set
 # CONFIG_AD5624R_SPI is not set
+# CONFIG_LTC2632 is not set
 # CONFIG_AD5686 is not set
 # CONFIG_AD5755 is not set
 # CONFIG_AD5761 is not set
 # CONFIG_AD5764 is not set
 # CONFIG_AD5791 is not set
 # CONFIG_AD7303 is not set
+# CONFIG_AD8801 is not set
+# CONFIG_DPOT_DAC is not set
 # CONFIG_M62332 is not set
 # CONFIG_MAX517 is not set
 # CONFIG_MAX5821 is not set
@@ -5985,6 +6467,7 @@ CONFIG_BMG160=m
 CONFIG_BMG160_I2C=m
 CONFIG_BMG160_SPI=m
 CONFIG_HID_SENSOR_GYRO_3D=m
+# CONFIG_MPU3050_I2C is not set
 CONFIG_IIO_ST_GYRO_3AXIS=m
 CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
 CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
@@ -6000,6 +6483,7 @@ CONFIG_ITG3200=m
 # CONFIG_AFE4403 is not set
 # CONFIG_AFE4404 is not set
 # CONFIG_MAX30100 is not set
+# CONFIG_MAX30102 is not set
 
 #
 # Humidity sensors
@@ -6007,6 +6491,8 @@ CONFIG_ITG3200=m
 # CONFIG_AM2315 is not set
 CONFIG_DHT11=m
 CONFIG_HDC100X=m
+# CONFIG_HID_SENSOR_HUMIDITY is not set
+# CONFIG_HTS221 is not set
 CONFIG_HTU21=m
 CONFIG_SI7005=m
 CONFIG_SI7020=m
@@ -6021,6 +6507,7 @@ CONFIG_ADIS16480=m
 CONFIG_KMX61=m
 # CONFIG_INV_MPU6050_I2C is not set
 # CONFIG_INV_MPU6050_SPI is not set
+# CONFIG_IIO_ST_LSM6DSX is not set
 CONFIG_IIO_ADIS_LIB=m
 CONFIG_IIO_ADIS_LIB_BUFFER=y
 
@@ -6037,8 +6524,11 @@ CONFIG_BH1750=m
 CONFIG_CM32181=m
 CONFIG_CM3232=m
 CONFIG_CM3323=m
+# CONFIG_CM3605 is not set
 CONFIG_CM36651=m
 CONFIG_GP2AP020A00F=m
+CONFIG_SENSORS_ISL29018=m
+CONFIG_SENSORS_ISL29028=m
 CONFIG_ISL29125=m
 CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_PROX=m
@@ -6049,18 +6539,22 @@ CONFIG_LTR501=m
 # CONFIG_MAX44000 is not set
 CONFIG_OPT3001=m
 CONFIG_PA12203001=m
+# CONFIG_SI1145 is not set
 CONFIG_STK3310=m
 CONFIG_TCS3414=m
 CONFIG_TCS3472=m
 CONFIG_SENSORS_TSL2563=m
+CONFIG_TSL2583=m
 CONFIG_TSL4531=m
 CONFIG_US5182D=m
 CONFIG_VCNL4000=m
 # CONFIG_VEML6070 is not set
+# CONFIG_VL6180 is not set
 
 #
 # Magnetometer sensors
 #
+# CONFIG_AK8974 is not set
 CONFIG_AK8975=m
 CONFIG_AK09911=m
 # CONFIG_BMC150_MAGN_I2C is not set
@@ -6075,6 +6569,11 @@ CONFIG_SENSORS_HMC5843=m
 CONFIG_SENSORS_HMC5843_I2C=m
 CONFIG_SENSORS_HMC5843_SPI=m
 
+#
+# Multiplexers
+#
+# CONFIG_IIO_MUX is not set
+
 #
 # Inclinometer sensors
 #
@@ -6091,14 +6590,22 @@ CONFIG_IIO_SYSFS_TRIGGER=m
 # Digital potentiometers
 #
 # CONFIG_DS1803 is not set
+# CONFIG_MAX5481 is not set
 # CONFIG_MAX5487 is not set
 # CONFIG_MCP4131 is not set
 # CONFIG_MCP4531 is not set
 # CONFIG_TPL0102 is not set
 
+#
+# Digital potentiostats
+#
+# CONFIG_LMP91000 is not set
+
 #
 # Pressure sensors
 #
+# CONFIG_ABP060MG is not set
+# CONFIG_BMP280 is not set
 CONFIG_HID_SENSOR_PRESS=m
 # CONFIG_HP03 is not set
 # CONFIG_MPL115_I2C is not set
@@ -6113,6 +6620,7 @@ CONFIG_IIO_ST_PRESS_I2C=m
 CONFIG_IIO_ST_PRESS_SPI=m
 CONFIG_T5403=m
 # CONFIG_HP206C is not set
+# CONFIG_ZPA2326 is not set
 
 #
 # Lightning sensors
@@ -6120,16 +6628,21 @@ CONFIG_T5403=m
 CONFIG_AS3935=m
 
 #
-# Proximity sensors
+# Proximity and distance sensors
 #
 CONFIG_LIDAR_LITE_V2=m
+# CONFIG_SRF04 is not set
 CONFIG_SX9500=m
+# CONFIG_SRF08 is not set
 
 #
 # Temperature sensors
 #
+# CONFIG_MAXIM_THERMOCOUPLE is not set
+# CONFIG_HID_SENSOR_TEMP is not set
 CONFIG_MLX90614=m
 CONFIG_TMP006=m
+# CONFIG_TMP007 is not set
 CONFIG_TSYS01=m
 CONFIG_TSYS02D=m
 # CONFIG_NTB is not set
@@ -6147,16 +6660,29 @@ CONFIG_IRQCHIP=y
 CONFIG_ARM_GIC_MAX_NR=1
 # CONFIG_IPACK_BUS is not set
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_TI_SYSCON_RESET is not set
+# CONFIG_RESET_ATH79 is not set
+# CONFIG_RESET_BERLIN is not set
+# CONFIG_RESET_IMX7 is not set
+# CONFIG_RESET_LANTIQ is not set
+# CONFIG_RESET_LPC18XX is not set
+# CONFIG_RESET_MESON is not set
+# CONFIG_RESET_PISTACHIO is not set
+# CONFIG_RESET_SOCFPGA is not set
+# CONFIG_RESET_STM32 is not set
+# CONFIG_RESET_SUNXI is not set
+# CONFIG_RESET_TI_SYSCON is not set
+# CONFIG_RESET_ZYNQ is not set
+# CONFIG_RESET_TEGRA_BPMP is not set
 # CONFIG_FMC is not set
 
 #
 # PHY Subsystem
 #
 CONFIG_GENERIC_PHY=y
+CONFIG_BCM_KONA_USB2_PHY=m
 CONFIG_PHY_PXA_28NM_HSIC=m
 CONFIG_PHY_PXA_28NM_USB2=m
-CONFIG_BCM_KONA_USB2_PHY=m
+# CONFIG_PHY_CPCAP_USB is not set
 CONFIG_PHY_SAMSUNG_USB2=m
 # CONFIG_PHY_EXYNOS4210_USB2 is not set
 # CONFIG_PHY_EXYNOS4X12_USB2 is not set
@@ -6177,15 +6703,22 @@ CONFIG_THUNDERBOLT=m
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # CONFIG_LIBNVDIMM is not set
-CONFIG_NVMEM=m
+CONFIG_DAX=y
+CONFIG_NVMEM=y
 # CONFIG_STM is not set
 # CONFIG_INTEL_TH is not set
+# CONFIG_FPGA is not set
 
 #
-# FPGA Configuration Support
+# FSI support
 #
-# CONFIG_FPGA is not set
+# CONFIG_FSI is not set
+CONFIG_SDW=m
+CONFIG_SDW_CNL=m
+# CONFIG_SDW_MAXIM_SLAVE is not set
+CONFIG_PM_OPP=y
 
 #
 # Firmware Drivers
@@ -6208,11 +6741,19 @@ CONFIG_EFI_VARS=m
 CONFIG_EFI_ESRT=y
 CONFIG_EFI_VARS_PSTORE=m
 # CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
-CONFIG_EFI_RUNTIME_MAP=y
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_RUNTIME_WRAPPERS=y
 CONFIG_EFI_BOOTLOADER_CONTROL=m
 # CONFIG_EFI_CAPSULE_LOADER is not set
+# CONFIG_EFI_TEST is not set
+CONFIG_APPLE_PROPERTIES=y
+# CONFIG_RESET_ATTACK_MITIGATION is not set
+CONFIG_UEFI_CPER=y
+CONFIG_EFI_DEV_PATH_PARSER=y
+
+#
+# Tegra firmware driver
+#
 
 #
 # File systems
@@ -6279,10 +6820,12 @@ CONFIG_FSNOTIFY=y
 CONFIG_INOTIFY_USER=y
 # CONFIG_FANOTIFY is not set
 CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_PRINT_QUOTA_WARNING=y
 # CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
+CONFIG_QUOTA_TREE=y
 # CONFIG_QFMT_V1 is not set
+CONFIG_QFMT_V2=y
 CONFIG_QUOTACTL=y
 CONFIG_QUOTACTL_COMPAT=y
 # CONFIG_AUTOFS4_FS is not set
@@ -6331,12 +6874,14 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
-CONFIG_CONFIGFS_FS=m
+CONFIG_CONFIGFS_FS=y
 CONFIG_EFIVAR_FS=m
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ORANGEFS_FS is not set
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
+# CONFIG_ECRYPT_FS is not set
+# CONFIG_SDCARD_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set
@@ -6344,7 +6889,6 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_EFS_FS is not set
 # CONFIG_JFFS2_FS is not set
 # CONFIG_UBIFS_FS is not set
-# CONFIG_LOGFS is not set
 # CONFIG_CRAMFS is not set
 CONFIG_SQUASHFS=y
 # CONFIG_SQUASHFS_FILE_CACHE is not set
@@ -6357,6 +6901,7 @@ CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZ4=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_ZSTD is not set
 CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
@@ -6395,10 +6940,13 @@ CONFIG_SUNRPC=m
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS is not set
 # CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_UPCALL is not set
 # CONFIG_CIFS_XATTR is not set
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_SMB2 is not set
+# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
+# CONFIG_CIFS_DFS_UPCALL is not set
+# CONFIG_CIFS_SMB311 is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
@@ -6464,6 +7012,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # printk and dmesg options
 #
 CONFIG_PRINTK_TIME=y
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_BOOT_PRINTK_DELAY is not set
 CONFIG_DYNAMIC_DEBUG=y
@@ -6483,12 +7032,13 @@ CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-# CONFIG_FRAME_POINTER is not set
+CONFIG_FRAME_POINTER=y
 # CONFIG_STACK_VALIDATION is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
+CONFIG_MAGIC_SYSRQ_SERIAL=y
+CONFIG_DEBUG_KERNEL=y
 
 #
 # Memory Debugging
@@ -6497,6 +7047,7 @@ CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_PAGE_POISONING is not set
 # CONFIG_DEBUG_PAGE_REF is not set
+CONFIG_DEBUG_RODATA_TEST=y
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_DEBUG_SLAB is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
@@ -6506,6 +7057,7 @@ CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=4000
 CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_VM is not set
+CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_VIRTUAL is not set
 # CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
@@ -6522,6 +7074,9 @@ CONFIG_ARCH_HAS_KCOV=y
 # Debug Lockups and Hangs
 #
 CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+CONFIG_HARDLOCKUP_DETECTOR_PERF=y
+CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
 CONFIG_HARDLOCKUP_DETECTOR=y
 # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
@@ -6529,14 +7084,15 @@ CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
 # CONFIG_DETECT_HUNG_TASK is not set
 # CONFIG_WQ_WATCHDOG is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_ON_OOPS=y
+CONFIG_PANIC_ON_OOPS_VALUE=1
 CONFIG_PANIC_TIMEOUT=5
 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHED_INFO=y
+# CONFIG_PANIC_ON_RT_THROTTLING is not set
 CONFIG_SCHEDSTATS=y
 # CONFIG_SCHED_STACK_END_CHECK is not set
 # CONFIG_DEBUG_TIMEKEEPING is not set
-CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_PREEMPT is not set
 
 #
@@ -6552,19 +7108,21 @@ CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
+# CONFIG_WW_MUTEX_SELFTEST is not set
 CONFIG_STACKTRACE=y
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_PI_LIST is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
+CONFIG_DEBUG_CREDENTIALS=y
 
 #
 # RCU Debugging
 #
 # CONFIG_PROVE_RCU is not set
-# CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_TORTURE_TEST is not set
 # CONFIG_RCU_PERF_TEST is not set
 # CONFIG_RCU_TORTURE_TEST is not set
@@ -6577,13 +7135,10 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_NOTIFIER_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
-CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
@@ -6604,6 +7159,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_PREEMPT_TRACER is not set
 # CONFIG_SCHED_TRACER is not set
+# CONFIG_HWLAT_TRACER is not set
 # CONFIG_FTRACE_SYSCALLS is not set
 # CONFIG_TRACER_SNAPSHOT is not set
 CONFIG_BRANCH_PROFILE_NONE=y
@@ -6611,8 +7167,8 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ALL_BRANCHES is not set
 # CONFIG_STACK_TRACER is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_UPROBE_EVENT is not set
-# CONFIG_PROBE_EVENTS is not set
+CONFIG_UPROBE_EVENTS=y
+CONFIG_PROBE_EVENTS=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
 # CONFIG_FUNCTION_PROFILER is not set
@@ -6623,14 +7179,17 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_TRACEPOINT_BENCHMARK is not set
 # CONFIG_RING_BUFFER_BENCHMARK is not set
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_TRACE_ENUM_MAP_FILE is not set
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
 CONFIG_TRACING_EVENTS_GPIO=y
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_DMA_API_DEBUG is not set
 
 #
 # Runtime Testing
 #
 # CONFIG_LKDTM is not set
 # CONFIG_TEST_LIST_SORT is not set
+# CONFIG_TEST_SORT is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
@@ -6644,33 +7203,32 @@ CONFIG_TRACING_EVENTS_GPIO=y
 # CONFIG_TEST_UUID is not set
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_TEST_HASH is not set
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_DMA_API_DEBUG is not set
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
 # CONFIG_TEST_FIRMWARE is not set
+# CONFIG_TEST_SYSCTL is not set
 # CONFIG_TEST_UDELAY is not set
-# CONFIG_MEMTEST is not set
 # CONFIG_TEST_STATIC_KEYS is not set
+# CONFIG_TEST_KMOD is not set
+# CONFIG_MEMTEST is not set
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+# CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set
 # CONFIG_UBSAN is not set
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
-# CONFIG_IO_STRICT_DEVMEM is not set
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
 # CONFIG_EARLY_PRINTK_EFI is not set
+# CONFIG_EARLY_PRINTK_USB_XDBC is not set
 # CONFIG_X86_PTDUMP_CORE is not set
 # CONFIG_X86_PTDUMP is not set
 # CONFIG_EFI_PGT_DUMP is not set
-CONFIG_DEBUG_RODATA_TEST=y
 # CONFIG_DEBUG_WX is not set
-# CONFIG_DEBUG_SET_MODULE_RONX is not set
-# CONFIG_DEBUG_NX_TEST is not set
 CONFIG_DOUBLEFAULT=y
 # CONFIG_DEBUG_TLBFLUSH is not set
 # CONFIG_IOMMU_STRESS is not set
@@ -6691,26 +7249,53 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DEBUG_NMI_SELFTEST is not set
 CONFIG_X86_DEBUG_FPU=y
 # CONFIG_PUNIT_ATOM_DEBUG is not set
+CONFIG_FRAME_POINTER_UNWINDER=y
+# CONFIG_ORC_UNWINDER is not set
+# CONFIG_GUESS_UNWINDER is not set
 
 #
 # Security options
 #
 CONFIG_KEYS=y
+CONFIG_KEYS_COMPAT=y
+# CONFIG_PERSISTENT_KEYRINGS is not set
+# CONFIG_BIG_KEYS is not set
+# CONFIG_ENCRYPTED_KEYS is not set
+# CONFIG_KEY_DH_OPERATIONS is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_SECURITY_WRITABLE_HOOKS=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_PATH=y
 CONFIG_LSM_MMAP_MIN_ADDR=65536
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y
+CONFIG_HARDENED_USERCOPY=y
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
+# CONFIG_FORTIFY_SOURCE is not set
+# CONFIG_STATIC_USERMODEHELPER is not set
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
+CONFIG_SECURITY_SELINUX_DISABLE=y
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 # CONFIG_SECURITY_SMACK is not set
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_SECURITY_LOADPIN is not set
+# CONFIG_SECURITY_YAMA is not set
 CONFIG_INTEGRITY=y
+# CONFIG_INTEGRITY_SIGNATURE is not set
 CONFIG_INTEGRITY_AUDIT=y
 # CONFIG_IMA is not set
 # CONFIG_EVM is not set
+CONFIG_DEFAULT_SECURITY_SELINUX=y
+# CONFIG_DEFAULT_SECURITY_DAC is not set
+CONFIG_DEFAULT_SECURITY="selinux"
 CONFIG_XOR_BLOCKS=m
 CONFIG_CRYPTO=y
 
@@ -6729,10 +7314,12 @@ CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
-# CONFIG_CRYPTO_RSA is not set
+CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_RSA=y
 # CONFIG_CRYPTO_DH is not set
-# CONFIG_CRYPTO_ECDH is not set
+CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 # CONFIG_CRYPTO_USER is not set
@@ -6747,6 +7334,7 @@ CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_ABLK_HELPER=y
+CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_GLUE_HELPER_X86=y
 
 #
@@ -6814,6 +7402,7 @@ CONFIG_CRYPTO_WP512=m
 # Ciphers
 #
 CONFIG_CRYPTO_AES=y
+# CONFIG_CRYPTO_AES_TI is not set
 CONFIG_CRYPTO_AES_X86_64=y
 CONFIG_CRYPTO_AES_NI_INTEL=y
 CONFIG_CRYPTO_ANUBIS=m
@@ -6874,11 +7463,24 @@ CONFIG_CRYPTO_USER_API_HASH=m
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 # CONFIG_CRYPTO_USER_API_RNG is not set
 # CONFIG_CRYPTO_USER_API_AEAD is not set
+CONFIG_CRYPTO_HASH_INFO=y
 # CONFIG_CRYPTO_HW is not set
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
 
 #
 # Certificates for signature checking
 #
+CONFIG_MODULE_SIG_KEY="certs/signing_key.pem"
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
+# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
 CONFIG_HAVE_KVM=y
 # CONFIG_VIRTUALIZATION is not set
 CONFIG_BINARY_PRINTF=y
@@ -6909,15 +7511,20 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SLICEBY4 is not set
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
+# CONFIG_CRC4 is not set
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=y
-# CONFIG_CRC8 is not set
+CONFIG_CRC8=y
+CONFIG_XXHASH=m
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
 # CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_COMPRESS=m
 CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMPRESS=m
+CONFIG_ZSTD_DECOMPRESS=m
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
@@ -6937,19 +7544,24 @@ CONFIG_TEXTSEARCH_KMP=y
 CONFIG_TEXTSEARCH_BM=y
 CONFIG_TEXTSEARCH_FSM=y
 CONFIG_INTERVAL_TREE=y
+CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
+# CONFIG_DMA_NOOP_OPS is not set
+# CONFIG_DMA_VIRT_OPS is not set
 CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
 CONFIG_GLOB=y
 # CONFIG_GLOB_SELFTEST is not set
 CONFIG_NLATTR=y
-CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+CONFIG_CLZ_TAB=y
 CONFIG_CORDIC=m
 # CONFIG_DDR is not set
 # CONFIG_IRQ_POLL is not set
+CONFIG_MPILIB=y
+CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
 CONFIG_FONT_SUPPORT=y
 CONFIG_FONTS=y
@@ -6961,152 +7573,14 @@ CONFIG_FONT_8x16=y
 # CONFIG_FONT_ACORN_8x8 is not set
 # CONFIG_FONT_MINI_4x6 is not set
 # CONFIG_FONT_6x10 is not set
+# CONFIG_FONT_10x18 is not set
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
 CONFIG_FONT_AUTOSELECT=y
 # CONFIG_SG_SPLIT is not set
 CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_ARCH_HAS_PMEM_API=y
-CONFIG_ARCH_HAS_MMIO_FLUSH=y
-
-
-CONFIG_LOCALVERSION="-android_ia_64"
-CONFIG_DEFAULT_HOSTNAME="android_ia_64"
-CONFIG_SYNC_FILE=y
-CONFIG_SYNC=y
-CONFIG_SW_SYNC=y
-CONFIG_SW_SYNC_USER=y
-CONFIG_DEFAULT_SECURITY_SELINUX=y
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_DEFAULT_SECURITY="selinux"
-CONFIG_SECURITY_SELINUX=y
-CONFIG_SECURITY_PATH=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM=y
-CONFIG_SECURITY_SELINUX_DISABLE=y
-CONFIG_SECURITY_SELINUX_DEVELOP=y
-CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
-CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
-CONFIG_X86=n
-
-# Make sure kernel page tables have safe permissions.
-CONFIG_DEBUG_KERNEL=y
-
-# Blocks direct physical memory access.
-CONFIG_STRICT_DEVMEM=y
-
-# Provides some protections against SYN flooding.
-CONFIG_SYN_COOKIES=y
-
-# Perform additional validation of credentials.
-CONFIG_DEBUG_CREDENTIALS=y
-
-# Provide userspace with seccomp BPF API for syscall attack surface reduction.
-CONFIG_SECCOMP_FILTER=y
-
-# Randomize allocator freelists.
-CONFIG_SLAB_FREELIST_RANDOM=y
-
-# Allow allocator validation checking to be enabled.
-CONFIG_SLUB_DEBUG=y
-
-# Dangerous; allows direct physical memory writing.
-# CONFIG_ACPI_CUSTOM_METHOD is not set
-
-# Dangerous; disables brk ASLR.
-# CONFIG_COMPAT_BRK is not set
-
-# Dangerous; disables VDSO ASLR.
-# CONFIG_COMPAT_VDSO is not set
-
-# Dangerous; allows replacement of running kernel.
-# CONFIG_KEXEC is not set
-
-# Dangerous; allows replacement of running kernel.
-# CONFIG_HIBERNATION is not set
-
-# Prior to v4.1, assists heap memory attacks; best to keep interface disabled.
-CONFIG_INET_DIAG=y
-
-# Easily confused by misconfigured userspace, keep off.
-# CONFIG_BINFMT_MISC is not set
-
-# Reboot devices immediately if kernel experiences an Oops.
-CONFIG_PANIC_ON_OOPS=y
-
-# Disallow allocating the first 64k of memory.
-CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
-
-# Randomize position of kernel and memory.
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_RANDOMIZE_MEMORY=y
-
-# Perform usercopy bounds checking.
-CONFIG_HARDENED_USERCOPY=y
-
-# Use -fstack-protector-strong (gcc 4.9+) for best stack canary coverage.
-CONFIG_CC_STACKPROTECTOR=y
-CONFIG_CC_STACKPROTECTOR_STRONG=y
-
-CONFIG_SECURITY=y
-# CONFIG_SECURITY_YAMA is not set
-
-# If we build using modules, they must be signed with a per-build key.
-CONFIG_MODULE_SIG=y
-CONFIG_MODULE_SIG_FORCE=y
-CONFIG_MODULE_SIG_ALL=y
-CONFIG_MODULE_SIG_SHA512=y
-CONFIG_MODULE_SIG_HASH="sha512"
-CONFIG_MODULE_SIG_KEY="certs/signing_key.pem"
-
-#
-# Trusty
-#
-CONFIG_TRUSTY=y
-CONFIG_TRUSTY_LOG=y
-CONFIG_TRUSTY_VIRTIO=y
-CONFIG_TRUSTY_VIRTIO_IPC=y
-
-## Android recommended configs
-CONFIG_ANDROID_TIMED_GPIO=y
-CONFIG_ARM_KERNMEM_PERMS=y
-CONFIG_ARM64_SW_TTBR0_PAN=y
-CONFIG_CPU_SW_DOMAIN_PAN=y
-CONFIG_ENABLE_DEFAULT_TRACERS=y
-CONFIG_INPUT_GPIO=y
-CONFIG_INPUT_KEYCHORD=y
-CONFIG_INPUT_KEYRESET=y
-CONFIG_ION=y
-CONFIG_PM_RUNTIME=y
-CONFIG_SUSPEND_TIME=y
-CONFIG_MEMORY_STATE_TIME=y
-
-## Android base configs
-CONFIG_ARMV8_DEPRECATED=y
-CONFIG_CP15_BARRIER_EMULATION=y
-CONFIG_IPV6_PRIVACY=y
-CONFIG_NETFILTER_TPROXY=y
-CONFIG_NETFILTER_XT_MATCH_QTAGUID=y
-CONFIG_NETFILTER_XT_MATCH_QUOTA2=y
-CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y
-CONFIG_PPPOLAC=y
-CONFIG_PPPOPNS=y
-CONFIG_QFMT_V2=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
-CONFIG_SETEND_EMULATION=y
-CONFIG_SWP_EMULATION=y
-CONFIG_UID_SYS_STATS=y
-CONFIG_USB_CONFIGFS_F_MTP=y
-CONFIG_USB_CONFIGFS_F_PTP=y
-CONFIG_USB_CONFIGFS_F_ACC=y
-CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
-CONFIG_USB_CONFIGFS_UEVENT=y
-CONFIG_USB_CONFIGFS_F_MIDI=y
-CONFIG_USB_OTG_WAKELOCK=y
-CONFIG_USB_CONFIGFS_RNDIS=y
-CONFIG_BXT_WC_PMIC_OPREGION=y
-
-CONFIG_CRC8=y
+CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
+CONFIG_SBITMAP=y
+# CONFIG_STRING_SELFTEST is not set

From 12d59799e9faf89a137b98419a84cda3073b8975 Mon Sep 17 00:00:00 2001
From: saranya <saranya.gopal@intel.com>
Date: Tue, 13 Feb 2018 13:17:20 +0530
Subject: [PATCH 204/427] HID-MULTITOUCH: Enable multitouch driver for
 android-ia

Jira: None
Test: None

Signed-off-by: saranya <saranya.gopal@intel.com>
---
 kernel_config/kernel_64_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index fc4ac9016..87e60fd70 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -5253,7 +5253,7 @@ CONFIG_HID_MAGICMOUSE=m
 # CONFIG_HID_MAYFLASH is not set
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
-CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_MULTITOUCH=y
 # CONFIG_HID_NTI is not set
 CONFIG_HID_NTRIG=m
 CONFIG_HID_ORTEK=m

From 73601e3693ba69d7ec05961fa98d57926b5ac9a8 Mon Sep 17 00:00:00 2001
From: Aiswarya Cyriac <aiswarya.cyriac@intel.com>
Date: Tue, 30 Jan 2018 16:13:15 +0530
Subject: [PATCH 205/427] [REVERTME] Add changes for BT module load

Jira: None
Test: None

Signed-off-by: Aiswarya Cyriac <aiswarya.cyriac@intel.com>
---
 sepolicy/bluetooth/intel/file_contexts        |  1 +
 sepolicy/bluetooth/intel/hal_bluetooth_ia.te  | 51 +++++++++++++++++++
 sepolicy/bluetooth/intel/hal_bluetooth_icl.te | 51 +++++++++++++++++++
 3 files changed, 103 insertions(+)
 create mode 100644 sepolicy/bluetooth/intel/file_contexts
 create mode 100644 sepolicy/bluetooth/intel/hal_bluetooth_ia.te
 create mode 100644 sepolicy/bluetooth/intel/hal_bluetooth_icl.te

diff --git a/sepolicy/bluetooth/intel/file_contexts b/sepolicy/bluetooth/intel/file_contexts
new file mode 100644
index 000000000..3b02413c3
--- /dev/null
+++ b/sepolicy/bluetooth/intel/file_contexts
@@ -0,0 +1 @@
+/vendor/bin/hw/android\.hardware\.bluetooth@1\.0-service u:object_r:hal_bluetooth_ia_exec:s0
diff --git a/sepolicy/bluetooth/intel/hal_bluetooth_ia.te b/sepolicy/bluetooth/intel/hal_bluetooth_ia.te
new file mode 100644
index 000000000..8a30046b0
--- /dev/null
+++ b/sepolicy/bluetooth/intel/hal_bluetooth_ia.te
@@ -0,0 +1,51 @@
+# For treble mode, the HAL is loaded by a excutable hal service, and
+# framework need request the hal service if it want to operate the
+# device by HAL.
+# For bluetooth, the default hal service is created by Google named
+# android.hardware.bluetooth@1.0-service
+# Google also setup sepolicy types and rules for the hal services, and
+# android.hardware.bluetooth@1.0-service is one of hal services.
+# The sepolicy type and rules for the hal services are created by Google
+# and locate at system/sepolicy/vendor/hal_xxx.te
+# For bluetooth it is hal_bluetooth_default.te, and the content of this
+# file is
+#
+#
+#    type hal_bluetooth_default, domain;
+#    hal_server_domain(hal_bluetooth_default, hal_bluetooth)
+#
+#    type hal_bluetooth_default_exec, exec_type, file_type;
+#    init_daemon_domain(hal_bluetooth_default)
+#
+#    # Logging for backward compatibility
+#    allow hal_bluetooth_default bluetooth_data_file:dir ra_dir_perms;
+#    allow hal_bluetooth_default bluetooth_data_file:file create_file_perms;
+#
+# Google allow vendor to write his own hal service, but do not suggest
+# directly modify the default hal service code. Google also give the reference
+# code(device/linaro/hikey/bluetooth) about how to write vendor's own hal
+# service.
+# For gordon peak, bluetooth hal service need to be changed because some
+# message handling difference with Google's default one. Then the bluetooth
+# hal service for gordon peak is created based on default one.
+# The sepolicy types and rules for gordon peak bluetooth service needs to be
+# created too based on the default one.
+# The following setting are copied from hal_bluetooth_default.te except use
+# extension "gordon_peak" to replace "default".
+
+type hal_bluetooth_ia, domain;
+hal_server_domain(hal_bluetooth_ia, hal_bluetooth)
+
+type hal_bluetooth_ia_exec, exec_type, file_type, vendor_file_type;
+init_daemon_domain(hal_bluetooth_ia)
+
+# Logging for backward compatibility
+allow hal_bluetooth_ia bluetooth_data_file:dir ra_dir_perms;
+allow hal_bluetooth_ia bluetooth_data_file:file create_file_perms;
+
+allow hal_bluetooth_ia self:socket create_socket_perms;
+
+allowxperm hal_bluetooth_ia self:socket ioctl {
+  unpriv_sock_ioctls
+  HCIDEVDOWN
+};
diff --git a/sepolicy/bluetooth/intel/hal_bluetooth_icl.te b/sepolicy/bluetooth/intel/hal_bluetooth_icl.te
new file mode 100644
index 000000000..58a22d74f
--- /dev/null
+++ b/sepolicy/bluetooth/intel/hal_bluetooth_icl.te
@@ -0,0 +1,51 @@
+# For treble mode, the HAL is loaded by a excutable hal service, and
+# framework need request the hal service if it want to operate the
+# device by HAL.
+# For bluetooth, the default hal service is created by Google named
+# android.hardware.bluetooth@1.0-service
+# Google also setup sepolicy types and rules for the hal services, and
+# android.hardware.bluetooth@1.0-service is one of hal services.
+# The sepolicy type and rules for the hal services are created by Google
+# and locate at system/sepolicy/vendor/hal_xxx.te
+# For bluetooth it is hal_bluetooth_default.te, and the content of this
+# file is
+#
+#
+#    type hal_bluetooth_default, domain;
+#    hal_server_domain(hal_bluetooth_default, hal_bluetooth)
+#
+#    type hal_bluetooth_default_exec, exec_type, file_type;
+#    init_daemon_domain(hal_bluetooth_default)
+#
+#    # Logging for backward compatibility
+#    allow hal_bluetooth_default bluetooth_data_file:dir ra_dir_perms;
+#    allow hal_bluetooth_default bluetooth_data_file:file create_file_perms;
+#
+# Google allow vendor to write his own hal service, but do not suggest
+# directly modify the default hal service code. Google also give the reference
+# code(device/linaro/hikey/bluetooth) about how to write vendor's own hal
+# service.
+# For gordon peak, bluetooth hal service need to be changed because some
+# message handling difference with Google's default one. Then the bluetooth
+# hal service for gordon peak is created based on default one.
+# The sepolicy types and rules for gordon peak bluetooth service needs to be
+# created too based on the default one.
+# The following setting are copied from hal_bluetooth_default.te except use
+# extension "gordon_peak" to replace "default".
+
+type hal_bluetooth_icl, domain;
+hal_server_domain(hal_bluetooth_icl, hal_bluetooth)
+
+type hal_bluetooth_icl_exec, exec_type, file_type, vendor_file_type;
+init_daemon_domain(hal_bluetooth_icl)
+
+# Logging for backward compatibility
+allow hal_bluetooth_icl bluetooth_data_file:dir ra_dir_perms;
+allow hal_bluetooth_icl bluetooth_data_file:file create_file_perms;
+
+allow hal_bluetooth_icl self:socket create_socket_perms;
+
+allowxperm hal_bluetooth_icl self:socket ioctl {
+  unpriv_sock_ioctls
+  HCIDEVDOWN
+};

From 9fbb5f131c8a405de0959c39794b9c3e9c205e2e Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 15 Feb 2018 14:54:29 +0530
Subject: [PATCH 206/427] [AIA-O] Enable BT Mixinup

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/BoardConfig.mk | 2 +-
 androidia_64/device.mk      | 2 +-
 androidia_64/init.rc        | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 8e07c113c..3edf4ac4f 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -113,7 +113,7 @@ BOARD_HAVE_BLUETOOTH_LINUX := true
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/intel/common/bluetooth/bcm43241/
 DEVICE_PACKAGE_OVERLAYS += device/intel/common/bluetooth/overlay-bt-pan
 BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/bluetooth/common \
-                       device/intel/android_ia/sepolicy/bluetooth/btusb
+                       device/intel/android_ia/sepolicy/bluetooth/intel
 ##############################################################
 # Source: device/intel/mixins/groups/disk-bus/auto/BoardConfig.mk
 ##############################################################
diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 47fa78ca0..7c621c997 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -296,7 +296,7 @@ $(call inherit-product,device/intel/android_ia/common/firmware.mk)
 ##############################################################
 PRODUCT_PACKAGES += \
     audio.a2dp.default \
-		ath3k-1.fw \
+    ath3k-1.fw
 
 PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \
 		frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 83edb4b23..5cefa0c18 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -442,6 +442,14 @@ service dhcpcd_bt-pan /system/bin/dhcpcd -ABKL
 service iprenew_bt-pan /system/bin/dhcpcd -n
     disabled
     oneshot
+
+on post-fs
+    insmod /vendor/lib/modules/kernel/crypto/ecdh_generic.ko
+    insmod /vendor/lib/modules/kernel/net/bluetooth/bluetooth.ko
+    insmod /vendor/lib/modules/kernel/drivers/bluetooth/btintel.ko
+    insmod /vendor/lib/modules/kernel/drivers/bluetooth/btbcm.ko
+    insmod /vendor/lib/modules/kernel/drivers/bluetooth/btrtl.ko
+    insmod /vendor/lib/modules/kernel/drivers/bluetooth/btusb.ko
 ##############################################################
 # Source: device/intel/mixins/groups/factory-partition/true/init.rc
 ##############################################################

From f12fecb1e826cb6b8e913c76cbd43ff18e12561d Mon Sep 17 00:00:00 2001
From: saranya <saranya.gopal@intel.com>
Date: Tue, 13 Feb 2018 13:21:08 +0530
Subject: [PATCH 207/427] [AIA-O] mixins.spec: Specify galax7200 as TouchScreen

This patch specifies galax7200 as TouchScreen
for android-ia.

Jira: None
Test: None

Signed-off-by: saranya <saranya.gopal@intel.com>
---
 androidia_64/mixins.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index 346a3fbaa..36a4029c8 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -45,5 +45,6 @@ slcan: default
 ioc-slcan-reboot: false
 camera: usbcamera
 memtrack: true
+touch: galax7200
 avb: true
 slot-ab: true

From be3203a63361b4745059ead752208bf310498a29 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Fri, 23 Feb 2018 09:16:23 +0530
Subject: [PATCH 208/427] [AIA-O] Touch screen mixinup

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/device.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 7c621c997..4e9b0b34a 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -546,6 +546,12 @@ PRODUCT_PACKAGES += \
 	android.hardware.memtrack@1.0-service \
 	android.hardware.memtrack@1.0-impl
 ##############################################################
+# Source: device/intel/mixins/groups/touch/galax7200/product.mk
+##############################################################
+PRODUCT_COPY_FILES += \
+        frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:vendor/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml\
+        device/intel/common/touch/Vendor_0eef_Product_7200.idc:system/usr/idc/Vendor_0eef_Product_7200.idc
+##############################################################
 # Source: device/intel/mixins/groups/debug-kernel/default/product.mk
 ##############################################################
 ifneq ($(TARGET_BUILD_VARIANT),user)

From 8a54323a56d877e7af714de402ff615b982d91bc Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Mon, 26 Feb 2018 17:00:05 +0530
Subject: [PATCH 209/427] [AIA-O] Mixinup ethernet

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/init.rc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 5cefa0c18..f65ce7b48 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -163,6 +163,11 @@ service iprenew_eth0 /system/bin/dhcpcd -n
     class main
     disabled
     oneshot
+
+on post-fs
+    insmod /vendor/lib/modules/kernel/drivers/pps/pps_core.ko
+    insmod /vendor/lib/modules/kernel/drivers/ptp/ptp.ko
+    insmod /vendor/lib/modules/kernel/drivers/net/ethernet/intel/e1000e/e1000e.ko
 ##############################################################
 # Source: device/intel/mixins/groups/debugfs/default/init.rc
 ##############################################################

From 4fff45d56a1348a2a5af369f97d8c80b48d6fe74 Mon Sep 17 00:00:00 2001
From: "K, Gururaj" <gururaj.k@intel.com>
Date: Mon, 5 Mar 2018 11:28:33 +0530
Subject: [PATCH 210/427] [AIA-O] Mixinup usb-ethernet

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/init.rc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index f65ce7b48..a30b62145 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -168,6 +168,12 @@ on post-fs
     insmod /vendor/lib/modules/kernel/drivers/pps/pps_core.ko
     insmod /vendor/lib/modules/kernel/drivers/ptp/ptp.ko
     insmod /vendor/lib/modules/kernel/drivers/net/ethernet/intel/e1000e/e1000e.ko
+
+on post-fs
+    insmod /vendor/lib/modules/kernel/drivers/net/mii.ko
+    insmod /vendor/lib/modules/kernel/drivers/net/phy/libphy.ko
+    insmod /vendor/lib/modules/kernel/drivers/net/usb/usbnet.ko
+    insmod /vendor/lib/modules/kernel/drivers/net/usb/asix.ko
 ##############################################################
 # Source: device/intel/mixins/groups/debugfs/default/init.rc
 ##############################################################

From 874beb521e56f73d9dbb2f1934eb20c14b91d966 Mon Sep 17 00:00:00 2001
From: "K, Gururaj" <gururaj.k@intel.com>
Date: Mon, 5 Mar 2018 11:47:24 +0530
Subject: [PATCH 211/427] [AIA-O] Mixinup usb-serial

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/init.rc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index a30b62145..4958b4c63 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -565,6 +565,10 @@ on boot
 
 on charger
     write /sys/devices/pci0000\:00/0000\:00\:14.0/power/control auto
+
+on post-fs
+   insmod /vendor/lib/modules/kernel/drivers/usb/serial/usbserial.ko
+   insmod /vendor/lib/modules/kernel/drivers/usb/serial/pl2303.ko
 ##############################################################
 # Source: device/intel/mixins/groups/thermal/dptf/init.rc
 ##############################################################

From 12aaac68054f77c21d08ad71946f2369ed87c56e Mon Sep 17 00:00:00 2001
From: Priya Shree <priya.shree@intel.com>
Date: Thu, 22 Feb 2018 22:40:29 +0530
Subject: [PATCH 212/427] [AIA-O] To fix audio capture not happening in O MR1

Jira: None
Test: None

Signed-off-by: Priya Shree <priya.shree@intel.com>
---
 common/audio/default/mixer_paths_0.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/audio/default/mixer_paths_0.xml b/common/audio/default/mixer_paths_0.xml
index 161f6794e..1b3e866e7 100644
--- a/common/audio/default/mixer_paths_0.xml
+++ b/common/audio/default/mixer_paths_0.xml
@@ -1,6 +1,6 @@
 <mixer>
   <!-- These are the initial mixer settings -->
-  <ctl name="Master Playback Volume" value="50" />
+  <ctl name="Master Playback Volume" value="87" />
   <ctl name="Master Playback Switch" value="0" />
   <ctl name="Headphone Playback Switch" value="0 0" />
   <ctl name="Speaker Playback Switch" value="0 0" />
@@ -18,9 +18,11 @@
 
   <path name="main-mic">
     <ctl name="Capture Switch" value="1 1" />
+    <ctl name="Capture Volume" value="63 63" />
   </path>
 
   <path name="headset-mic">
     <ctl name="Capture Switch" value="1 1" />
+    <ctl name="Capture Volume" value="63 63" />
   </path>
 </mixer>

From 0b65595a677027b7bb3db670775edc93db9a3858 Mon Sep 17 00:00:00 2001
From: Priya Shree <priya.shree@intel.com>
Date: Tue, 20 Feb 2018 22:17:17 +0530
Subject: [PATCH 213/427] [AIA-O] Changes to make audio work on USB Headset on
 O MR1

Jira: None
Test: None

Signed-off-by: Priya Shree <priya.shree@intel.com>
Signed-off-by: Mirche Dinesh <dinesh.mirche@intel.com>
---
 .../policy/usb_audio_policy_configuration.xml |  8 ++
 .../Settings/device_for_input_source.pfw      | 96 ++++++++++++++++++-
 .../device_for_strategy_accessibility.pfw     | 62 +++++++++++-
 .../Settings/device_for_strategy_dtmf.pfw     | 59 ++++++++++++
 .../device_for_strategy_enforced_audible.pfw  | 37 +++++++
 .../Settings/device_for_strategy_media.pfw    | 54 +++++++++--
 .../Settings/device_for_strategy_phone.pfw    | 60 +++++++++++-
 .../device_for_strategy_rerouting.pfw         | 34 +++++++
 .../device_for_strategy_sonification.pfw      | 81 +++++++++++++---
 ...e_for_strategy_sonification_respectful.pfw | 61 +++++++++++-
 .../Structure/PolicySubsystem-CommonTypes.xml |  2 +
 .../policy_criteria.txt                       |  4 +-
 12 files changed, 525 insertions(+), 33 deletions(-)

diff --git a/common/audio/default/policy/usb_audio_policy_configuration.xml b/common/audio/default/policy/usb_audio_policy_configuration.xml
index 1630a9423..eca7aacf2 100644
--- a/common/audio/default/policy/usb_audio_policy_configuration.xml
+++ b/common/audio/default/policy/usb_audio_policy_configuration.xml
@@ -22,7 +22,9 @@
                      samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
         </mixPort>
         <mixPort name="usb_device output" role="source"/>
+        <mixPort name="usb_headset output" role="source"/>
         <mixPort name="usb_device input" role="sink"/>
+        <mixPort name="usb_headset input" role="sink"/>
     </mixPorts>
     <devicePorts>
         <devicePort tagName="USB Host Out" type="AUDIO_DEVICE_OUT_USB_ACCESSORY" role="sink">
@@ -30,14 +32,20 @@
                      samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
         </devicePort>
         <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink"/>
+        <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink"/>
         <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source"/>
+        <devicePort tagName="USB Headset In" type="AUDIO_DEVICE_IN_USB_HEADSET" role="source"/>
     </devicePorts>
     <routes>
         <route type="mix" sink="USB Host Out"
                sources="usb_accessory output"/>
         <route type="mix" sink="USB Device Out"
                sources="usb_device output"/>
+        <route type="mix" sink="USB Headset Out"
+               sources="usb_headset output"/>
         <route type="mix" sink="usb_device input"
                sources="USB Device In"/>
+        <route type="mix" sink="usb_headset input"
+               sources="USB Headset In"/>
     </routes>
 </module>
diff --git a/common/audio/reference_configurable_audio_policy/Settings/device_for_input_source.pfw b/common/audio/reference_configurable_audio_policy/Settings/device_for_input_source.pfw
index a9908798e..10c10cfd8 100644
--- a/common/audio/reference_configurable_audio_policy/Settings/device_for_input_source.pfw
+++ b/common/audio/reference_configurable_audio_policy/Settings/device_for_input_source.pfw
@@ -50,6 +50,7 @@ supDomain: DeviceForInputSource
 				dgtl_dock_headset = 0
 				usb_accessory = 0
 				usb_device = 0
+				usb_headset = 0
 				fm_tuner = 0
 				tv_tuner = 0
 				line = 0
@@ -72,6 +73,7 @@ supDomain: DeviceForInputSource
 				dgtl_dock_headset = 0
 				usb_accessory = 0
 				usb_device = 0
+				usb_headset = 0
 				fm_tuner = 0
 				tv_tuner = 0
 				line = 0
@@ -94,6 +96,7 @@ supDomain: DeviceForInputSource
 				dgtl_dock_headset = 0
 				usb_accessory = 0
 				usb_device = 0
+				usb_headset = 0
 				fm_tuner = 0
 				tv_tuner = 0
 				line = 0
@@ -115,6 +118,7 @@ supDomain: DeviceForInputSource
 				dgtl_dock_headset = 0
 				usb_accessory = 0
 				usb_device = 0
+				usb_headset = 0
 				fm_tuner = 0
 				tv_tuner = 0
 				line = 0
@@ -174,6 +178,7 @@ supDomain: DeviceForInputSource
 				dgtl_dock_headset = 0
 				usb_accessory = 0
 				usb_device = 0
+				usb_headset = 0
 				fm_tuner = 0
 				tv_tuner = 0
 				line = 0
@@ -235,6 +240,7 @@ supDomain: DeviceForInputSource
 				dgtl_dock_headset = 0
 				usb_accessory = 0
 				usb_device = 0
+				usb_headset = 0
 				tv_tuner = 0
 				line = 0
 				spdif = 0
@@ -253,12 +259,14 @@ supDomain: DeviceForInputSource
 					bluetooth_a2dp = 1
 					wired_headset = 0
 					usb_device = 0
+					usb_headset = 0
 					builtin_mic = 0
 					bluetooth_sco_headset = 0
 				component: mic/applicable_input_device/mask/
 					bluetooth_a2dp = 1
 					wired_headset = 0
 					usb_device = 0
+					usb_headset = 0 
 					builtin_mic = 0
 					bluetooth_sco_headset = 0
 
@@ -271,12 +279,14 @@ supDomain: DeviceForInputSource
 					bluetooth_a2dp = 0
 					wired_headset = 0
 					usb_device = 0
+					usb_headset = 0
 					builtin_mic = 0
 					bluetooth_sco_headset = 1
 				component: mic/applicable_input_device/mask/
 					bluetooth_a2dp = 0
 					wired_headset = 0
 					usb_device = 0
+					usb_headset = 0
 					builtin_mic = 0
 					bluetooth_sco_headset = 1
 
@@ -288,12 +298,14 @@ supDomain: DeviceForInputSource
 					bluetooth_a2dp = 0
 					wired_headset = 1
 					usb_device = 0
+					usb_headset = 0
 					builtin_mic = 0
 					bluetooth_sco_headset = 0
 				component: mic/applicable_input_device/mask/
 					bluetooth_a2dp = 0
 					wired_headset = 1
 					usb_device = 0
+					usb_headset = 0
 					builtin_mic = 0
 					bluetooth_sco_headset = 0
 
@@ -305,14 +317,35 @@ supDomain: DeviceForInputSource
 					bluetooth_a2dp = 0
 					wired_headset = 0
 					usb_device = 1
+					usb_headset = 0
 					builtin_mic = 0
 					bluetooth_sco_headset = 0
 				component: mic/applicable_input_device/mask/
 					bluetooth_a2dp = 0
 					wired_headset = 0
 					usb_device = 1
+					usb_headset = 0
 					builtin_mic = 0
 					bluetooth_sco_headset = 0
+		conf: UsbHeadset
+			AvailableInputDevices Includes UsbHeadset
+
+			component: /Policy/policy/input_sources
+				component: default/applicable_input_device/mask/
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					usb_device = 0
+					usb_headset = 1
+					builtin_mic = 0
+					bluetooth_sco_headset = 0
+				component: mic/applicable_input_device/mask/
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					usb_device = 0
+					usb_headset = 1
+					builtin_mic = 0
+					bluetooth_sco_headset = 0
+            
 
 		conf: BuiltinMic
 			AvailableInputDevices Includes BuiltinMic
@@ -322,12 +355,14 @@ supDomain: DeviceForInputSource
 					bluetooth_a2dp = 0
 					wired_headset = 0
 					usb_device = 0
+					usb_headset = 0
 					builtin_mic = 1
 					bluetooth_sco_headset = 0
 				component: mic/applicable_input_device/mask/
 					bluetooth_a2dp = 0
 					wired_headset = 0
 					usb_device = 0
+					usb_headset = 0 
 					builtin_mic = 1
 					bluetooth_sco_headset = 0
 
@@ -337,12 +372,14 @@ supDomain: DeviceForInputSource
 					bluetooth_a2dp = 0
 					wired_headset = 0
 					usb_device = 0
+					usb_headset = 0
 					builtin_mic = 0
 					bluetooth_sco_headset = 0
 				component: mic/applicable_input_device/mask/
 					bluetooth_a2dp = 0
 					wired_headset = 0
 					usb_device = 0
+					usb_headset = 0
 					builtin_mic = 0
 					bluetooth_sco_headset = 0
 
@@ -391,16 +428,19 @@ supDomain: DeviceForInputSource
 					bluetooth_sco_headset = 1
 					wired_headset = 0
 					usb_device = 0
+					usb_headset = 0
 					builtin_mic = 0
 				component: unprocessed/applicable_input_device/mask
 					bluetooth_sco_headset = 1
 					wired_headset = 0
 					usb_device = 0
+					usb_headset = 0
 					builtin_mic = 0
 				component: hotword/applicable_input_device/mask
 					bluetooth_sco_headset = 1
 					wired_headset = 0
 					usb_device = 0
+					usb_headset = 0
 					builtin_mic = 0
 
 		conf: WiredHeadset
@@ -411,16 +451,19 @@ supDomain: DeviceForInputSource
 					bluetooth_sco_headset = 0
 					wired_headset = 1
 					usb_device = 0
+					usb_headset = 0 
 					builtin_mic = 0
 				component: unprocessed/applicable_input_device/mask
 					bluetooth_sco_headset = 0
 					wired_headset = 1
 					usb_device = 0
+					usb_headset = 0
 					builtin_mic = 0
 				component: hotword/applicable_input_device/mask
 					bluetooth_sco_headset = 0
 					wired_headset = 1
-					usb_device = 0
+					usb_device  = 0
+					usb_headset = 0 
 					builtin_mic = 0
 
 		conf: UsbDevice
@@ -431,17 +474,44 @@ supDomain: DeviceForInputSource
 					bluetooth_sco_headset = 0
 					wired_headset = 0
 					usb_device = 1
+					usb_headset = 0
 					builtin_mic = 0
 				component: unprocessed/applicable_input_device/mask
 					bluetooth_sco_headset = 0
 					wired_headset = 0
 					usb_device = 1
+					usb_headset = 0
 					builtin_mic = 0
 				component: hotword/applicable_input_device/mask
 					bluetooth_sco_headset = 0
 					wired_headset = 0
 					usb_device = 1
+					usb_headset = 0
+					builtin_mic = 0
+
+		conf: UsbHeadset
+			AvailableInputDevices Includes UsbHeadset
+
+			component: /Policy/policy/input_sources
+				component: voice_recognition/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 0
+					usb_device = 0
+					usb_headset = 1
 					builtin_mic = 0
+				component: unprocessed/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 0
+					usb_device = 0
+					usb_headset = 1
+					builtin_mic = 0
+				component: hotword/applicable_input_device/mask
+					bluetooth_sco_headset = 0
+					wired_headset = 0
+					usb_device = 0
+					usb_headset = 1
+					builtin_mic = 0
+
 
 		conf: BuiltinMic
 			AvailableInputDevices Includes BuiltinMic
@@ -451,16 +521,19 @@ supDomain: DeviceForInputSource
 					bluetooth_sco_headset = 0
 					wired_headset = 0
 					usb_device = 0
+					usb_headset = 0
 					builtin_mic = 1
 				component: unprocessed/applicable_input_device/mask
 					bluetooth_sco_headset = 0
 					wired_headset = 0
 					usb_device = 0
+					usb_headset = 0
 					builtin_mic = 1
 				component: hotword/applicable_input_device/mask
 					bluetooth_sco_headset = 0
 					wired_headset = 0
 					usb_device = 0
+					usb_headset = 0
 					builtin_mic = 1
 
 		conf: Default
@@ -469,16 +542,19 @@ supDomain: DeviceForInputSource
 					bluetooth_sco_headset = 0
 					wired_headset = 0
 					usb_device = 0
+					usb_headset = 0
 					builtin_mic = 0
 				component: unprocessed/applicable_input_device/mask
 					bluetooth_sco_headset = 0
 					wired_headset = 0
 					usb_device = 0
+					usb_headset = 0
 					builtin_mic = 0
 				component: hotword/applicable_input_device/mask
 					bluetooth_sco_headset = 0
 					wired_headset = 0
 					usb_device = 0
+					usb_headset = 0
 					builtin_mic = 0
 
 	domain: VoiceCommunication
@@ -493,6 +569,7 @@ supDomain: DeviceForInputSource
 				bluetooth_sco_headset = 1
 				wired_headset = 0
 				usb_device = 0
+				usb_headset = 0
 				builtin_mic = 0
 				back_mic = 0
 
@@ -504,6 +581,7 @@ supDomain: DeviceForInputSource
 				bluetooth_sco_headset = 0
 				wired_headset = 1
 				usb_device = 0
+				usb_headset = 0
 				builtin_mic = 0
 				back_mic = 0
 
@@ -515,6 +593,19 @@ supDomain: DeviceForInputSource
 				bluetooth_sco_headset = 0
 				wired_headset = 0
 				usb_device = 1
+				usb_headset = 0
+				builtin_mic = 0
+				back_mic = 0
+       
+		conf: UsbHeadset
+			ForceUseForCommunication Is ForceNone
+			AvailableInputDevices Includes UsbHeadset
+
+			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask
+				bluetooth_sco_headset = 0
+				wired_headset = 0
+				usb_device = 0
+				usb_headset = 1
 				builtin_mic = 0
 				back_mic = 0
 
@@ -530,6 +621,7 @@ supDomain: DeviceForInputSource
 				bluetooth_sco_headset = 0
 				wired_headset = 0
 				usb_device = 0
+				usb_headset = 0
 				builtin_mic = 1
 				back_mic = 0
 
@@ -541,6 +633,7 @@ supDomain: DeviceForInputSource
 				bluetooth_sco_headset = 0
 				wired_headset = 0
 				usb_device = 0
+				usb_headset = 0
 				builtin_mic = 0
 				back_mic = 1
 
@@ -552,6 +645,7 @@ supDomain: DeviceForInputSource
 				bluetooth_sco_headset = 0
 				wired_headset = 0
 				usb_device = 0
+				usb_headset = 0
 				builtin_mic = 1
 				back_mic = 0
 
diff --git a/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_accessibility.pfw b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_accessibility.pfw
index ecd56b02f..4337fc278 100644
--- a/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_accessibility.pfw
+++ b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_accessibility.pfw
@@ -46,6 +46,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: BluetoothA2dp
@@ -74,6 +75,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: BluetoothA2dpHeadphone
@@ -102,6 +104,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: BluetoothA2dpSpeaker
@@ -130,6 +133,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: ForceSpeakerWhenNotInCall
@@ -158,6 +162,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: BluetoothScoCarkit
@@ -187,6 +192,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: BluetoothScoHeadset
@@ -216,6 +222,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: BluetoothSco
@@ -245,6 +252,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: WiredHeadphone
@@ -282,6 +290,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: Line
@@ -318,6 +327,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: WiredHeadset
@@ -355,6 +365,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: UsbDevice
@@ -375,7 +386,7 @@ supDomain: DeviceForStrategy
 						TelephonyMode IsNot InCall
 						TelephonyMode IsNot InCommunication
 						AvailableOutputDevices Excludes UsbAccessory
-						ForceUseForCommunication Is ForceSpeaker
+						ForceUseForMedia IsNot ForceSpeaker
 				AvailableOutputDevices Includes UsbDevice
 
 				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
@@ -395,6 +406,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 1
+					usb_headset = 0
 					hdmi = 0
 
 			conf: UsbAccessory
@@ -426,6 +438,48 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 1
 					usb_device = 0
+					usb_headset = 0 
+					hdmi = 0
+
+			conf: UsbHeadset
+				ANY
+					#
+					# accessibility falls through Phone strategy if in call (widely speaking)
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+					#
+					# accessibility follows Media strategy if not in call
+					# Media strategy inverts the priority of USB device vs accessory
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						AvailableOutputDevices Excludes UsbAccessory
+						ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes UsbHeadset
+
+				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_sco = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					usb_headset = 1 
 					hdmi = 0
 
 			conf: DgtlDockHeadset
@@ -456,6 +510,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 1
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: AuxDigital
@@ -486,6 +541,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 1
 
 			conf: AnlgDockHeadset
@@ -518,6 +574,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: Earpiece
@@ -547,6 +604,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: Speaker
@@ -569,6 +627,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					hdmi = 0
 
 			conf: Default
@@ -589,5 +648,6 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
diff --git a/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_dtmf.pfw b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_dtmf.pfw
index 883c741af..3f45887ea 100644
--- a/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_dtmf.pfw
+++ b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_dtmf.pfw
@@ -36,6 +36,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -64,6 +65,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -92,6 +94,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -120,6 +123,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -149,6 +153,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					telephony_tx = 0
 					line = 0
 					speaker = 1
@@ -178,6 +183,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -207,6 +213,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -244,6 +251,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -283,6 +291,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					telephony_tx = 0
 					line = 1
 					speaker = 0
@@ -320,6 +329,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -360,6 +370,48 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 1
+					usb_headset = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0
+
+			conf: UsbHeadset
+				ANY
+					#
+					# DTMF falls through Phone strategy if in call (widely speaking)
+					#
+					ALL
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+					#
+					# DTMF follows Media strategy if not in call
+					# Media strategy inverts the priority of USB device vs accessory
+					#
+					ALL
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						AvailableOutputDevices Excludes UsbAccessory
+						ForceUseForCommunication Is ForceSpeaker
+				AvailableOutputDevices Includes UsbHeadset
+
+				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					usb_headset = 1 
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -391,6 +443,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 1
 					usb_device = 0
+					usb_headset = 0 
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -421,6 +474,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 1
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -451,6 +505,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -483,6 +538,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -512,6 +568,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -550,6 +607,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 					speaker = 1
@@ -570,6 +628,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					telephony_tx = 0
 					line = 0
 					speaker = 0
diff --git a/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_enforced_audible.pfw b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_enforced_audible.pfw
index f5046319b..31a8b8c75 100644
--- a/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_enforced_audible.pfw
+++ b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_enforced_audible.pfw
@@ -78,6 +78,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 
@@ -101,6 +102,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 
@@ -124,6 +126,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 
@@ -147,6 +150,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 
@@ -170,6 +174,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 
@@ -193,6 +198,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					telephony_tx = 0
 					line = 1
 
@@ -216,6 +222,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 
@@ -239,6 +246,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 1
 					usb_device = 0
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 
@@ -262,6 +270,31 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 1
+					usb_headset = 0
+					telephony_tx = 0
+					line = 0
+
+			conf: UsbHeadset
+				ForceUseForMedia IsNot ForceSpeaker
+				AvailableOutputDevices Includes UsbHeadset
+
+				component: /Policy/policy/strategies/enforced_audible/selected_output_devices/mask
+					remote_submix = 0
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					usb_headset = 1
 					telephony_tx = 0
 					line = 0
 
@@ -285,6 +318,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 1
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 
@@ -308,6 +342,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					telephony_tx = 0
 					line = 0
 
@@ -332,6 +367,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					telephony_tx = 0
 					line = 0
 
@@ -352,6 +388,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					telephony_tx = 0
 					line = 0
 
diff --git a/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_media.pfw b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_media.pfw
index bdb6ae0f7..b71555cbe 100644
--- a/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_media.pfw
+++ b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_media.pfw
@@ -25,7 +25,8 @@ domainGroup: DeviceForStrategy
 					hdmi = 0
 					dgtl_dock_headset = 0
 					angl_dock_headset = 0
-					usb_device = 0
+					usb_device = 0 
+					usb_headset = 0
 					usb_accessory = 0
 					wired_headset = 0
 					wired_headphone = 0
@@ -45,7 +46,8 @@ domainGroup: DeviceForStrategy
 					hdmi = 0
 					dgtl_dock_headset = 0
 					angl_dock_headset = 0
-					usb_device = 0
+					usb_device = 0 
+					usb_headset = 0
 					usb_accessory = 0
 					wired_headset = 0
 					wired_headphone = 0
@@ -65,7 +67,8 @@ domainGroup: DeviceForStrategy
 					hdmi = 0
 					dgtl_dock_headset = 0
 					angl_dock_headset = 0
-					usb_device = 0
+					usb_device = 0 
+					usb_headset = 0
 					usb_accessory = 0
 					wired_headset = 0
 					wired_headphone = 0
@@ -85,7 +88,8 @@ domainGroup: DeviceForStrategy
 					hdmi = 0
 					dgtl_dock_headset = 0
 					angl_dock_headset = 0
-					usb_device = 0
+					usb_device = 0 
+					usb_headset = 0
 					usb_accessory = 0
 					wired_headset = 0
 					wired_headphone = 0
@@ -108,7 +112,8 @@ domainGroup: DeviceForStrategy
 					hdmi = 0
 					dgtl_dock_headset = 0
 					angl_dock_headset = 0
-					usb_device = 0
+					usb_device = 0 
+					usb_headset = 0
 					usb_accessory = 0
 					wired_headset = 0
 					wired_headphone = 0
@@ -126,7 +131,8 @@ domainGroup: DeviceForStrategy
 					hdmi = 0
 					dgtl_dock_headset = 0
 					angl_dock_headset = 0
-					usb_device = 0
+					usb_device = 0 
+					usb_headset = 0
 					usb_accessory = 0
 					wired_headset = 0
 					wired_headphone = 1
@@ -144,7 +150,8 @@ domainGroup: DeviceForStrategy
 					hdmi = 0
 					dgtl_dock_headset = 0
 					angl_dock_headset = 0
-					usb_device = 0
+					usb_device = 0 
+					usb_headset = 0
 					usb_accessory = 0
 					wired_headset = 0
 					wired_headphone = 0
@@ -162,7 +169,8 @@ domainGroup: DeviceForStrategy
 					hdmi = 0
 					dgtl_dock_headset = 0
 					angl_dock_headset = 0
-					usb_device = 0
+					usb_device = 0 
+					usb_headset = 0
 					usb_accessory = 0
 					wired_headset = 1
 					wired_headphone = 0
@@ -180,7 +188,8 @@ domainGroup: DeviceForStrategy
 					hdmi = 0
 					dgtl_dock_headset = 0
 					angl_dock_headset = 0
-					usb_device = 0
+					usb_device = 0 
+					usb_headset = 0
 					usb_accessory = 1
 					wired_headset = 0
 					wired_headphone = 0
@@ -199,6 +208,26 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					angl_dock_headset = 0
 					usb_device = 1
+					usb_headset = 0
+					usb_accessory = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp = 0
+					remote_submix = 0
+					line = 0
+
+			conf: UsbHeadset
+				AvailableOutputDevices Includes UsbHeadset
+
+				component: /Policy/policy/strategies/media/selected_output_devices/mask
+					speaker = 0
+					hdmi = 0
+					dgtl_dock_headset = 0
+					angl_dock_headset = 0
+					usb_device = 0 
+					usb_headset = 1
 					usb_accessory = 0
 					wired_headset = 0
 					wired_headphone = 0
@@ -217,6 +246,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 1
 					angl_dock_headset = 0
 					usb_device = 0
+					usb_headset=0 
 					usb_accessory = 0
 					wired_headset = 0
 					wired_headphone = 0
@@ -235,6 +265,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					angl_dock_headset = 0
 					usb_device = 0
+					usb_headset=0 
 					usb_accessory = 0
 					wired_headset = 0
 					wired_headphone = 0
@@ -254,6 +285,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					angl_dock_headset = 1
 					usb_device = 0
+					usb_headset=0 
 					usb_accessory = 0
 					wired_headset = 0
 					wired_headphone = 0
@@ -277,6 +309,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					angl_dock_headset = 0
 					usb_device = 0
+					usb_headset=0 
 					usb_accessory = 0
 					wired_headset = 0
 					wired_headphone = 0
@@ -292,7 +325,8 @@ domainGroup: DeviceForStrategy
 					hdmi = 0
 					dgtl_dock_headset = 0
 					angl_dock_headset = 0
-					usb_device = 0
+					usb_device = 0 
+					usb_headset = 0
 					usb_accessory = 0
 					wired_headset = 0
 					wired_headphone = 0
diff --git a/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_phone.pfw b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_phone.pfw
index d371ad9ec..35c74729f 100644
--- a/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_phone.pfw
+++ b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_phone.pfw
@@ -36,6 +36,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -59,6 +60,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -82,6 +84,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -112,6 +115,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -142,6 +146,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -172,6 +177,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -199,6 +205,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -226,6 +233,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -249,6 +257,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					telephony_tx = 0
 					line = 1
 					speaker = 0
@@ -287,6 +296,46 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 1
+					usb_headset = 0
+					telephony_tx = 0
+					line = 0
+					speaker = 0		
+                        
+			conf: UsbHeadset
+				#
+				# Fallback BT Sco devices in case of FORCE_BT_SCO
+				# or FORCE_NONE
+				#
+				AvailableOutputDevices Includes UsbHeadset
+				ANY
+					ForceUseForCommunication Is ForceBtSco
+					ForceUseForCommunication Is ForceNone
+					ALL
+						ForceUseForCommunication Is ForceSpeaker
+						#
+						# In case of Force Speaker, priority between device and accessory are
+						# inverted compared to Force None or Bt Sco
+						#
+						AvailableOutputDevices Excludes UsbAccessory
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+
+				component: /Policy/policy/strategies/phone/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					hdmi = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					usb_headset = 1
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -313,11 +362,12 @@ supDomain: DeviceForStrategy
 					hdmi = 0
 					angl_dock_headset = 0
 					dgtl_dock_headset = 0
-					usb_accessory = 0
-					usb_device = 1
+					usb_accessory = 1
+					usb_device = 0
 					telephony_tx = 0
 					line = 0
 					speaker = 0
+					usb_headset = 0
 
 			conf: DgtlDockHeadset
 				#
@@ -343,6 +393,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 1
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -371,6 +422,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -399,6 +451,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -426,6 +479,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 					speaker = 0
@@ -453,6 +507,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 					speaker = 1
@@ -476,6 +531,7 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 					speaker = 1
diff --git a/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_rerouting.pfw b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_rerouting.pfw
index 04e62f76d..b87f839c9 100644
--- a/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_rerouting.pfw
+++ b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_rerouting.pfw
@@ -38,6 +38,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: BluetoothA2dp
@@ -57,6 +58,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: BluetoothA2dpHeadphone
@@ -76,6 +78,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: BluetoothA2dpSpeaker
@@ -95,6 +98,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: ForceSpeaker
@@ -114,6 +118,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: WiredHeadphone
@@ -132,6 +137,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: Line
@@ -150,6 +156,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: WiredHeadset
@@ -168,6 +175,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: UsbAccessory
@@ -186,6 +194,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 1
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: UsbDevice
@@ -204,6 +213,26 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 1
+					usb_headset = 0
+					hdmi = 0
+
+			conf: UsbHeadset
+				AvailableOutputDevices Includes UsbHeadset
+
+				component: /Policy/policy/strategies/rerouting/selected_output_devices/mask
+					remote_submix = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					speaker = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					usb_headset = 1
 					hdmi = 0
 
 			conf: DgtlDockHeadset
@@ -222,6 +251,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 1
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: AuxDigital
@@ -243,6 +273,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 1
 
 			conf: AnlgDockHeadset
@@ -262,6 +293,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: Speaker
@@ -280,6 +312,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: Default
@@ -296,5 +329,6 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					hdmi = 0
 
diff --git a/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification.pfw b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification.pfw
index 70740d149..395504d61 100644
--- a/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification.pfw
+++ b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification.pfw
@@ -72,7 +72,8 @@ supDomain: DeviceForStrategy
 					angl_dock_headset = 0
 					dgtl_dock_headset = 0
 					usb_accessory = 0
-					usb_device = 0
+					usb_device = 0 
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 
@@ -98,7 +99,8 @@ supDomain: DeviceForStrategy
 					angl_dock_headset = 0
 					dgtl_dock_headset = 0
 					usb_accessory = 0
-					usb_device = 0
+					usb_device = 0 
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 
@@ -124,7 +126,8 @@ supDomain: DeviceForStrategy
 					angl_dock_headset = 0
 					dgtl_dock_headset = 0
 					usb_accessory = 0
-					usb_device = 0
+					usb_device = 0 
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 
@@ -151,7 +154,8 @@ supDomain: DeviceForStrategy
 					angl_dock_headset = 0
 					dgtl_dock_headset = 0
 					usb_accessory = 0
-					usb_device = 0
+					usb_device = 0 
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 
@@ -178,7 +182,8 @@ supDomain: DeviceForStrategy
 					angl_dock_headset = 0
 					dgtl_dock_headset = 0
 					usb_accessory = 0
-					usb_device = 0
+					usb_device = 0 
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 
@@ -205,7 +210,8 @@ supDomain: DeviceForStrategy
 					angl_dock_headset = 0
 					dgtl_dock_headset = 0
 					usb_accessory = 0
-					usb_device = 0
+					usb_device = 0 
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 
@@ -241,7 +247,8 @@ supDomain: DeviceForStrategy
 					angl_dock_headset = 0
 					dgtl_dock_headset = 0
 					usb_accessory = 0
-					usb_device = 0
+					usb_device = 0 
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 
@@ -279,7 +286,8 @@ supDomain: DeviceForStrategy
 					angl_dock_headset = 0
 					dgtl_dock_headset = 0
 					usb_accessory = 0
-					usb_device = 0
+					usb_device = 0 
+					usb_headset = 0
 					telephony_tx = 0
 					line = 1
 
@@ -315,7 +323,8 @@ supDomain: DeviceForStrategy
 					angl_dock_headset = 0
 					dgtl_dock_headset = 0
 					usb_accessory = 0
-					usb_device = 0
+					usb_device = 0 
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 
@@ -353,6 +362,45 @@ supDomain: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 1
+					usb_headset = 0
+					telephony_tx = 0
+					line = 0
+
+			conf: UsbHeadset
+				AvailableOutputDevices Includes UsbHeadset
+				ANY
+					#
+					# Sonification falls through media strategy if not in call (widely speaking)
+					#
+					ALL
+						AvailableOutputDevices Excludes UsbAccessory
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						ForceUseForMedia IsNot ForceSpeaker
+					ALL
+						#
+						# Sonification Follows Phone Strategy if in call (widely speaking)
+						#
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+
+				component: /Policy/policy/strategies/sonification/selected_output_devices/mask
+					earpiece = 0
+					wired_headset = 0
+					wired_headphone = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					usb_headset = 1
 					telephony_tx = 0
 					line = 0
 
@@ -381,7 +429,8 @@ supDomain: DeviceForStrategy
 					angl_dock_headset = 0
 					dgtl_dock_headset = 0
 					usb_accessory = 1
-					usb_device = 0
+					usb_device = 0 
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 
@@ -410,7 +459,8 @@ supDomain: DeviceForStrategy
 					angl_dock_headset = 0
 					dgtl_dock_headset = 1
 					usb_accessory = 0
-					usb_device = 0
+					usb_device = 0 
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 
@@ -440,7 +490,8 @@ supDomain: DeviceForStrategy
 					angl_dock_headset = 1
 					dgtl_dock_headset = 0
 					usb_accessory = 0
-					usb_device = 0
+					usb_device = 0 
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 
@@ -467,7 +518,8 @@ supDomain: DeviceForStrategy
 					angl_dock_headset = 0
 					dgtl_dock_headset = 0
 					usb_accessory = 0
-					usb_device = 0
+					usb_device = 0 
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
 
@@ -485,6 +537,7 @@ supDomain: DeviceForStrategy
 					angl_dock_headset = 0
 					dgtl_dock_headset = 0
 					usb_accessory = 0
-					usb_device = 0
+					usb_device = 0 
+					usb_headset = 0
 					telephony_tx = 0
 					line = 0
diff --git a/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification_respectful.pfw b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification_respectful.pfw
index b30aa4ca8..c9a3e309c 100644
--- a/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification_respectful.pfw
+++ b/common/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification_respectful.pfw
@@ -78,7 +78,7 @@ domainGroup: DeviceForStrategy
 				#
 				TelephonyMode IsNot InCall
 				TelephonyMode IsNot InCommunication
-				ForceUseForMedia Is ForceNoBtA2dp
+				ForceUseForMedia IsNot ForceNoBtA2dp
 				AvailableOutputDevices Includes BluetoothA2dp
 
 				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
@@ -96,6 +96,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					hdmi = 0
 
 			conf: BluetoothA2dpHeadphones
@@ -105,7 +106,7 @@ domainGroup: DeviceForStrategy
 				#
 				TelephonyMode IsNot InCall
 				TelephonyMode IsNot InCommunication
-				ForceUseForMedia Is ForceNoBtA2dp
+				ForceUseForMedia IsNot ForceNoBtA2dp
 				AvailableOutputDevices Includes BluetoothA2dpHeadphones
 
 				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
@@ -123,6 +124,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					hdmi = 0
 
 			conf: BluetoothA2dpSpeaker
@@ -132,7 +134,7 @@ domainGroup: DeviceForStrategy
 				#
 				TelephonyMode IsNot InCall
 				TelephonyMode IsNot InCommunication
-				ForceUseForMedia Is ForceNoBtA2dp
+				ForceUseForMedia IsNot ForceNoBtA2dp
 				AvailableOutputDevices Includes BluetoothA2dpSpeaker
 
 				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
@@ -150,6 +152,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: BluetoothScoCarkit
@@ -177,6 +180,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					hdmi = 0
 
 			conf: BluetoothScoHeadset
@@ -204,6 +208,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					hdmi = 0
 
 			conf: BluetoothSco
@@ -231,6 +236,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					hdmi = 0
 
 			conf: WiredHeadphone
@@ -268,6 +274,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					hdmi = 0
 
 			conf: Line
@@ -309,6 +316,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
 			conf: WiredHeadset
@@ -346,6 +354,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					hdmi = 0
 
 			conf: UsbDevice
@@ -385,6 +394,47 @@ domainGroup: DeviceForStrategy
 					usb_accessory = 0
 					usb_device = 1
 					hdmi = 0
+					usb_headset = 0
+
+			conf: UsbHeadset
+				ANY
+					ALL
+						#
+						# SonificationRespectful Follows Phone strategy if in call
+						#
+						ANY
+							TelephonyMode Is InCall
+							TelephonyMode Is InCommunication
+						ForceUseForCommunication IsNot ForceSpeaker
+					ALL
+						#
+						# SonificationRespectful Follows Sonification that falls through Media strategy if not in call
+						# SonificationRespectful follows media if music stream is active
+						#
+						TelephonyMode IsNot InCall
+						TelephonyMode IsNot InCommunication
+						ForceUseForMedia IsNot ForceSpeaker
+						AvailableOutputDevices Excludes UsbAccessory
+					AvailableOutputDevices Includes UsbHeadset
+
+				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+					earpiece = 0
+					bluetooth_sco = 0
+					bluetooth_sco_headset = 0
+					bluetooth_sco_carkit = 0
+					bluetooth_a2dp_headphones = 0
+					bluetooth_a2dp_speaker = 0
+					bluetooth_a2dp = 0
+					wired_headset = 0
+					wired_headphone = 0
+					line = 0
+					angl_dock_headset = 0
+					dgtl_dock_headset = 0
+					usb_accessory = 0
+					usb_device = 0
+					usb_headset = 1
+					hdmi = 0
+
 
 			conf: UsbAccessory
 				#
@@ -414,6 +464,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 1
 					usb_device = 0
+					usb_headset = 0
 					hdmi = 0
 
 			conf: DgtlDockHeadset
@@ -444,6 +495,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 1
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					hdmi = 0
 
 			conf: AuxDigital
@@ -474,6 +526,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					hdmi = 1
 
 			conf: AnlgDockHeadset
@@ -505,6 +558,7 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0
 					hdmi = 0
 
 			conf: Earpiece
@@ -532,5 +586,6 @@ domainGroup: DeviceForStrategy
 					dgtl_dock_headset = 0
 					usb_accessory = 0
 					usb_device = 0
+					usb_headset = 0 
 					hdmi = 0
 
diff --git a/common/audio/reference_configurable_audio_policy/Structure/PolicySubsystem-CommonTypes.xml b/common/audio/reference_configurable_audio_policy/Structure/PolicySubsystem-CommonTypes.xml
index 461e44a7c..9d6c6caf5 100644
--- a/common/audio/reference_configurable_audio_policy/Structure/PolicySubsystem-CommonTypes.xml
+++ b/common/audio/reference_configurable_audio_policy/Structure/PolicySubsystem-CommonTypes.xml
@@ -37,6 +37,7 @@
             <BitParameter Name="speaker_safe" Size="1" Pos="22"/>
             <BitParameter Name="ip" Size="1" Pos="23"/>
             <BitParameter Name="bus" Size="1" Pos="24"/>
+            <BitParameter Name="usb_headset" Size="1" Pos="26"/>
             <BitParameter Name="stub" Size="1" Pos="30"/>
         </BitParameterBlock>
     </ComponentType>
@@ -68,6 +69,7 @@
             <BitParameter Name="ip" Size="1" Pos="19"/>
             <BitParameter Name="bus" Size="1" Pos="20"/>
             <BitParameter Name="stub" Size="1" Pos="30"/>
+            <BitParameter Name="usb_headset" Size="1" Pos="25"/>
         </BitParameterBlock>
     </ComponentType>
 
diff --git a/common/audio/reference_configurable_audio_policy/policy_criteria.txt b/common/audio/reference_configurable_audio_policy/policy_criteria.txt
index 480cbe1cd..32bae9599 100644
--- a/common/audio/reference_configurable_audio_policy/policy_criteria.txt
+++ b/common/audio/reference_configurable_audio_policy/policy_criteria.txt
@@ -1,6 +1,6 @@
 ExclusiveCriterion TelephonyMode                :   Normal          RingTone                InCall              InCommunication
-InclusiveCriterion AvailableInputDevices        :   Communication Ambient BuiltinMic BluetoothScoHeadset WiredHeadset Hdmi TelephonyRx BackMic RemoteSubmix AnlgDockHeadset DgtlDockHeadset UsbAccessory UsbDevice FmTuner TvTuner Line Spdif BluetoothA2dp Loopback Ip Bus Stub
-InclusiveCriterion AvailableOutputDevices       :   Earpiece Speaker WiredSpeaker WiredHeadset WiredHeadphone BluetoothSco BluetoothScoHeadset BluetoothScoCarkit BluetoothA2dp BluetoothA2dpHeadphones BluetoothA2dpSpeaker Hdmi AnlgDockHeadset DgtlDockHeadset UsbAccessory UsbDevice RemoteSubmix TelephonyTx Line HdmiArc Spdif Fm AuxLine SpeakerSafe Ip Bus Stub
+InclusiveCriterion AvailableInputDevices        :   Communication Ambient BuiltinMic BluetoothScoHeadset WiredHeadset Hdmi TelephonyRx BackMic RemoteSubmix AnlgDockHeadset DgtlDockHeadset UsbAccessory UsbDevice FmTuner TvTuner Line Spdif BluetoothA2dp Loopback Ip Bus Stub UsbHeadset
+InclusiveCriterion AvailableOutputDevices       :   Earpiece Speaker WiredSpeaker WiredHeadset WiredHeadphone BluetoothSco BluetoothScoHeadset BluetoothScoCarkit BluetoothA2dp BluetoothA2dpHeadphones BluetoothA2dpSpeaker Hdmi AnlgDockHeadset DgtlDockHeadset UsbAccessory UsbDevice RemoteSubmix TelephonyTx Line HdmiArc Spdif Fm AuxLine SpeakerSafe Ip Bus Stub UsbHeadset
 ExclusiveCriterion ForceUseForCommunication     :   ForceNone       ForceSpeaker            ForceBtSco
 ExclusiveCriterion ForceUseForMedia             :   ForceNone       ForceSpeaker			ForceHeadphones         ForceBtA2dp         ForceWiredAccessory ForceAnalogDock ForceDigitalDock    ForceNoBtA2dp       ForceSystemEnforced
 ExclusiveCriterion ForceUseForRecord            :   ForceNone       ForceBtSco              ForceWiredAccessory

From c3c4535a18c4c0d06f892d38a69f69d59b9f10b3 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Fri, 9 Mar 2018 08:04:05 +0530
Subject: [PATCH 214/427] [AIA-O] Mixinup USB Audio

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/AndroidBoard.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/androidia_64/AndroidBoard.mk b/androidia_64/AndroidBoard.mk
index 59609096e..a8648ca52 100644
--- a/androidia_64/AndroidBoard.mk
+++ b/androidia_64/AndroidBoard.mk
@@ -357,6 +357,7 @@ $(BOARD_GPT_BIN): $(TARGET_DEVICE_DIR)/gpt.ini
 ##############################################################
 # Source: device/intel/mixins/groups/audio/android_ia/AndroidBoard.mk
 ##############################################################
+pfw_rebuild_settings := true
 # Target specific audio configuration files
 include device/intel/android_ia/common/audio/AndroidBoard.mk
 ##############################################################

From d5c53448afa0eeb1f01fd5c1bab19e3f6643c847 Mon Sep 17 00:00:00 2001
From: shyjumon <shyjumon.n@intel.com>
Date: Fri, 23 Feb 2018 02:05:46 +0530
Subject: [PATCH 215/427] [AIA-O] SDCARD FS enabling

Due to redundant config the sdcardfs was not working.
So correcting properly.

Jira: None
Test: None

Signed-off-by: shyjumon <shyjumon.n@intel.com>
---
 kernel_config/kernel_64_defconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 87e60fd70..159942c6c 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -6830,7 +6830,6 @@ CONFIG_QUOTACTL=y
 CONFIG_QUOTACTL_COMPAT=y
 # CONFIG_AUTOFS4_FS is not set
 CONFIG_FUSE_FS=y
-CONFIG_SDCARD_FS=y
 # CONFIG_CUSE is not set
 # CONFIG_OVERLAY_FS is not set
 
@@ -6881,7 +6880,7 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_ECRYPT_FS is not set
-# CONFIG_SDCARD_FS is not set
+CONFIG_SDCARD_FS=y
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set

From 7be85ef13c60d05d5c90aaf942ebc02424cfdbe0 Mon Sep 17 00:00:00 2001
From: shyjumon <shyjumon.n@intel.com>
Date: Fri, 16 Feb 2018 03:13:27 +0530
Subject: [PATCH 216/427] [AIA-O] Realtek PCI-E SD/MMC Card Interface Driver
 made static

This patch need to be reverted once modprobe is fixed.

Jira: None
Test: None

Signed-off-by: shyjumon <shyjumon.n@intel.com>
---
 kernel_config/kernel_64_defconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 159942c6c..5add68554 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -3730,7 +3730,7 @@ CONFIG_MFD_MENF21BMC=m
 # CONFIG_MFD_PCF50633 is not set
 CONFIG_UCB1400_CORE=m
 CONFIG_MFD_RDC321X=m
-CONFIG_MFD_RTSX_PCI=m
+CONFIG_MFD_RTSX_PCI=y
 # CONFIG_MFD_RT5033 is not set
 CONFIG_MFD_RTSX_USB=m
 # CONFIG_MFD_RC5T583 is not set
@@ -5656,7 +5656,7 @@ CONFIG_MMC_VIA_SDMMC=m
 CONFIG_MMC_VUB300=m
 CONFIG_MMC_USHC=m
 CONFIG_MMC_USDHI6ROL0=m
-CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MMC_REALTEK_PCI=y
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_TOSHIBA_PCI=m
 CONFIG_MMC_MTK=m

From ae08287e2cec1e4bd5ec64735ba84a724124c6e8 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Mon, 26 Mar 2018 17:56:42 +0530
Subject: [PATCH 217/427] [AIA-O] Disable Trusty on MR1

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/mixins.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index 36a4029c8..73f24918f 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -19,7 +19,7 @@ usb-gadget: g_ffs
 adb_net: true
 kernel: android_ia(loglevel=3, disable_cpuidle_on_boot=true)
 bluetooth: btusb
-boot-arch: android_ia(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true)
+boot-arch: android_ia(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=false)
 audio: android_ia
 wlan: iwlwifi
 cpu-arch: skl
@@ -40,7 +40,7 @@ debug-phonedoctor: true
 debug-tools: true
 flashfiles: ini(oemvars=false,version=3.0,fastboot_min_battery_level=3500,installer=true)
 midi: true
-trusty: true
+trusty: false
 slcan: default
 ioc-slcan-reboot: false
 camera: usbcamera

From 704506414b99b2b86b885bee7a7bd742dd998e27 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Mon, 26 Mar 2018 17:57:27 +0530
Subject: [PATCH 218/427] [AIA-O] Disable Trusty Mixin-Up

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/AndroidBoard.mk | 49 ------------------------------------
 androidia_64/BoardConfig.mk  | 41 ------------------------------
 androidia_64/device.mk       | 14 -----------
 androidia_64/flash.json      | 34 -------------------------
 androidia_64/flashfiles.ini  |  8 ------
 androidia_64/fstab           |  1 -
 androidia_64/gpt.ini         |  8 +-----
 androidia_64/init.rc         |  8 ------
 androidia_64/installer.cmd   |  2 --
 9 files changed, 1 insertion(+), 164 deletions(-)

diff --git a/androidia_64/AndroidBoard.mk b/androidia_64/AndroidBoard.mk
index a8648ca52..545965e1e 100644
--- a/androidia_64/AndroidBoard.mk
+++ b/androidia_64/AndroidBoard.mk
@@ -423,53 +423,4 @@ $(provdata_zip): $(provdata_zip_deps) | $(ACP)
 
 INSTALLED_RADIOIMAGE_TARGET += $(provdata_zip)
 
-##############################################################
-# Source: device/intel/mixins/groups/trusty/true/AndroidBoard.mk
-##############################################################
-TOS_IMAGE_TARGET := $(TRUSTY_BUILDROOT)/evmm_lk_pkg.bin
-
-INTERNAL_PLATFORM := ikgt
-LOCAL_MAKE := make
-
-# Build the evmm_pkg.bin and lk.bin
-.PHONY: $(TOS_IMAGE_TARGET)
-$(TOS_IMAGE_TARGET):
-	@echo "making lk.bin.."
-	$(hide) (cd $(TOPDIR)trusty && $(TRUSTY_ENV_VAR) $(LOCAL_MAKE) sand-x86-64)
-	@echo "making tos image.."
-	$(hide) (cd $(TOPDIR)vendor/intel/fw/evmm/$(INTERNAL_PLATFORM) && $(TRUSTY_ENV_VAR) $(LOCAL_MAKE))
-
-#tos partition is assigned for trusty
-INSTALLED_TOS_IMAGE_TARGET := $(PRODUCT_OUT)/tos.img
-TOS_SIGNING_KEY := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8
-TOS_SIGNING_CERT := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem
-
-.PHONY: tosimage
-tosimage: $(INSTALLED_TOS_IMAGE_TARGET)
-
-ifeq (true,$(BOARD_AVB_ENABLE)) # BOARD_AVB_ENABLE == true
-$(INSTALLED_TOS_IMAGE_TARGET): $(TOS_IMAGE_TARGET) $(MKBOOTIMG) $(AVBTOOL)
-	@echo "mkbootimg to create boot image for TOS file: $@"
-	$(hide) $(MKBOOTIMG) --kernel $(TOS_IMAGE_TARGET) --output $@
-	$(hide) $(AVBTOOL) add_hash_footer \
-		--image $@ \
-		--partition_size $(BOARD_TOSIMAGE_PARTITION_SIZE) \
-		--partition_name tos $(INTERNAL_AVB_SIGNING_ARGS)
-BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --include_descriptors_from_image $(INSTALLED_TOS_IMAGE_TARGET)
-$(INSTALLED_VBMETAIMAGE_TARGET): $(INSTALLED_TOS_IMAGE_TARGET)
-else
-$(INSTALLED_TOS_IMAGE_TARGET): $(TOS_IMAGE_TARGET) $(MKBOOTIMG) $(BOOT_SIGNER)
-	@echo "mkbootimg to create boot image for TOS file: $@"
-	$(hide) $(MKBOOTIMG) --kernel $(TOS_IMAGE_TARGET) --output $@
-	$(if $(filter true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_BOOT_SIGNER)),\
-		@echo "sign prebuilt TOS file: $@" &&\
-		$(BOOT_SIGNER) /tos $@ $(TOS_SIGNING_KEY) $(TOS_SIGNING_CERT) $@)
-endif
-
-INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_TOS_IMAGE_TARGET)
-
-make_dir_ab_tos:
-	@mkdir -p $(PRODUCT_OUT)/root/tos
-
-$(PRODUCT_OUT)/ramdisk.img: make_dir_ab_tos
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 3edf4ac4f..fd7acb203 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -219,7 +219,6 @@ BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/installer.cmd
 BOARD_FLASHFILES += $(PRODUCT_OUT)/bootloader
 BOARD_FLASHFILES += $(PRODUCT_OUT)/fastboot-usb.img
 BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/flash.json
-BOARD_FLASHFILES += $(PRODUCT_OUT)/tos.img
 
 # -- OTA RELATED DEFINES --
 # tell build system where to get the recovery.fstab.
@@ -406,46 +405,6 @@ USE_INTEL_FLASHFILES := true
 VARIANT_SPECIFIC_FLASHFILES ?= false
 FAST_FLASHFILES := true
 
-##############################################################
-# Source: device/intel/mixins/groups/trusty/true/BoardConfig.mk
-##############################################################
-TARGET_USE_TRUSTY := true
-
-KM_VERSION := 1
-ifeq ($(KM_VERSION),1)
-BOARD_USES_TRUSTY := true
-BOARD_USES_KEYMASTER1 := true
-endif
-
-BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy
-BOARD_SEPOLICY_M4DEFS += module_trusty=true
-
-LK_PRODUCT := androidia_64
-
-LKBUILD_TOOLCHAIN_ROOT = $(PWD)/vendor/intel/external/prebuilts/elf/
-LKBUILD_X86_TOOLCHAIN =
-LKBUILD_X64_TOOLCHAIN = $(LKBUILD_TOOLCHAIN_ROOT)x86_64-elf-4.9.1-Linux-x86_64/bin
-TRUSTY_BUILDROOT = $(PWD)/$(PRODUCT_OUT)/obj/trusty/
-
-TRUSTY_ENV_VAR += LK_CORE_NUM=1
-TRUSTY_ENV_VAR += TARGET_PRODUCT=$(LK_PRODUCT)
-
-#for trusty lk
-TRUSTY_ENV_VAR += BUILDROOT=$(TRUSTY_BUILDROOT)
-TRUSTY_ENV_VAR += PATH=$(PATH):$(LKBUILD_X86_TOOLCHAIN):$(LKBUILD_X64_TOOLCHAIN)
-
-#for trusty vmm
-# use same toolchain as android kernel
-TRUSTY_ENV_VAR += COMPILE_TOOLCHAIN=$(EVMMBUILD_TOOLCHAIN)
-
-# output build dir to android out folder
-TRUSTY_ENV_VAR += BUILD_DIR=$(TRUSTY_BUILDROOT)
-TRUSTY_ENV_VAR += LKBIN_DIR=$(TRUSTY_BUILDROOT)/build-sand-x86-64/
-
-#Workaround CPU lost issue on SIMICS, will remove this line below after PO.
-BOARD_KERNEL_CMDLINE += cpu_init_udelay=500000
-
-BOARD_TOSIMAGE_PARTITION_SIZE := 10485760
 ##############################################################
 # Source: device/intel/mixins/groups/camera/usbcamera/BoardConfig.mk
 ##############################################################
diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 4e9b0b34a..2473d5a42 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -524,20 +524,6 @@ PRODUCT_PACKAGES_DEBUG += \
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.midi.xml:system/etc/permissions/android.software.midi.xml
 ##############################################################
-# Source: device/intel/mixins/groups/trusty/true/product.mk
-##############################################################
-
-KM_VERSION := 1
-
-ifeq ($(KM_VERSION),1)
-PRODUCT_PACKAGES += \
-	keystore.android_ia
-endif
-
-PRODUCT_PACKAGES += \
-	libtrusty
-
-##############################################################
 # Source: device/intel/mixins/groups/memtrack/true/product.mk
 ##############################################################
 # memtrack HAL
diff --git a/androidia_64/flash.json b/androidia_64/flash.json
index 1685e3476..3488be5e7 100644
--- a/androidia_64/flash.json
+++ b/androidia_64/flash.json
@@ -220,40 +220,6 @@
                 "timeout": 60000,
                 "tool": "fastboot"
             },
-            {
-                "args": "flash tos_a ${tos}",
-                "description": "Flash tos_a partition",
-                "mandatory": true,
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV",
-                    "expression": "${battery} >= 3500",
-                    "skipOnFailure": false
-                },
-                "restrict": [
-                    "blank",
-                    "update"
-                ],
-                "retry": 1,
-                "timeout": 60000,
-                "tool": "fastboot"
-            },
-            {
-                "args": "flash tos_b ${tos}",
-                "description": "Flash tos_b partition",
-                "mandatory": true,
-                "precondition": {
-                    "description": "Check battery level: ${battery}mV",
-                    "expression": "${battery} >= 3500",
-                    "skipOnFailure": false
-                },
-                "restrict": [
-                    "blank",
-                    "update"
-                ],
-                "retry": 1,
-                "timeout": 60000,
-                "tool": "fastboot"
-            },
             {
                 "args": "flash system_a ${system}",
                 "description": "Flash system_a partition",
diff --git a/androidia_64/flashfiles.ini b/androidia_64/flashfiles.ini
index 6b93a0411..e3ed78339 100644
--- a/androidia_64/flashfiles.ini
+++ b/androidia_64/flashfiles.ini
@@ -233,12 +233,4 @@ description = Set device state to locked
 tool = fastboot
 args = continue
 description = Boot to main OS
-##############################################################
-# Source: device/intel/mixins/groups/trusty/true/flashfiles.ini
-##############################################################
-[command.flash.tos]
-tool = fastboot
-args = flash tos $file
-file = radio:tos.img
-description = Flash tos partition
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/fstab b/androidia_64/fstab
index ffdb88dfb..3ad42e7c8 100644
--- a/androidia_64/fstab
+++ b/androidia_64/fstab
@@ -45,5 +45,4 @@
 /dev/block/by-name/bootloader2  /bootloader2    emmc    defaults                                                    recoveryonly
 /dev/block/by-name/persistent   /persistent     emmc    defaults                                                    defaults
 /dev/block/by-name/metadata     /metadata       emmc    defaults                                                    defaults
-/dev/block/by-name/tos          /tos            emmc    defaults                                                    defaults,slotselect,avb
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/gpt.ini b/androidia_64/gpt.ini
index 3915a4d82..f3545dc3c 100644
--- a/androidia_64/gpt.ini
+++ b/androidia_64/gpt.ini
@@ -4,7 +4,7 @@
 # Source: device/intel/mixins/groups/boot-arch/android_ia/gpt.ini
 ##############################################################
 [base]
-partitions = bootloader bootloader2 boot  misc metadata system persistent vendor config factory tos vbmeta data
+partitions = bootloader bootloader2 boot  misc metadata system persistent vendor config factory  vbmeta data
 device = auto
 nb_slot = 2
 
@@ -82,12 +82,6 @@ len = 10
 type = linux
 guid = 8f68cc74-c5e5-48da-be91-a0c8c15e9c80
 
-[partition.tos]
-label = tos
-len = 10
-type = boot
-has_slot = true
-guid = 52cd00fd-f5b0-4061-b3a5-65b07f2179f0
 
 [partition.vbmeta]
 label = vbmeta
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 4958b4c63..355b35a6f 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -623,14 +623,6 @@ on property:sys.usb.config=midi,adb
     start adbd
     setprop sys.usb.state ${sys.usb.config}
 ##############################################################
-# Source: device/intel/mixins/groups/trusty/true/init.rc
-##############################################################
-on fs
-    # Update device node r/w attribute
-    chown system system /dev/trusty-ipc-dev0
-    chmod 660 /dev/trusty-ipc-dev0
-
-##############################################################
 # Source: device/intel/mixins/groups/debug-kernel/default/init.rc
 ##############################################################
 import /init.kernel.rc
diff --git a/androidia_64/installer.cmd b/androidia_64/installer.cmd
index 48ba94ea6..9ed915a0a 100644
--- a/androidia_64/installer.cmd
+++ b/androidia_64/installer.cmd
@@ -15,8 +15,6 @@ flash vbmeta_a vbmeta.img
 flash vbmeta_b vbmeta.img
 flash boot_a boot.img
 flash boot_b boot.img
-flash tos_a tos.img
-flash tos_b tos.img
 flash system_a system.img
 flash system_b system.img
 flash vendor_a vendor.img

From 7bc28a672876059a36b9f5999ddfc614671374ac Mon Sep 17 00:00:00 2001
From: "ji, zhenlong z" <zhenlong.z.ji@intel.com>
Date: Tue, 20 Mar 2018 15:00:55 +0800
Subject: [PATCH 219/427] SELinux: allow netd communicates with untrusted app
 by icmp_socket

kernel 4.14 add a new class of icmp_socket, cts test
suites need to communicate with netd by icmp socket.

Jira: None
Test: The device can boot to UI and there are no obvious
regressions should be found.

Signed-off-by: ji, zhenlong z <zhenlong.z.ji@intel.com>
---
 sepolicy/kernel/netd.te | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sepolicy/kernel/netd.te b/sepolicy/kernel/netd.te
index 8c860a800..aeff12c2d 100644
--- a/sepolicy/kernel/netd.te
+++ b/sepolicy/kernel/netd.te
@@ -1,3 +1,4 @@
 allow netd kernel:system module_request;
 allow netd self:capability { sys_module fsetid };
+allow netd untrusted_app:icmp_socket {read write getopt setopt getattr};
 

From 1b83ca2844b313ecd202ca177de72ac03de6fdac Mon Sep 17 00:00:00 2001
From: swei22 <w.sheng@intel.com>
Date: Wed, 28 Mar 2018 19:23:09 +0800
Subject: [PATCH 220/427] Enable trusty to mixins.spec

Enable tos partition and trusty feature

Jira: None
Test: Device boots to home screen.
Signed-off-by: swei22 <w.sheng@intel.com>
---
 androidia_64/mixins.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index 73f24918f..36a4029c8 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -19,7 +19,7 @@ usb-gadget: g_ffs
 adb_net: true
 kernel: android_ia(loglevel=3, disable_cpuidle_on_boot=true)
 bluetooth: btusb
-boot-arch: android_ia(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=false)
+boot-arch: android_ia(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true)
 audio: android_ia
 wlan: iwlwifi
 cpu-arch: skl
@@ -40,7 +40,7 @@ debug-phonedoctor: true
 debug-tools: true
 flashfiles: ini(oemvars=false,version=3.0,fastboot_min_battery_level=3500,installer=true)
 midi: true
-trusty: false
+trusty: true
 slcan: default
 ioc-slcan-reboot: false
 camera: usbcamera

From d362e64788f97c6367318ece2ff24104e6585d64 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Tue, 3 Apr 2018 07:07:46 +0530
Subject: [PATCH 221/427] [AIA-O] Mixinup enable trusty

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/AndroidBoard.mk | 49 ++++++++++++++++++++++++++++++++++++
 androidia_64/BoardConfig.mk  | 41 ++++++++++++++++++++++++++++++
 androidia_64/device.mk       | 14 +++++++++++
 androidia_64/flash.json      | 34 +++++++++++++++++++++++++
 androidia_64/flashfiles.ini  |  8 ++++++
 androidia_64/fstab           |  1 +
 androidia_64/gpt.ini         |  8 +++++-
 androidia_64/init.rc         |  8 ++++++
 androidia_64/installer.cmd   |  2 ++
 9 files changed, 164 insertions(+), 1 deletion(-)

diff --git a/androidia_64/AndroidBoard.mk b/androidia_64/AndroidBoard.mk
index 545965e1e..a8648ca52 100644
--- a/androidia_64/AndroidBoard.mk
+++ b/androidia_64/AndroidBoard.mk
@@ -423,4 +423,53 @@ $(provdata_zip): $(provdata_zip_deps) | $(ACP)
 
 INSTALLED_RADIOIMAGE_TARGET += $(provdata_zip)
 
+##############################################################
+# Source: device/intel/mixins/groups/trusty/true/AndroidBoard.mk
+##############################################################
+TOS_IMAGE_TARGET := $(TRUSTY_BUILDROOT)/evmm_lk_pkg.bin
+
+INTERNAL_PLATFORM := ikgt
+LOCAL_MAKE := make
+
+# Build the evmm_pkg.bin and lk.bin
+.PHONY: $(TOS_IMAGE_TARGET)
+$(TOS_IMAGE_TARGET):
+	@echo "making lk.bin.."
+	$(hide) (cd $(TOPDIR)trusty && $(TRUSTY_ENV_VAR) $(LOCAL_MAKE) sand-x86-64)
+	@echo "making tos image.."
+	$(hide) (cd $(TOPDIR)vendor/intel/fw/evmm/$(INTERNAL_PLATFORM) && $(TRUSTY_ENV_VAR) $(LOCAL_MAKE))
+
+#tos partition is assigned for trusty
+INSTALLED_TOS_IMAGE_TARGET := $(PRODUCT_OUT)/tos.img
+TOS_SIGNING_KEY := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8
+TOS_SIGNING_CERT := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem
+
+.PHONY: tosimage
+tosimage: $(INSTALLED_TOS_IMAGE_TARGET)
+
+ifeq (true,$(BOARD_AVB_ENABLE)) # BOARD_AVB_ENABLE == true
+$(INSTALLED_TOS_IMAGE_TARGET): $(TOS_IMAGE_TARGET) $(MKBOOTIMG) $(AVBTOOL)
+	@echo "mkbootimg to create boot image for TOS file: $@"
+	$(hide) $(MKBOOTIMG) --kernel $(TOS_IMAGE_TARGET) --output $@
+	$(hide) $(AVBTOOL) add_hash_footer \
+		--image $@ \
+		--partition_size $(BOARD_TOSIMAGE_PARTITION_SIZE) \
+		--partition_name tos $(INTERNAL_AVB_SIGNING_ARGS)
+BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --include_descriptors_from_image $(INSTALLED_TOS_IMAGE_TARGET)
+$(INSTALLED_VBMETAIMAGE_TARGET): $(INSTALLED_TOS_IMAGE_TARGET)
+else
+$(INSTALLED_TOS_IMAGE_TARGET): $(TOS_IMAGE_TARGET) $(MKBOOTIMG) $(BOOT_SIGNER)
+	@echo "mkbootimg to create boot image for TOS file: $@"
+	$(hide) $(MKBOOTIMG) --kernel $(TOS_IMAGE_TARGET) --output $@
+	$(if $(filter true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_BOOT_SIGNER)),\
+		@echo "sign prebuilt TOS file: $@" &&\
+		$(BOOT_SIGNER) /tos $@ $(TOS_SIGNING_KEY) $(TOS_SIGNING_CERT) $@)
+endif
+
+INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_TOS_IMAGE_TARGET)
+
+make_dir_ab_tos:
+	@mkdir -p $(PRODUCT_OUT)/root/tos
+
+$(PRODUCT_OUT)/ramdisk.img: make_dir_ab_tos
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index fd7acb203..3edf4ac4f 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -219,6 +219,7 @@ BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/installer.cmd
 BOARD_FLASHFILES += $(PRODUCT_OUT)/bootloader
 BOARD_FLASHFILES += $(PRODUCT_OUT)/fastboot-usb.img
 BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/flash.json
+BOARD_FLASHFILES += $(PRODUCT_OUT)/tos.img
 
 # -- OTA RELATED DEFINES --
 # tell build system where to get the recovery.fstab.
@@ -405,6 +406,46 @@ USE_INTEL_FLASHFILES := true
 VARIANT_SPECIFIC_FLASHFILES ?= false
 FAST_FLASHFILES := true
 
+##############################################################
+# Source: device/intel/mixins/groups/trusty/true/BoardConfig.mk
+##############################################################
+TARGET_USE_TRUSTY := true
+
+KM_VERSION := 1
+ifeq ($(KM_VERSION),1)
+BOARD_USES_TRUSTY := true
+BOARD_USES_KEYMASTER1 := true
+endif
+
+BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy
+BOARD_SEPOLICY_M4DEFS += module_trusty=true
+
+LK_PRODUCT := androidia_64
+
+LKBUILD_TOOLCHAIN_ROOT = $(PWD)/vendor/intel/external/prebuilts/elf/
+LKBUILD_X86_TOOLCHAIN =
+LKBUILD_X64_TOOLCHAIN = $(LKBUILD_TOOLCHAIN_ROOT)x86_64-elf-4.9.1-Linux-x86_64/bin
+TRUSTY_BUILDROOT = $(PWD)/$(PRODUCT_OUT)/obj/trusty/
+
+TRUSTY_ENV_VAR += LK_CORE_NUM=1
+TRUSTY_ENV_VAR += TARGET_PRODUCT=$(LK_PRODUCT)
+
+#for trusty lk
+TRUSTY_ENV_VAR += BUILDROOT=$(TRUSTY_BUILDROOT)
+TRUSTY_ENV_VAR += PATH=$(PATH):$(LKBUILD_X86_TOOLCHAIN):$(LKBUILD_X64_TOOLCHAIN)
+
+#for trusty vmm
+# use same toolchain as android kernel
+TRUSTY_ENV_VAR += COMPILE_TOOLCHAIN=$(EVMMBUILD_TOOLCHAIN)
+
+# output build dir to android out folder
+TRUSTY_ENV_VAR += BUILD_DIR=$(TRUSTY_BUILDROOT)
+TRUSTY_ENV_VAR += LKBIN_DIR=$(TRUSTY_BUILDROOT)/build-sand-x86-64/
+
+#Workaround CPU lost issue on SIMICS, will remove this line below after PO.
+BOARD_KERNEL_CMDLINE += cpu_init_udelay=500000
+
+BOARD_TOSIMAGE_PARTITION_SIZE := 10485760
 ##############################################################
 # Source: device/intel/mixins/groups/camera/usbcamera/BoardConfig.mk
 ##############################################################
diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 2473d5a42..4e9b0b34a 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -524,6 +524,20 @@ PRODUCT_PACKAGES_DEBUG += \
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.midi.xml:system/etc/permissions/android.software.midi.xml
 ##############################################################
+# Source: device/intel/mixins/groups/trusty/true/product.mk
+##############################################################
+
+KM_VERSION := 1
+
+ifeq ($(KM_VERSION),1)
+PRODUCT_PACKAGES += \
+	keystore.android_ia
+endif
+
+PRODUCT_PACKAGES += \
+	libtrusty
+
+##############################################################
 # Source: device/intel/mixins/groups/memtrack/true/product.mk
 ##############################################################
 # memtrack HAL
diff --git a/androidia_64/flash.json b/androidia_64/flash.json
index 3488be5e7..1685e3476 100644
--- a/androidia_64/flash.json
+++ b/androidia_64/flash.json
@@ -220,6 +220,40 @@
                 "timeout": 60000,
                 "tool": "fastboot"
             },
+            {
+                "args": "flash tos_a ${tos}",
+                "description": "Flash tos_a partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash tos_b ${tos}",
+                "description": "Flash tos_b partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
             {
                 "args": "flash system_a ${system}",
                 "description": "Flash system_a partition",
diff --git a/androidia_64/flashfiles.ini b/androidia_64/flashfiles.ini
index e3ed78339..6b93a0411 100644
--- a/androidia_64/flashfiles.ini
+++ b/androidia_64/flashfiles.ini
@@ -233,4 +233,12 @@ description = Set device state to locked
 tool = fastboot
 args = continue
 description = Boot to main OS
+##############################################################
+# Source: device/intel/mixins/groups/trusty/true/flashfiles.ini
+##############################################################
+[command.flash.tos]
+tool = fastboot
+args = flash tos $file
+file = radio:tos.img
+description = Flash tos partition
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/fstab b/androidia_64/fstab
index 3ad42e7c8..ffdb88dfb 100644
--- a/androidia_64/fstab
+++ b/androidia_64/fstab
@@ -45,4 +45,5 @@
 /dev/block/by-name/bootloader2  /bootloader2    emmc    defaults                                                    recoveryonly
 /dev/block/by-name/persistent   /persistent     emmc    defaults                                                    defaults
 /dev/block/by-name/metadata     /metadata       emmc    defaults                                                    defaults
+/dev/block/by-name/tos          /tos            emmc    defaults                                                    defaults,slotselect,avb
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/gpt.ini b/androidia_64/gpt.ini
index f3545dc3c..3915a4d82 100644
--- a/androidia_64/gpt.ini
+++ b/androidia_64/gpt.ini
@@ -4,7 +4,7 @@
 # Source: device/intel/mixins/groups/boot-arch/android_ia/gpt.ini
 ##############################################################
 [base]
-partitions = bootloader bootloader2 boot  misc metadata system persistent vendor config factory  vbmeta data
+partitions = bootloader bootloader2 boot  misc metadata system persistent vendor config factory tos vbmeta data
 device = auto
 nb_slot = 2
 
@@ -82,6 +82,12 @@ len = 10
 type = linux
 guid = 8f68cc74-c5e5-48da-be91-a0c8c15e9c80
 
+[partition.tos]
+label = tos
+len = 10
+type = boot
+has_slot = true
+guid = 52cd00fd-f5b0-4061-b3a5-65b07f2179f0
 
 [partition.vbmeta]
 label = vbmeta
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 355b35a6f..4958b4c63 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -623,6 +623,14 @@ on property:sys.usb.config=midi,adb
     start adbd
     setprop sys.usb.state ${sys.usb.config}
 ##############################################################
+# Source: device/intel/mixins/groups/trusty/true/init.rc
+##############################################################
+on fs
+    # Update device node r/w attribute
+    chown system system /dev/trusty-ipc-dev0
+    chmod 660 /dev/trusty-ipc-dev0
+
+##############################################################
 # Source: device/intel/mixins/groups/debug-kernel/default/init.rc
 ##############################################################
 import /init.kernel.rc
diff --git a/androidia_64/installer.cmd b/androidia_64/installer.cmd
index 9ed915a0a..48ba94ea6 100644
--- a/androidia_64/installer.cmd
+++ b/androidia_64/installer.cmd
@@ -15,6 +15,8 @@ flash vbmeta_a vbmeta.img
 flash vbmeta_b vbmeta.img
 flash boot_a boot.img
 flash boot_b boot.img
+flash tos_a tos.img
+flash tos_b tos.img
 flash system_a system.img
 flash system_b system.img
 flash vendor_a vendor.img

From 1786fc8f702696ba40269a3cd7979bcd91cefad4 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Tue, 3 Apr 2018 07:11:41 +0530
Subject: [PATCH 222/427] [AIA-O] Mixinup enable keymaster

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/BoardConfig.mk | 4 ++--
 androidia_64/device.mk      | 9 ++++++++-
 androidia_64/init.rc        | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 3edf4ac4f..3081ab0cb 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -411,13 +411,13 @@ FAST_FLASHFILES := true
 ##############################################################
 TARGET_USE_TRUSTY := true
 
-KM_VERSION := 1
+KM_VERSION := 2
 ifeq ($(KM_VERSION),1)
 BOARD_USES_TRUSTY := true
 BOARD_USES_KEYMASTER1 := true
 endif
 
-BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy
+BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/trusty
 BOARD_SEPOLICY_M4DEFS += module_trusty=true
 
 LK_PRODUCT := androidia_64
diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 4e9b0b34a..65298e486 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -527,7 +527,14 @@ PRODUCT_COPY_FILES += \
 # Source: device/intel/mixins/groups/trusty/true/product.mk
 ##############################################################
 
-KM_VERSION := 1
+KM_VERSION := 2
+
+ifeq ($(KM_VERSION),2)
+PRODUCT_PACKAGES += \
+	keystore.trusty
+PRODUCT_PROPERTY_OVERRIDES += \
+	ro.hardware.keystore=trusty
+endif
 
 ifeq ($(KM_VERSION),1)
 PRODUCT_PACKAGES += \
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 4958b4c63..a1ef7ea7f 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -628,7 +628,7 @@ on property:sys.usb.config=midi,adb
 on fs
     # Update device node r/w attribute
     chown system system /dev/trusty-ipc-dev0
-    chmod 660 /dev/trusty-ipc-dev0
+    chmod 666 /dev/trusty-ipc-dev0
 
 ##############################################################
 # Source: device/intel/mixins/groups/debug-kernel/default/init.rc

From 2c8088d157bce7479a2203fd77d13a6e954f491b Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Wed, 28 Mar 2018 22:56:15 +0530
Subject: [PATCH 223/427] [AIA-O] Mixinup Enable Fio

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 androidia_64/device.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 65298e486..0e03a5c9d 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -17,6 +17,8 @@ DEVICE_PACKAGE_OVERLAYS += device/intel/android_ia/common/overlay
 
 PRODUCT_PACKAGES += $(THIRD_PARTY_APPS)
 
+PRODUCT_PACKAGES += fio
+
 # Get a list of languages.
 $(call inherit-product,$(SRC_TARGET_DIR)/product/locales_full.mk)
 

From aabb46fe1822414a079971a49af9ef15dcdb8802 Mon Sep 17 00:00:00 2001
From: pyn <poornima.y.n@intel.com>
Date: Wed, 4 Apr 2018 16:36:11 +0530
Subject: [PATCH 224/427] Add Selinux policy for hwc.info service

Jira: None
Test: Permission denied message is not seen.

Signed-off-by: Poornima <poornima.y.n@intel.com>
---
 sepolicy/graphics/android_ia/hal_graphics_composer_default.te | 1 +
 sepolicy/graphics/android_ia/vndservice.te                    | 1 +
 sepolicy/graphics/android_ia/vndservice_contexts              | 1 +
 3 files changed, 3 insertions(+)
 create mode 100644 sepolicy/graphics/android_ia/vndservice.te
 create mode 100644 sepolicy/graphics/android_ia/vndservice_contexts

diff --git a/sepolicy/graphics/android_ia/hal_graphics_composer_default.te b/sepolicy/graphics/android_ia/hal_graphics_composer_default.te
index 4cf7ce25b..0ffe39760 100644
--- a/sepolicy/graphics/android_ia/hal_graphics_composer_default.te
+++ b/sepolicy/graphics/android_ia/hal_graphics_composer_default.te
@@ -13,3 +13,4 @@ allow hal_graphics_composer_default hal_graphics_allocator_hwservice:hwservice_m
 allow hal_graphics_composer_default gpu_device:dir r_dir_perms;
 allow hal_graphics_composer_default gpu_device:chr_file rw_file_perms;
 allow hal_graphics_composer_default sysfs_app_readable:file r_file_perms;
+allow hal_graphics_composer_default hwc_info_service:service_manager add;
diff --git a/sepolicy/graphics/android_ia/vndservice.te b/sepolicy/graphics/android_ia/vndservice.te
new file mode 100644
index 000000000..8d0d63c3f
--- /dev/null
+++ b/sepolicy/graphics/android_ia/vndservice.te
@@ -0,0 +1 @@
+type hwc_info_service, vndservice_manager_type;
diff --git a/sepolicy/graphics/android_ia/vndservice_contexts b/sepolicy/graphics/android_ia/vndservice_contexts
new file mode 100644
index 000000000..1a3e941ed
--- /dev/null
+++ b/sepolicy/graphics/android_ia/vndservice_contexts
@@ -0,0 +1 @@
+hwc.info                                 u:object_r:hwc_info_service:s0

From 28a3139fe7982d88985e039481159a5fb754e7f4 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Fri, 6 Apr 2018 11:45:26 +0530
Subject: [PATCH 225/427] [AIA-O] Mixinup

Fix the sepolicy issue of set_storgae,
add the RPMB and RPMB_simulate,
add the unlock_device.nsh

Jira: None
Test: None
---
 androidia_64/AndroidBoard.mk   | 9 ++++++++-
 androidia_64/BoardConfig.mk    | 4 ++++
 androidia_64/gpt.ini           | 3 ++-
 androidia_64/ueventd.rc        | 2 +-
 androidia_64/unlock_device.nsh | 7 +++++++
 5 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 androidia_64/unlock_device.nsh

diff --git a/androidia_64/AndroidBoard.mk b/androidia_64/AndroidBoard.mk
index a8648ca52..067145385 100644
--- a/androidia_64/AndroidBoard.mk
+++ b/androidia_64/AndroidBoard.mk
@@ -205,10 +205,17 @@ $(PRODUCT_OUT)/efi/flash.json: $(TARGET_DEVICE_DIR)/$(@F)
 	$(ACP) $(TARGET_DEVICE_DIR)/$(@F) $@
 	sed -i '/#/d' $@
 
-$(PRODUCT_OUT)/efi/startup.nsh:
+$(PRODUCT_OUT)/efi/startup.nsh: $(TARGET_DEVICE_DIR)/$(@F)
 	$(ACP) $(TARGET_DEVICE_DIR)/$(@F) $@
 	sed -i '/#/d' $@
 
+$(PRODUCT_OUT)/efi/unlock_device.nsh: $(TARGET_DEVICE_DIR)/$(@F)
+	$(ACP) $(TARGET_DEVICE_DIR)/$(@F) $@
+	sed -i '/#/d' $@
+
+$(PRODUCT_OUT)/efi/efivar_oemlock: $(TARGET_DEVICE_DIR)/$(@F)
+	$(ACP) $(TARGET_DEVICE_DIR)/$(@F) $@
+
 $(out_flashfiles): $(BOARD_FLASHFILES) | $(ACP)
 	$(call generate_flashfiles,$@, $^)
 
diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index 3081ab0cb..b05e06d8b 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -215,6 +215,8 @@ BOARD_FLASHFILES += $(PRODUCT_OUT)/boot.img
 BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/installer.efi
 BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/kernelflinger.efi
 BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/startup.nsh
+BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/unlock_device.nsh
+BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/efivar_oemlock
 BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/installer.cmd
 BOARD_FLASHFILES += $(PRODUCT_OUT)/bootloader
 BOARD_FLASHFILES += $(PRODUCT_OUT)/fastboot-usb.img
@@ -281,6 +283,8 @@ endif
 # It is useful when the BIOS does not support secure boot.
 KERNELFLINGER_ASSUME_BIOS_SECURE_BOOT := true
 
+
+
 ##############################################################
 # Source: device/intel/mixins/groups/audio/android_ia/BoardConfig.mk
 ##############################################################
diff --git a/androidia_64/gpt.ini b/androidia_64/gpt.ini
index 3915a4d82..279f392d2 100644
--- a/androidia_64/gpt.ini
+++ b/androidia_64/gpt.ini
@@ -4,7 +4,7 @@
 # Source: device/intel/mixins/groups/boot-arch/android_ia/gpt.ini
 ##############################################################
 [base]
-partitions = bootloader bootloader2 boot  misc metadata system persistent vendor config factory tos vbmeta data
+partitions = bootloader bootloader2 boot  misc metadata system persistent vendor config factory tos vbmeta  data
 device = auto
 nb_slot = 2
 
@@ -96,4 +96,5 @@ type = linux
 has_slot = true
 # Randum generate a guid
 guid = 7ced364c-3b5a-4eba-9f5c-9fef1327cb50
+
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/ueventd.rc b/androidia_64/ueventd.rc
index a9de93f6d..a705fa6ec 100644
--- a/androidia_64/ueventd.rc
+++ b/androidia_64/ueventd.rc
@@ -61,7 +61,7 @@
 ##############################################################
 # Source: device/intel/mixins/groups/disk-bus/auto/ueventd.rc
 ##############################################################
-/dev/block/pci/pci0000:00/0000:00:1c.0/by-name/persistent   0660 system system
+/dev/block/*/*/*/by-name/persistent   0660 system system
 ##############################################################
 # Source: device/intel/mixins/groups/wlan/iwlwifi/ueventd.rc
 ##############################################################
diff --git a/androidia_64/unlock_device.nsh b/androidia_64/unlock_device.nsh
new file mode 100644
index 000000000..abcb06543
--- /dev/null
+++ b/androidia_64/unlock_device.nsh
@@ -0,0 +1,7 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/boot-arch/android_ia/unlock_device.nsh
+##############################################################
+dmpstore OEMLock -l efivar_oemlock
+# ------------------ END MIX-IN DEFINITIONS ------------------

From 5aaf7544d248ebe99a2a1f29cae5b543b4db5bb3 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Fri, 6 Apr 2018 11:47:31 +0530
Subject: [PATCH 226/427] [AIA-O] Mixinup "Define and replace the absolute
 path"

Jira: None
Test: None
---
 androidia_64/device.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 0e03a5c9d..0cebcf1e6 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -6,6 +6,13 @@
 #Product Characteristics
 PRODUCT_DIR := $(dir $(lastword $(filter-out device/common/%,$(filter device/%,$(ALL_PRODUCTS)))))
 
+INTEL_PATH_DEVICE := device/intel/android_ia
+INTEL_PATH_COMMON := device/intel/common
+INTEL_PATH_SEPOLICY := device/intel/android_ia/sepolicy
+INTEL_PATH_BUILD := device/intel/build
+INTEL_PATH_HARDWARE := hardware/intel
+INTEL_PATH_VENDOR := vendor/intel
+
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.dalvik.vm.native.bridge=libhoudini.so
 
 PRODUCT_TAGS += dalvik.gc.type-precise

From 13c03c19082d4d0bc01b47530f0658387c1f130f Mon Sep 17 00:00:00 2001
From: Ming Tan <ming.tan@intel.com>
Date: Mon, 19 Mar 2018 21:06:55 +0800
Subject: [PATCH 227/427] Add the efivar_oemvar, used for unlock the device.

This file is used by unlock_device.nsh.

Jira: None.
Test: Test it in KBL NUC, can unlock the device in the user build.

Signed-off-by: Ming Tan <ming.tan@intel.com>
---
 androidia_64/efivar_oemlock | Bin 0 -> 45 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 androidia_64/efivar_oemlock

diff --git a/androidia_64/efivar_oemlock b/androidia_64/efivar_oemlock
new file mode 100644
index 0000000000000000000000000000000000000000..b93dad1699a21a139d1b37baa32c7d92901cb800
GIT binary patch
literal 45
wcmWe&U|{fPaAoji@L|YjNM^_e@|(C$Nb&e*yUv<<Z{HTfKL?qCVvHaR0M!2qY5)KL

literal 0
HcmV?d00001


From 8b78bceea4a3934d4d85374a3eac0d6454321433 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Wed, 11 Apr 2018 13:48:02 +0530
Subject: [PATCH 228/427] [AIA-O] Mixinup "Load modules for usb ethernet need
 for HP Dock"

Jira: None
Test: None
---
 androidia_64/init.rc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index a1ef7ea7f..40e7639b1 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -174,6 +174,7 @@ on post-fs
     insmod /vendor/lib/modules/kernel/drivers/net/phy/libphy.ko
     insmod /vendor/lib/modules/kernel/drivers/net/usb/usbnet.ko
     insmod /vendor/lib/modules/kernel/drivers/net/usb/asix.ko
+    insmod /vendor/lib/modules/kernel/drivers/net/usb/r8152.ko
 ##############################################################
 # Source: device/intel/mixins/groups/debugfs/default/init.rc
 ##############################################################
@@ -569,6 +570,7 @@ on charger
 on post-fs
    insmod /vendor/lib/modules/kernel/drivers/usb/serial/usbserial.ko
    insmod /vendor/lib/modules/kernel/drivers/usb/serial/pl2303.ko
+   insmod /vendor/lib/modules/kernel/drivers/usb/serial/ftdi_sio.ko
 ##############################################################
 # Source: device/intel/mixins/groups/thermal/dptf/init.rc
 ##############################################################

From b781ca6e16ec07e240d7a1117dac59df98fa74a8 Mon Sep 17 00:00:00 2001
From: Muhammad Aksar <muhammad.aksar@intel.com>
Date: Thu, 5 Apr 2018 12:06:19 +0530
Subject: [PATCH 229/427] CTS Video Fix: Modified Video Codec xml files

Modified media_codecs.xml and media_codecs_performance.xml
to pass cts video test cases.
Basically modified frame rate for google codecs based on
measured frame rate for each resolutions of AVC, H263,
MPEG4, VP8 and VP9 encoders.

Jira: None
Test: Video test cases (CtsVideoTestCases) are passed

Signed-off-by: Muhammad Aksar <muhammad.aksar@intel.com>
---
 common/media/media_codecs.xml             |  32 +++++-
 common/media/media_codecs_performance.xml | 120 ++++++++++++----------
 2 files changed, 95 insertions(+), 57 deletions(-)

diff --git a/common/media/media_codecs.xml b/common/media/media_codecs.xml
index 2a8c26be6..874e7bcee 100644
--- a/common/media/media_codecs.xml
+++ b/common/media/media_codecs.xml
@@ -83,10 +83,11 @@ Only the three quirks included above are recognized at this point:
             <Limit name="size" min="176x144" max="3840x2160" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" range="1-243000" />
-            <Limit name="bitrate" range="1-15000000" />
+            <Limit name="blocks-per-second" range="1-972000" />
+            <Limit name="bitrate" range="1-40000000" />
         </MediaCodec>
     </Encoders>
+
     <Decoders>
         <MediaCodec name="OMX.Intel.hw_vd.h264" type="video/avc" >
             <!-- profiles and levels:  ProfileBaseline : Level51 -->
@@ -97,6 +98,32 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-40000000" />
             <Feature name="adaptive-playback" />
         </MediaCodec>
+        <MediaCodec name="OMX.Intel.hw_vd.h264.secure" type="video/avc">
+            <!-- profiles and levels:  ProfileBaseline : Level51 -->
+            <Limit name="size" min="64x64" max="3840x2160" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" range="1-972000" />
+            <Limit name="bitrate" range="1-40000000" />
+            <Feature name="adaptive-playback" />
+            <Feature name="secure-playback" required="true" />
+        </MediaCodec>
+        <MediaCodec name="OMX.Intel.hw_vd.vp8" type="video/x-vnd.on2.vp8" >
+            <Limit name="size" min="64x64" max="3840x2160" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" range="1-972000" />
+            <Limit name="bitrate" range="1-40000000" />
+            <Feature name="adaptive-playback" />
+        </MediaCodec>
+        <MediaCodec name="OMX.Intel.hw_vd.vp9" type="video/x-vnd.on2.vp9" >
+            <Limit name="size" min="64x64" max="3840x2160" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" range="1-972000" />
+            <Limit name="bitrate" range="1-40000000" />
+            <Feature name="adaptive-playback" />
+        </MediaCodec>
         <MediaCodec name="OMX.Intel.hw_vd.h265" type="video/hevc" >
             <Limit name="size" min="64x64" max="3840x2160" />
             <Limit name="alignment" value="2x2" />
@@ -107,7 +134,6 @@ Only the three quirks included above are recognized at this point:
         </MediaCodec>
     </Decoders>
 
-
     <Include href="media_codecs_google_video.xml" />
     <Include href="media_codecs_google_audio.xml" />
     <Settings>
diff --git a/common/media/media_codecs_performance.xml b/common/media/media_codecs_performance.xml
index 1ae406492..319825a09 100644
--- a/common/media/media_codecs_performance.xml
+++ b/common/media/media_codecs_performance.xml
@@ -17,88 +17,100 @@
 <MediaCodecs>
     <Decoders>
         <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="500-600" />
-            <Limit name="measured-frame-rate-352x288" range="300-310" />
+            <Limit name="measured-frame-rate-176x144" range="600-800" />
         </MediaCodec>
         <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="300-310" />
-            <Limit name="measured-frame-rate-720x480" range="100-110" />
-            <Limit name="measured-frame-rate-1280x720" range="40-50" />
-            <Limit name="measured-frame-rate-1920x1080" range="15-16" />
+            <Limit name="measured-frame-rate-320x240" range="530-590" />
+            <Limit name="measured-frame-rate-720x480" range="170-190" />
+            <Limit name="measured-frame-rate-1280x720" range="50-55" />
+            <Limit name="measured-frame-rate-1920x1080" range="20-22" />
         </MediaCodec>
         <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="300-350" />
-            <Limit name="measured-frame-rate-640x360" range="200-210" />
-            <Limit name="measured-frame-rate-720x480" range="200-210" />
-            <Limit name="measured-frame-rate-1280x720" range="60-70" />
-            <Limit name="measured-frame-rate-1920x1080" range="30-40" />
+            <Limit name="measured-frame-rate-352x288" range="450-510" />
+            <Limit name="measured-frame-rate-640x360" range="200-220" />
+            <Limit name="measured-frame-rate-720x480" range="170-190" />
+            <Limit name="measured-frame-rate-1280x720" range="70-80" />
+            <Limit name="measured-frame-rate-1920x1080" range="40-50" />
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="700-750" />
+            <Limit name="measured-frame-rate-176x144" range="600-800" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="450-460" />
-            <Limit name="measured-frame-rate-640x360" range="200-210" />
-            <Limit name="measured-frame-rate-1280x720" range="40-50" />
-            <Limit name="measured-frame-rate-1920x1080" range="20-25" />
+            <Limit name="measured-frame-rate-320x180" range="860-930" />
+            <Limit name="measured-frame-rate-640x360" range="290-320" />
+            <Limit name="measured-frame-rate-1280x720" range="65-70" />
+            <Limit name="measured-frame-rate-1920x1080" range="25-30" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
-            <Limit name="measured-frame-rate-320x180" range="220-484" />
-            <Limit name="measured-frame-rate-640x360" range="180-190" />
-            <Limit name="measured-frame-rate-1280x720" range="60-70" />
-            <Limit name="measured-frame-rate-1920x1080" range="40-50" />
+            <Limit name="measured-frame-rate-320x180" range="530-600" />
+            <Limit name="measured-frame-rate-640x360" range="220-240" />
+            <Limit name="measured-frame-rate-1280x720" range="80-100" />
+            <Limit name="measured-frame-rate-1920x1080" range="45-55" />
         </MediaCodec>
         <MediaCodec name="OMX.Intel.hw_vd.h264" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="280-300" />
-            <Limit name="measured-frame-rate-720x480" range="300-310" />
-            <Limit name="measured-frame-rate-1280x720" range="305-320" />
-            <Limit name="measured-frame-rate-1920x1088" range="750-1310" />
+            <Limit name="measured-frame-rate-320x240" range="740-980" />
+            <Limit name="measured-frame-rate-720x480" range="830-1020" />
+            <Limit name="measured-frame-rate-1280x720" range="460-590" />
+            <Limit name="measured-frame-rate-1920x1088" range="320-360" />
         </MediaCodec>
         <MediaCodec name="OMX.Intel.hw_vd.h265" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="500-720" />
-            <Limit name="measured-frame-rate-640x360" range="500-600" />
-            <Limit name="measured-frame-rate-720x480" range="640-810" />
-            <Limit name="measured-frame-rate-1280x720" range="600-2180" />
-            <Limit name="measured-frame-rate-1920x1080" range="320-330" />
-            <Limit name="measured-frame-rate-3840x2160" range="70-80" />
+            <Limit name="measured-frame-rate-352x288" range="1200-1250" />
+            <Limit name="measured-frame-rate-640x360" range="1000-1400" />
+            <Limit name="measured-frame-rate-720x480" range="820-1020" />
+            <Limit name="measured-frame-rate-1280x720" range="540-580" />
+            <Limit name="measured-frame-rate-1920x1080" range="430-470" />
+            <Limit name="measured-frame-rate-3840x2160" range="120-130" />
         </MediaCodec>
         <MediaCodec name="OMX.Intel.hw_vd.vp8" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x240" range="820-860" />
-            <Limit name="measured-frame-rate-640x360" range="1500-2590" />
-            <Limit name="measured-frame-rate-1280x720" range="880-1020" />
-            <Limit name="measured-frame-rate-1920x1080" range="240-300" />
+            <Limit name="measured-frame-rate-320x180" range="1230-1340" />
+            <Limit name="measured-frame-rate-640x360" range="600-620" />
+            <Limit name="measured-frame-rate-1280x720" range="560-600" />
+            <Limit name="measured-frame-rate-1920x1080" range="270-330" />
+        </MediaCodec>
+        <MediaCodec name="OMX.Intel.hw_vd.vp9" type="video/x-vnd.on2.vp9" update="true">
+            <Limit name="measured-frame-rate-320x180" range="1300-1800" />
+            <Limit name="measured-frame-rate-640x360" range="500-540" />
+            <Limit name="measured-frame-rate-1280x720" range="560-590" />
+            <Limit name="measured-frame-rate-1920x1080" range="350-420" />
+            <Limit name="measured-frame-rate-3840x2160" range="100-130" />
         </MediaCodec>
     </Decoders>
     <Encoders>
         <MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="200-250" />
-            <Limit name="measured-frame-rate-720x480" range="80-100" />
-            <Limit name="measured-frame-rate-1280x720" range="30-40" />
-            <Limit name="measured-frame-rate-1920x1080" range="10-20" />
+            <Limit name="measured-frame-rate-320x240" range="450-530" />
+            <Limit name="measured-frame-rate-720x480" range="150-170" />
+            <Limit name="measured-frame-rate-1280x720" range="65-75" />
+            <Limit name="measured-frame-rate-1920x1080" range="30-35" />
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="350-360" />
+            <Limit name="measured-frame-rate-176x144" range="710-1905" />
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="350-360" />
+            <Limit name="measured-frame-rate-176x144" range="750-2025" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="60-70" />
-            <Limit name="measured-frame-rate-640x360" range="40-50" />
-            <Limit name="measured-frame-rate-1280x720" range="20-30" />
-            <Limit name="measured-frame-rate-1920x1080" range="10-20" />
+            <Limit name="measured-frame-rate-320x180" range="120-680" />
+            <Limit name="measured-frame-rate-640x360" range="95-280" />
+            <Limit name="measured-frame-rate-1280x720" range="32-38" />
+            <Limit name="measured-frame-rate-1920x1080" range="22-25" />
+        </MediaCodec>
+        <MediaCodec name="OMX.google.vp9.encoder" type="video/x-vnd.on2.vp9" update="true">
+            <Limit name="measured-frame-rate-320x180" range="220-560" />
+            <Limit name="measured-frame-rate-640x360" range="180-195" />
+            <Limit name="measured-frame-rate-1280x720" range="40-50" />
         </MediaCodec>
         <MediaCodec name="OMX.Intel.hw_ve.h264" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="190-200" />
-            <Limit name="measured-frame-rate-720x480" range="180-200" />
-            <Limit name="measured-frame-rate-1280x720" range="80-90" />
-            <Limit name="measured-frame-rate-1920x1080" range="20-35" />
-        </MediaCodec>
-        <MediaCodec name="OMX.Intel.hw_ve.vp8" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="170-180" />
-            <Limit name="measured-frame-rate-640x360" range="70-90" />
-            <Limit name="measured-frame-rate-1280x720" range="30-35" />
-            <Limit name="measured-frame-rate-1920x1080" range="25-35" />
+            <Limit name="measured-frame-rate-320x240" range="260-300" />
+            <Limit name="measured-frame-rate-720x480" range="140-160" />
+            <Limit name="measured-frame-rate-1280x720" range="75-110" />
+            <Limit name="measured-frame-rate-1920x1080" range="50-55" />
+        </MediaCodec>
+        <MediaCodec name="OMX.Intel.hw_ve.h265" type="video/hevc" update="true">
+            <Limit name="measured-frame-rate-320x240" range="100-180" />
+            <Limit name="measured-frame-rate-720x480" range="120-160" />
+            <Limit name="measured-frame-rate-1280x720" range="70-90" />
+            <Limit name="measured-frame-rate-1920x1080" range="35-45" />
+            <Limit name="measured-frame-rate-3840x2160" range="10-14" />
         </MediaCodec>
     </Encoders>
 </MediaCodecs>

From a0e5172959f9904ad2dda00b976bf113c64fa8fa Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 12 Apr 2018 17:52:07 +0530
Subject: [PATCH 230/427] [AIA-O] Mixinup "Enable trusty secure storage
 feature"

Jira: None
Test: None
---
 androidia_64/device.mk  | 5 ++++-
 androidia_64/init.rc    | 9 +++++++++
 androidia_64/ueventd.rc | 4 ++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 0cebcf1e6..7e93b69f1 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -551,7 +551,10 @@ PRODUCT_PACKAGES += \
 endif
 
 PRODUCT_PACKAGES += \
-	libtrusty
+	libtrusty \
+	storageproxyd \
+	libtrustystorage \
+	libtrustystorageinterface \
 
 ##############################################################
 # Source: device/intel/mixins/groups/memtrack/true/product.mk
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 40e7639b1..6c80d16e8 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -632,6 +632,15 @@ on fs
     chown system system /dev/trusty-ipc-dev0
     chmod 666 /dev/trusty-ipc-dev0
 
+on post-fs-data
+    mkdir /data/misc/securestorage 0700 system system
+    chmod 666 /dev/rpmb0
+
+service storageproxyd /vendor/bin/storageproxyd -d /dev/trusty-ipc-dev0 -p /data/misc/securestorage -r /dev/rpmb0
+    class late_start
+    user root
+    group root
+
 ##############################################################
 # Source: device/intel/mixins/groups/debug-kernel/default/init.rc
 ##############################################################
diff --git a/androidia_64/ueventd.rc b/androidia_64/ueventd.rc
index a705fa6ec..eb3010b50 100644
--- a/androidia_64/ueventd.rc
+++ b/androidia_64/ueventd.rc
@@ -78,6 +78,10 @@
 # i915 backlight driver
 /sys/devices/pci0000:00/0000:00:02.0/drm/card*/card*/intel_backlight brightness 0644 system system
 ##############################################################
+# Source: device/intel/mixins/groups/trusty/true/ueventd.rc
+##############################################################
+/dev/block/pci/pci0000:00/0000:00:*.0/by-name/teedata      0660 system system
+##############################################################
 # Source: device/intel/mixins/groups/camera/usbcamera/ueventd.rc
 ##############################################################
 # Camera

From d3d41405e4dbfca10093acce1ddf8f90e6bf7515 Mon Sep 17 00:00:00 2001
From: swei22 <w.sheng@intel.com>
Date: Mon, 9 Apr 2018 17:05:39 +0800
Subject: [PATCH 231/427] Enable simulation RPMB

Enable simulation RPMB.
Set sepolicy for teedata partition and storageproxyd.

Jira: None
Test: Device boots to home screen.
Signed-off-by: swei22 <w.sheng@intel.com>
---
 androidia_64/mixins.spec                    | 2 +-
 sepolicy/boot-arch/android_ia/file_contexts | 1 +
 sepolicy/boot-arch/efi/file_contexts        | 1 +
 sepolicy/trusty/file_contexts               | 3 +--
 sepolicy/trusty/storageproxyd.te            | 4 ++--
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index 36a4029c8..9ff1fd5e9 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -19,7 +19,7 @@ usb-gadget: g_ffs
 adb_net: true
 kernel: android_ia(loglevel=3, disable_cpuidle_on_boot=true)
 bluetooth: btusb
-boot-arch: android_ia(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true)
+boot-arch: android_ia(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true)
 audio: android_ia
 wlan: iwlwifi
 cpu-arch: skl
diff --git a/sepolicy/boot-arch/android_ia/file_contexts b/sepolicy/boot-arch/android_ia/file_contexts
index db3f7509d..765d9971c 100644
--- a/sepolicy/boot-arch/android_ia/file_contexts
+++ b/sepolicy/boot-arch/android_ia/file_contexts
@@ -9,6 +9,7 @@
 /dev/block/(pci|platform)(/.*)?/.*/by-name/cache      u:object_r:cache_block_device:s0
 /dev/block/(pci|platform)(/.*)?/.*/by-name/data       u:object_r:userdata_block_device:s0
 /dev/block/(pci|platform)(/.*)?/.*/by-name/misc       u:object_r:misc_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/teedata    u:object_r:tee_device:s0
 
 /file_contexts.bin           u:object_r:rootfs:s0
 /metadata                    u:object_r:rootfs:s0
diff --git a/sepolicy/boot-arch/efi/file_contexts b/sepolicy/boot-arch/efi/file_contexts
index 809a4aaf3..c551f4311 100644
--- a/sepolicy/boot-arch/efi/file_contexts
+++ b/sepolicy/boot-arch/efi/file_contexts
@@ -9,3 +9,4 @@
 /dev/block/(pci|platform)(/.*)?/.*/by-name/cache      u:object_r:cache_block_device:s0
 /dev/block/(pci|platform)(/.*)?/.*/by-name/data       u:object_r:userdata_block_device:s0
 /dev/block/(pci|platform)(/.*)?/.*/by-name/misc       u:object_r:misc_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/teedata    u:object_r:tee_device:s0
diff --git a/sepolicy/trusty/file_contexts b/sepolicy/trusty/file_contexts
index c91d78174..9ffa80720 100644
--- a/sepolicy/trusty/file_contexts
+++ b/sepolicy/trusty/file_contexts
@@ -3,7 +3,6 @@
 # Trusty rpmb device
 /dev/rpmb[01]           u:object_r:tee_device:s0
 
-/system/vendor/bin/intelstorageproxyd    u:object_r:tee_exec:s0
-/vendor/bin/intelstorageproxyd    u:object_r:tee_exec:s0
+/vendor/bin/storageproxyd    u:object_r:tee_exec:s0
 
 /data/misc/securestorage(/.*)?    u:object_r:tee_data_file:s0
diff --git a/sepolicy/trusty/storageproxyd.te b/sepolicy/trusty/storageproxyd.te
index 9c2a4a1df..98e268b85 100644
--- a/sepolicy/trusty/storageproxyd.te
+++ b/sepolicy/trusty/storageproxyd.te
@@ -1,9 +1,9 @@
-# intelstorageproxyd is a daemon of secure storage to do operations on rpmb,
+# storageproxyd is a daemon of secure storage to do operations on rpmb,
 # which is a partition of eMMC, and provides encrypted and tamper proof
 # storage to secure apps. storageproxyd service receives cmds from trusty
 # storage app to execute read/write on rpmb and gives responses to trusty.
 
-# intelstorageproxyd requires sys_rawio permission to call ioctl to execute
+# storageproxyd requires sys_rawio permission to call ioctl to execute
 # read/write operations on /dev/rpmb*, which is in tee domain.
 
 allow tee self:capability { sys_rawio };

From 28d8104f9c02e75c0091085328bb558a85d094f3 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 12 Apr 2018 17:55:17 +0530
Subject: [PATCH 232/427] [AIA-O] Mixinup "Enable simulation RPMB"

Jira: None
Test: None
---
 androidia_64/BoardConfig.mk | 1 +
 androidia_64/gpt.ini        | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/androidia_64/BoardConfig.mk b/androidia_64/BoardConfig.mk
index b05e06d8b..b34d7ccca 100644
--- a/androidia_64/BoardConfig.mk
+++ b/androidia_64/BoardConfig.mk
@@ -284,6 +284,7 @@ endif
 KERNELFLINGER_ASSUME_BIOS_SECURE_BOOT := true
 
 
+KERNELFLINGER_USE_RPMB_SIMULATE := true
 
 ##############################################################
 # Source: device/intel/mixins/groups/audio/android_ia/BoardConfig.mk
diff --git a/androidia_64/gpt.ini b/androidia_64/gpt.ini
index 279f392d2..270d78bfa 100644
--- a/androidia_64/gpt.ini
+++ b/androidia_64/gpt.ini
@@ -4,7 +4,7 @@
 # Source: device/intel/mixins/groups/boot-arch/android_ia/gpt.ini
 ##############################################################
 [base]
-partitions = bootloader bootloader2 boot  misc metadata system persistent vendor config factory tos vbmeta  data
+partitions = bootloader bootloader2 boot  misc metadata system persistent vendor config factory tos vbmeta teedata data
 device = auto
 nb_slot = 2
 
@@ -97,4 +97,10 @@ has_slot = true
 # Randum generate a guid
 guid = 7ced364c-3b5a-4eba-9f5c-9fef1327cb50
 
+[partition.teedata]
+label = teedata
+len = 32
+type = linux
+# Randum generate a guid
+guid = f0c8e9aa-57f6-4155-8aef-4e0549217563
 # ------------------ END MIX-IN DEFINITIONS ------------------

From 6bbd48b756773cd95aa6fd3e0d6e33a772b59fc6 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Tue, 17 Apr 2018 10:36:10 +0530
Subject: [PATCH 233/427] [AIA-O] Mixinup "Enable trusty hardware gatekeeper
 feature"

Jira: None
Test: None
---
 androidia_64/device.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 7e93b69f1..25868a12f 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -555,6 +555,12 @@ PRODUCT_PACKAGES += \
 	storageproxyd \
 	libtrustystorage \
 	libtrustystorageinterface \
+	gatekeeper.trusty \
+	android.hardware.gatekeeper@1.0-impl \
+	android.hardware.gatekeeper@1.0-service
+
+PRODUCT_PROPERTY_OVERRIDES += \
+	ro.hardware.gatekeeper=trusty
 
 ##############################################################
 # Source: device/intel/mixins/groups/memtrack/true/product.mk

From d9286b5295c54c5789f5520cec25b3c5b92077b6 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Mon, 23 Apr 2018 14:39:57 +0530
Subject: [PATCH 234/427] [AIA-O] Mixinup usb-gadget: Add adb_keys to enable
 secure adb

Jira: None
Test: None
---
 androidia_64/device.mk | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 25868a12f..0d123b548 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -266,6 +266,28 @@ PRODUCT_PROPERTY_OVERRIDES += \
 ##############################################################
 # Do not remove this file. Unable to update mixins without this.
 ##############################################################
+# Source: device/intel/mixins/groups/usb-gadget/g_ffs/product.mk
+##############################################################
+# Set default USB interface
+USB_CONFIG := mtp
+ifeq ($(TARGET_BUILD_VARIANT),user)
+# Enable Secure Debugging
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.adb.secure=1
+ifeq ($(BUILD_FOR_CTS_AUTOMATION),true)
+# Build for automated CTS
+USB_CONFIG := $(USB_CONFIG),adb
+PRODUCT_COPY_FILES += device/intel/common/usb-gadget/adb_keys:root/adb_keys
+endif #BUILD_FOR_CTS_AUTOMATION == true
+endif #TARGET_BUILD_VARIANT == user
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.sys.usb.config=$(USB_CONFIG)
+
+# Add Intel adb keys for userdebug/eng builds
+ifneq ($(TARGET_BUILD_VARIANT),user)
+# Enable Secure Debugging
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.adb.secure=1
+PRODUCT_COPY_FILES += device/intel/common/usb-gadget/adb_keys:root/adb_keys
+endif
+##############################################################
 # Source: device/intel/mixins/groups/adb_net/true/product.mk
 ##############################################################
 # Enable Secure Debugging

From 9cdce037a71cbb2d1d0aaaa3fa17a3e6d796dba1 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 26 Apr 2018 14:12:45 +0530
Subject: [PATCH 235/427] [AIA-O] Mixinup "Include avbctl to PRODUCT_PACKAGES"

Jira: None
Test: None
---
 androidia_64/device.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/androidia_64/device.mk b/androidia_64/device.mk
index 0d123b548..acd8e3e6c 100644
--- a/androidia_64/device.mk
+++ b/androidia_64/device.mk
@@ -343,6 +343,11 @@ PRODUCT_PACKAGES += \
 # create primary storage symlink dynamically
 PRODUCT_PACKAGES += set_storage
 ##############################################################
+# Source: device/intel/mixins/groups/avb/true/product.mk
+##############################################################
+
+PRODUCT_PACKAGES += avbctl
+##############################################################
 # Source: device/intel/mixins/groups/vendor-partition/true/product.mk
 ##############################################################
 PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/by-name/vendor

From a6d0ea0b73bd3bd5a063a96aa17a5bfac0760582 Mon Sep 17 00:00:00 2001
From: saranya <saranya.gopal@intel.com>
Date: Mon, 16 Apr 2018 15:07:25 +0530
Subject: [PATCH 236/427] GlobalActions: Add 'sleep' option

This patch adds 'sleep' option to the
global menu that shows up on power key press.

Change-Id: I153db8487faf2e4517f3a83c4d03f23478e6662a
Tracked-On:
Signed-off-by: saranya <saranya.gopal@intel.com>
---
 .../frameworks/base/core/res/res/values/config.xml        | 8 +++++++-
 .../frameworks/base/core/res/res/values/strings.xml       | 4 ++++
 .../frameworks/base/core/res/res/values/symbols.xml       | 3 +++
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 common/overlay/frameworks/base/core/res/res/values/strings.xml
 create mode 100644 common/overlay/frameworks/base/core/res/res/values/symbols.xml

diff --git a/common/overlay/frameworks/base/core/res/res/values/config.xml b/common/overlay/frameworks/base/core/res/res/values/config.xml
index 11e17ed6f..1c224bf8c 100644
--- a/common/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/common/overlay/frameworks/base/core/res/res/values/config.xml
@@ -84,5 +84,11 @@
 
     <!-- Flag indicating whether round icons should be parsed from the application manifest. -->
     <bool name="config_useRoundIcon">true</bool>
-
+    <string-array translatable="false" name="config_globalActionsList">
+        <item>power</item>
+        <item>restart</item>
+        <item>sleep</item>
+        <item>bugreport</item>
+        <item>users</item>
+    </string-array>
 </resources>
diff --git a/common/overlay/frameworks/base/core/res/res/values/strings.xml b/common/overlay/frameworks/base/core/res/res/values/strings.xml
new file mode 100644
index 000000000..1a72797dc
--- /dev/null
+++ b/common/overlay/frameworks/base/core/res/res/values/strings.xml
@@ -0,0 +1,4 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<add-resource type="string" name="global_action_sleep"></add-resource>
+<string name="global_action_sleep" translatable="false">Sleep</string>
+</resources>
diff --git a/common/overlay/frameworks/base/core/res/res/values/symbols.xml b/common/overlay/frameworks/base/core/res/res/values/symbols.xml
new file mode 100644
index 000000000..a91dfbec6
--- /dev/null
+++ b/common/overlay/frameworks/base/core/res/res/values/symbols.xml
@@ -0,0 +1,3 @@
+<resources>
+<java-symbol type="string" name="global_action_sleep"/>
+</resources>

From 2152db9780f8879bc56ac58f2ec99e77b832bcee Mon Sep 17 00:00:00 2001
From: "ji, zhenlong z" <zhenlong.z.ji@intel.com>
Date: Mon, 16 Apr 2018 15:55:38 +0800
Subject: [PATCH 237/427] Enable FBE on AIA

Jira: None
Test: Device can boot to UI successfully.

Signed-off-by: ji, zhenlong z <zhenlong.z.ji@intel.com>
---
 androidia_64/mixins.spec          | 2 +-
 kernel_config/kernel_64_defconfig | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/androidia_64/mixins.spec b/androidia_64/mixins.spec
index 9ff1fd5e9..620d860a4 100644
--- a/androidia_64/mixins.spec
+++ b/androidia_64/mixins.spec
@@ -19,7 +19,7 @@ usb-gadget: g_ffs
 adb_net: true
 kernel: android_ia(loglevel=3, disable_cpuidle_on_boot=true)
 bluetooth: btusb
-boot-arch: android_ia(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true)
+boot-arch: android_ia(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true)
 audio: android_ia
 wlan: iwlwifi
 cpu-arch: skl
diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 5add68554..a1715a70f 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -6770,7 +6770,8 @@ CONFIG_EXT3_FS_SECURITY=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_ENCRYPTION is not set
+CONFIG_EXT4_ENCRYPTION=y
+CONFIG_EXT4_FS_ENCRYPTION=y
 # CONFIG_EXT4_DEBUG is not set
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
@@ -6814,7 +6815,7 @@ CONFIG_EXPORTFS=m
 # CONFIG_EXPORTFS_BLOCK_OPS is not set
 CONFIG_FILE_LOCKING=y
 CONFIG_MANDATORY_FILE_LOCKING=y
-# CONFIG_FS_ENCRYPTION is not set
+CONFIG_FS_ENCRYPTION=y
 CONFIG_FSNOTIFY=y
 # CONFIG_DNOTIFY is not set
 CONFIG_INOTIFY_USER=y
@@ -7350,7 +7351,7 @@ CONFIG_CRYPTO_ECHAINIV=y
 #
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_CTR=y
-# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_LRW=y
 CONFIG_CRYPTO_PCBC=m

From 7d7bb69088a9c8a41a800f0310973f38515d3cdd Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 26 Apr 2018 15:39:38 +0530
Subject: [PATCH 238/427] [AIA-O] Mixinup "ENabe FBE"

Jira: None
Test: None
---
 androidia_64/fstab   | 2 +-
 androidia_64/init.rc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/androidia_64/fstab b/androidia_64/fstab
index ffdb88dfb..3a902bc08 100644
--- a/androidia_64/fstab
+++ b/androidia_64/fstab
@@ -38,7 +38,7 @@
 
 # If enable AVB and A/B slot, then will mount system partition as / through /dev/dm-0
 /dev/block/by-name/system       /               ext4    ro                                                          wait,slotselect,avb
-/dev/block/by-name/data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,forceencrypt=/dev/block/by-name/metadata,quota
+/dev/block/by-name/data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts,quota
 /dev/block/by-name/boot         /boot           emmc    defaults                                                    defaults,slotselect,avb
 /dev/block/by-name/misc         /misc           emmc    defaults                                                    defaults
 /dev/block/by-name/bootloader   /bootloader     emmc    defaults                                                    recoveryonly
diff --git a/androidia_64/init.rc b/androidia_64/init.rc
index 6c80d16e8..c47a43388 100644
--- a/androidia_64/init.rc
+++ b/androidia_64/init.rc
@@ -132,7 +132,7 @@ on init
     chown system system /sys/class/backlight/acpi_video0/brightness
     write /sys/fs/selinux/enforce 0
 
-on post-fs
+on post-fs-data
    #setprop debug.sf.nobootanimation 1
    mkdir /data/system 0770 system system
 

From a32961e42eb680e63b67b3cf9c1eca90e33efac7 Mon Sep 17 00:00:00 2001
From: karanx <karanx.bhagoji@intel.com>
Date: Wed, 25 Apr 2018 11:45:49 +0530
Subject: [PATCH 239/427] [AIA-O] Patch to enable TypeC in v4.14.33

The type stopped working after kernel rebase to
4.14.33. Additional configs were need to enable
the USB dual role phy, which this patch intro-
duces into the kernel. With these changes the
TypeC connector works fine.

Jira: None
Test: Boot and check with Type C OTG cable,
keyword, mouse and memory stick.

Signed-off-by: Karan889 <karanx.bhagoji@intel.com>
Signed-off-by: Abhilash K V <abhilash.k.v@intel.com>
---
 kernel_config/kernel_64_defconfig | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index a1715a70f..d7c0891db 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -682,6 +682,7 @@ CONFIG_ACPI_APEI=y
 # CONFIG_DPTF_POWER is not set
 CONFIG_PMIC_OPREGION=y
 CONFIG_CRC_PMIC_OPREGION=y
+CONFIG_BXT_WC_PMIC_OPREGION=y
 # CONFIG_ACPI_CONFIGFS is not set
 # CONFIG_SFI is not set
 
@@ -3702,7 +3703,7 @@ CONFIG_MFD_CROS_EC_I2C=m
 CONFIG_LPC_ICH=m
 CONFIG_LPC_SCH=m
 CONFIG_INTEL_SOC_PMIC=y
-# CONFIG_INTEL_SOC_PMIC_BXTWC is not set
+CONFIG_INTEL_SOC_PMIC_BXTWC=y
 # CONFIG_INTEL_SOC_PMIC_CHTWC is not set
 CONFIG_MFD_INTEL_LPSS=y
 CONFIG_MFD_INTEL_LPSS_ACPI=m
@@ -5332,7 +5333,7 @@ CONFIG_USB_DEFAULT_PERSIST=y
 CONFIG_USB_OTG=y
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_OTG_FSM is not set
+CONFIG_USB_OTG_FSM=y
 # CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
 CONFIG_USB_MON=y
 # CONFIG_USB_WUSB_CBAF is not set
@@ -5422,7 +5423,7 @@ CONFIG_USB_DWC3_GADGET=y
 #
 CONFIG_USB_DWC3_PCI=y
 CONFIG_USB_DWC3_OF_SIMPLE=m
-CONFIG_USB_DWC2=m
+CONFIG_USB_DWC2=y
 # CONFIG_USB_DWC2_HOST is not set
 
 #
@@ -5430,7 +5431,7 @@ CONFIG_USB_DWC2=m
 #
 # CONFIG_USB_DWC2_PERIPHERAL is not set
 CONFIG_USB_DWC2_DUAL_ROLE=y
-CONFIG_USB_DWC2_PCI=m
+CONFIG_USB_DWC2_PCI=y
 # CONFIG_USB_DWC2_DEBUG is not set
 # CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
 # CONFIG_USB_CHIPIDEA is not set
@@ -5532,9 +5533,10 @@ CONFIG_USB_EZUSB_FX2=m
 #
 CONFIG_USB_PHY=y
 CONFIG_USB_OTG_WAKELOCK=y
-CONFIG_NOP_USB_XCEIV=m
+CONFIG_NOP_USB_XCEIV=y
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_ISP1301 is not set
+CONFIG_USB_INTEL_DUAL_ROLE_PHY=y
 # CONFIG_DUAL_ROLE_USB_INTF is not set
 CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
@@ -5618,7 +5620,10 @@ CONFIG_USB_G_WEBCAM=m
 #
 # USB Power Delivery and Type-C drivers
 #
-# CONFIG_TYPEC_UCSI is not set
+CONFIG_TYPEC=y
+CONFIG_TYPEC_WCOVE=y
+CONFIG_TYPEC_UCSI=y
+# CONFIG_UCSI_ACPI is not set
 # CONFIG_USB_LED_TRIG is not set
 # CONFIG_USB_ULPI_BUS is not set
 # CONFIG_UWB is not set
@@ -6284,6 +6289,7 @@ CONFIG_EXTCON_SM5502=m
 CONFIG_EXTCON_USB_GPIO=m
 # CONFIG_EXTCON_USBC_CROS_EC is not set
 # CONFIG_EXTCON_INTEL_USB is not set
+CONFIG_EXTCON_INTEL_USB=y
 # CONFIG_MEMORY is not set
 CONFIG_IIO=m
 CONFIG_IIO_BUFFER=y

From ff0f03c153c3d04fc265e47c25af3ca73e882d48 Mon Sep 17 00:00:00 2001
From: swaroopb <swaroop.balan@intel.com>
Date: Mon, 30 Apr 2018 10:19:49 +0530
Subject: [PATCH 240/427] [CELADON] Replace AIA to Celadon

Jira: None
Test: None

Signed-off-by: swaroopb <swaroop.balan@intel.com>
---
 androidia_64/AndroidProducts.mk               |   2 -
 androidia_64/androidia_64.mk                  |  10 ----
 androidia_64/vendorsetup.sh                   |   6 --
 {androidia_64 => celadon}/AndroidBoard.mk     |  16 +++---
 celadon/AndroidProducts.mk                    |   2 +
 {androidia_64 => celadon}/BoardConfig.mk      |  52 ++++++++---------
 celadon/celadon.mk                            |  12 ++++
 {androidia_64 => celadon}/device.mk           |  54 +++++++++---------
 {androidia_64 => celadon}/dptf.dv             | Bin
 {androidia_64 => celadon}/efivar_oemlock      | Bin
 {androidia_64 => celadon}/flash.json          |   2 +-
 {androidia_64 => celadon}/flashfiles.ini      |   0
 {androidia_64 => celadon}/fstab               |   2 +-
 {androidia_64 => celadon}/gpt.ini             |   4 +-
 {androidia_64 => celadon}/hwc-valsetup.sh     |   0
 {androidia_64 => celadon}/init.coredump.rc    |   0
 {androidia_64 => celadon}/init.crashlogd.rc   |   0
 {androidia_64 => celadon}/init.kernel.rc      |   0
 {androidia_64 => celadon}/init.logs.rc        |   0
 {androidia_64 => celadon}/init.rc             |   8 +--
 {androidia_64 => celadon}/init.recovery.rc    |   2 +-
 {androidia_64 => celadon}/installer.cmd       |   2 +-
 {androidia_64 => celadon}/mixins.spec         |  12 ++--
 {androidia_64 => celadon}/oemvars.txt         |   2 +-
 {androidia_64 => celadon}/startup.nsh         |   2 +-
 {androidia_64 => celadon}/ueventd.rc          |   6 +-
 {androidia_64 => celadon}/unlock_device.nsh   |   2 +-
 celadon/vendorsetup.sh                        |   6 ++
 common/audio/AndroidBoard.mk                  |   6 +-
 kernel_config/kernel_64_defconfig             |   4 +-
 patches/patch-aosp.sh                         |   2 +-
 .../audioserver.te                            |   0
 .../hal_audio_default.te                      |   0
 .../file_contexts                             |   2 +-
 .../{android_ia => project-celadon}/init.te   |   0
 .../{android_ia => project-celadon}/adbd.te   |   0
 .../appdomain.te                              |   0
 .../bootanim.te                               |   0
 .../{android_ia => project-celadon}/file.te   |   0
 .../file_contexts                             |   0
 .../hal_graphics_allocator_default.te         |   0
 .../hal_graphics_composer_default.te          |   0
 .../mediacodec.te                             |   0
 .../mediadrmserver.te                         |   0
 .../mediaextractor.te                         |   0
 .../mediaserver.te                            |   0
 .../platform_app.te                           |   0
 .../surfaceflinger.te                         |   0
 .../system_server.te                          |   0
 .../ueventd.te                                |   0
 .../vndservice.te                             |   0
 .../vndservice_contexts                       |   0
 52 files changed, 110 insertions(+), 108 deletions(-)
 delete mode 100644 androidia_64/AndroidProducts.mk
 delete mode 100644 androidia_64/androidia_64.mk
 delete mode 100644 androidia_64/vendorsetup.sh
 rename {androidia_64 => celadon}/AndroidBoard.mk (96%)
 create mode 100644 celadon/AndroidProducts.mk
 rename {androidia_64 => celadon}/BoardConfig.mk (90%)
 create mode 100644 celadon/celadon.mk
 rename {androidia_64 => celadon}/device.mk (93%)
 rename {androidia_64 => celadon}/dptf.dv (100%)
 rename {androidia_64 => celadon}/efivar_oemlock (100%)
 rename {androidia_64 => celadon}/flash.json (99%)
 rename {androidia_64 => celadon}/flashfiles.ini (100%)
 rename {androidia_64 => celadon}/fstab (98%)
 rename {androidia_64 => celadon}/gpt.ini (95%)
 rename {androidia_64 => celadon}/hwc-valsetup.sh (100%)
 rename {androidia_64 => celadon}/init.coredump.rc (100%)
 rename {androidia_64 => celadon}/init.crashlogd.rc (100%)
 rename {androidia_64 => celadon}/init.kernel.rc (100%)
 rename {androidia_64 => celadon}/init.logs.rc (100%)
 rename {androidia_64 => celadon}/init.rc (99%)
 rename {androidia_64 => celadon}/init.recovery.rc (97%)
 rename {androidia_64 => celadon}/installer.cmd (90%)
 rename {androidia_64 => celadon}/mixins.spec (65%)
 rename {androidia_64 => celadon}/oemvars.txt (87%)
 rename {androidia_64 => celadon}/startup.nsh (81%)
 rename {androidia_64 => celadon}/ueventd.rc (95%)
 rename {androidia_64 => celadon}/unlock_device.nsh (80%)
 create mode 100644 celadon/vendorsetup.sh
 rename sepolicy/audio/{android_ia => project-celadon}/audioserver.te (100%)
 rename sepolicy/audio/{android_ia => project-celadon}/hal_audio_default.te (100%)
 rename sepolicy/boot-arch/{android_ia => project-celadon}/file_contexts (95%)
 rename sepolicy/boot-arch/{android_ia => project-celadon}/init.te (100%)
 rename sepolicy/graphics/{android_ia => project-celadon}/adbd.te (100%)
 rename sepolicy/graphics/{android_ia => project-celadon}/appdomain.te (100%)
 rename sepolicy/graphics/{android_ia => project-celadon}/bootanim.te (100%)
 rename sepolicy/graphics/{android_ia => project-celadon}/file.te (100%)
 rename sepolicy/graphics/{android_ia => project-celadon}/file_contexts (100%)
 rename sepolicy/graphics/{android_ia => project-celadon}/hal_graphics_allocator_default.te (100%)
 rename sepolicy/graphics/{android_ia => project-celadon}/hal_graphics_composer_default.te (100%)
 rename sepolicy/graphics/{android_ia => project-celadon}/mediacodec.te (100%)
 rename sepolicy/graphics/{android_ia => project-celadon}/mediadrmserver.te (100%)
 rename sepolicy/graphics/{android_ia => project-celadon}/mediaextractor.te (100%)
 rename sepolicy/graphics/{android_ia => project-celadon}/mediaserver.te (100%)
 rename sepolicy/graphics/{android_ia => project-celadon}/platform_app.te (100%)
 rename sepolicy/graphics/{android_ia => project-celadon}/surfaceflinger.te (100%)
 rename sepolicy/graphics/{android_ia => project-celadon}/system_server.te (100%)
 rename sepolicy/graphics/{android_ia => project-celadon}/ueventd.te (100%)
 rename sepolicy/graphics/{android_ia => project-celadon}/vndservice.te (100%)
 rename sepolicy/graphics/{android_ia => project-celadon}/vndservice_contexts (100%)

diff --git a/androidia_64/AndroidProducts.mk b/androidia_64/AndroidProducts.mk
deleted file mode 100644
index 693c57f03..000000000
--- a/androidia_64/AndroidProducts.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/androidia_64.mk
diff --git a/androidia_64/androidia_64.mk b/androidia_64/androidia_64.mk
deleted file mode 100644
index 331847c08..000000000
--- a/androidia_64/androidia_64.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-ENABLE_NATIVEBRIDGE_64BIT := true
-
-$(call inherit-product,$(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product,device/intel/android_ia/androidia_64/device.mk)
-
-# Overrides
-PRODUCT_NAME := androidia_64
-PRODUCT_BRAND := AndroidIA
-PRODUCT_DEVICE := androidia_64
-PRODUCT_MODEL := Generic androidia_64
diff --git a/androidia_64/vendorsetup.sh b/androidia_64/vendorsetup.sh
deleted file mode 100644
index c3feff4f9..000000000
--- a/androidia_64/vendorsetup.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-add_lunch_combo androidia_64-eng
-add_lunch_combo androidia_64-userdebug
-add_lunch_combo androidia_64-user
-
-
-. $('gettop')/device/intel/android_ia/androidia_64/hwc-valsetup.sh
diff --git a/androidia_64/AndroidBoard.mk b/celadon/AndroidBoard.mk
similarity index 96%
rename from androidia_64/AndroidBoard.mk
rename to celadon/AndroidBoard.mk
index 067145385..90c81da3a 100644
--- a/androidia_64/AndroidBoard.mk
+++ b/celadon/AndroidBoard.mk
@@ -1,7 +1,7 @@
 # ----------------- BEGIN MIX-IN DEFINITIONS -----------------
 # Mix-In definitions are auto-generated by mixin-update
 ##############################################################
-# Source: device/intel/mixins/groups/android_ia/default/AndroidBoard.mk
+# Source: device/intel/mixins/groups/project-celadon/default/AndroidBoard.mk
 ##############################################################
 droid: flashfiles
 	-$(hide) $(ACP) $(out_flashfiles) $(DIST_DIR)
@@ -17,18 +17,18 @@ make_dir_slot_ab:
 
 $(PRODUCT_OUT)/ramdisk.img: make_dir_slot_ab
 ##############################################################
-# Source: device/intel/mixins/groups/kernel/android_ia/AndroidBoard.mk
+# Source: device/intel/mixins/groups/kernel/project-celadon/AndroidBoard.mk
 ##############################################################
 ifneq ($(TARGET_PREBUILT_KERNEL),)
 $(error TARGET_PREBUILT_KERNEL defined but AndroidIA kernels build from source)
 endif
 
-TARGET_KERNEL_SRC ?= kernel/android_ia
+TARGET_KERNEL_SRC ?= kernel/project-celadon
 
 TARGET_KERNEL_ARCH := x86_64
 TARGET_KERNEL_CONFIG ?= kernel_64_defconfig
 
-KERNEL_CONFIG_DIR := device/intel/android_ia/kernel_config
+KERNEL_CONFIG_DIR := device/intel/project-celadon/kernel_config
 
 KERNEL_NAME := bzImage
 
@@ -48,7 +48,7 @@ build_kernel := $(MAKE) -C $(TARGET_KERNEL_SRC) \
 		$(if $(SHOW_COMMANDS),V=1) \
 		INSTALL_MOD_PATH=$(abspath "$(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)")
 
-KERNEL_CONFIG_FILE := device/intel/android_ia/kernel_config/$(TARGET_KERNEL_CONFIG)
+KERNEL_CONFIG_FILE := device/intel/project-celadon/kernel_config/$(TARGET_KERNEL_CONFIG)
 
 KERNEL_CONFIG := $(KERNEL_OUT)/.config
 $(KERNEL_CONFIG): $(KERNEL_CONFIG_FILE)
@@ -181,7 +181,7 @@ make_dir_ab_vendor:
 
 $(PRODUCT_OUT)/ramdisk.img: make_dir_ab_vendor
 ##############################################################
-# Source: device/intel/mixins/groups/boot-arch/android_ia/AndroidBoard.mk
+# Source: device/intel/mixins/groups/boot-arch/project-celadon/AndroidBoard.mk
 ##############################################################
 src_loader_file := $(PRODUCT_OUT)/efi/kernelflinger.efi
 tgt_loader_file := $(PRODUCT_OUT)/loader.efi
@@ -362,11 +362,11 @@ $(BOARD_GPT_BIN): $(TARGET_DEVICE_DIR)/gpt.ini
 	$(hide) echo GEN $(notdir $@)
 
 ##############################################################
-# Source: device/intel/mixins/groups/audio/android_ia/AndroidBoard.mk
+# Source: device/intel/mixins/groups/audio/project-celadon/AndroidBoard.mk
 ##############################################################
 pfw_rebuild_settings := true
 # Target specific audio configuration files
-include device/intel/android_ia/common/audio/AndroidBoard.mk
+include device/intel/project-celadon/common/audio/AndroidBoard.mk
 ##############################################################
 # Source: device/intel/mixins/groups/wlan/iwlwifi/AndroidBoard.mk
 ##############################################################
diff --git a/celadon/AndroidProducts.mk b/celadon/AndroidProducts.mk
new file mode 100644
index 000000000..af26b9d3b
--- /dev/null
+++ b/celadon/AndroidProducts.mk
@@ -0,0 +1,2 @@
+PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/celadon.mk
diff --git a/androidia_64/BoardConfig.mk b/celadon/BoardConfig.mk
similarity index 90%
rename from androidia_64/BoardConfig.mk
rename to celadon/BoardConfig.mk
index b34d7ccca..77e63e932 100644
--- a/androidia_64/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -6,19 +6,19 @@
 TARGET_BOOTLOADER_IS_2ND := true
 BOARD_OEM_VARS += $(TARGET_DEVICE_DIR)/oemvars.txt
 ##############################################################
-# Source: device/intel/mixins/groups/android_ia/default/BoardConfig.mk
+# Source: device/intel/mixins/groups/project-celadon/default/BoardConfig.mk
 ##############################################################
 KERNEL_CROSS_COMPILE_WRAPPER := x86_64-linux-android-
 ##############################################################
 # Source: device/intel/mixins/groups/sepolicy/enforcing/BoardConfig.mk
 ##############################################################
 # SELinux Policy
-BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy
 
 # Pass device target to build
 BOARD_SEPOLICY_M4DEFS += board_sepolicy_target_product=$(TARGET_PRODUCT)
 ##############################################################
-# Source: device/intel/mixins/groups/graphics/android_ia/BoardConfig.mk
+# Source: device/intel/mixins/groups/graphics/project-celadon/BoardConfig.mk
 ##############################################################
 BOARD_KERNEL_CMDLINE += vga=current i915.modeset=1 drm.atomic=1 i915.nuclear_pageflip=1 drm.vblankoffdelay=1 i915.fastboot=1
 USE_OPENGL_RENDERER := true
@@ -39,7 +39,7 @@ ifneq ($(strip $(BOARD_GPU_DRIVERS)),)
 TARGET_HARDWARE_3D := true
 endif
 
-BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/graphics/android_ia
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/graphics/project-celadon
 
 
 BOARD_USES_DRM_HWCOMPOSER := false
@@ -58,7 +58,7 @@ BOARD_USES_GRALLOC1 := true
 TARGET_USES_HWC2 := true
 
 ##############################################################
-# Source: device/intel/mixins/groups/media/android_ia/BoardConfig.mk
+# Source: device/intel/mixins/groups/media/project-celadon/BoardConfig.mk
 ##############################################################
 ##############################################################
 # Source: device/intel/mixins/groups/device-type/tablet/BoardConfig.mk
@@ -67,7 +67,7 @@ DEVICE_PACKAGE_OVERLAYS += device/intel/common/device-type/overlay-tablet
 ##############################################################
 # Source: device/intel/mixins/groups/debugfs/default/BoardConfig.mk
 ##############################################################
-BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/debugfs
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/debugfs
 ##############################################################
 # Source: device/intel/mixins/groups/slot-ab/true/BoardConfig.mk
 ##############################################################
@@ -80,7 +80,7 @@ TARGET_NO_RECOVERY := true
 BOARD_USES_RECOVERY_AS_BOOT := true
 BOARD_SLOT_AB_ENABLE := true
 ##############################################################
-# Source: device/intel/mixins/groups/kernel/android_ia/BoardConfig.mk
+# Source: device/intel/mixins/groups/kernel/project-celadon/BoardConfig.mk
 ##############################################################
 TARGET_USES_64_BIT_BINDER := true
 BOARD_USE_64BIT_USERSPACE := true
@@ -104,7 +104,7 @@ endif
 
 
 BOARD_SEPOLICY_M4DEFS += module_kernel=true
-BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/kernel
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/kernel
 ##############################################################
 # Source: device/intel/mixins/groups/bluetooth/btusb/BoardConfig.mk
 ##############################################################
@@ -112,18 +112,18 @@ BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_LINUX := true
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/intel/common/bluetooth/bcm43241/
 DEVICE_PACKAGE_OVERLAYS += device/intel/common/bluetooth/overlay-bt-pan
-BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/bluetooth/common \
-                       device/intel/android_ia/sepolicy/bluetooth/intel
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/bluetooth/common \
+                       device/intel/project-celadon/sepolicy/bluetooth/intel
 ##############################################################
 # Source: device/intel/mixins/groups/disk-bus/auto/BoardConfig.mk
 ##############################################################
-BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/set_storage
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/set_storage
 ##############################################################
 # Source: device/intel/mixins/groups/factory-partition/true/BoardConfig.mk
 ##############################################################
 BOARD_FACTORYIMAGE_PARTITION_SIZE := 10485760
 BOARD_FLASHFILES += $(PRODUCT_OUT)/factory.img
-BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/factory-partition
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/factory-partition
 BOARD_SEPOLICY_M4DEFS += module_factory_partition=true
 ##############################################################
 # Source: device/intel/mixins/groups/config-partition/enabled/BoardConfig.mk
@@ -131,7 +131,7 @@ BOARD_SEPOLICY_M4DEFS += module_factory_partition=true
 BOARD_CONFIGIMAGE_PARTITION_SIZE := 8388608
 BOARD_FLASHFILES += $(PRODUCT_OUT)/config.img
 BOARD_SEPOLICY_M4DEFS += module_config_partition=true
-BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/config-partition
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/config-partition
 ##############################################################
 # Source: device/intel/mixins/groups/avb/true/BoardConfig.mk
 ##############################################################
@@ -158,11 +158,11 @@ BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := squashfs
 endif
 BOARD_FLASHFILES += $(PRODUCT_OUT)/vendor.img
 ##############################################################
-# Source: device/intel/mixins/groups/boot-arch/android_ia/BoardConfig.mk
+# Source: device/intel/mixins/groups/boot-arch/project-celadon/BoardConfig.mk
 ##############################################################
 #TARGET_NO_RECOVERY ?= false
 
-TARGET_BOARD_PLATFORM := android_ia
+TARGET_BOARD_PLATFORM := project-celadon
 
 TARGET_USERIMAGES_USE_EXT4 := true
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
@@ -201,7 +201,7 @@ KERNELFLINGER_SSL_LIBRARY := openssl
 # Avoid Watchdog truggered reboot
 BOARD_KERNEL_CMDLINE += iTCO_wdt.force_no_reboot=1
 
-BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/boot-arch/android_ia
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/boot-arch/project-celadon
 
 # Show the "OEM unlocking" option in Android "Developer options"
 #PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.frp.pst=/dev/block/by-name/android_persistent
@@ -287,7 +287,7 @@ KERNELFLINGER_ASSUME_BIOS_SECURE_BOOT := true
 KERNELFLINGER_USE_RPMB_SIMULATE := true
 
 ##############################################################
-# Source: device/intel/mixins/groups/audio/android_ia/BoardConfig.mk
+# Source: device/intel/mixins/groups/audio/project-celadon/BoardConfig.mk
 ##############################################################
 BOARD_USES_ALSA_AUDIO := true
 BOARD_USES_TINY_ALSA_AUDIO := true
@@ -361,7 +361,7 @@ DEVICE_PACKAGE_OVERLAYS += device/intel/common/wlan/overlay-miracast-force-singl
 
 
 BOARD_SEPOLICY_M4DEFS += module_iwlwifi=true
-BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/wlan/iwlwifi
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/wlan/iwlwifi
 ##############################################################
 # Source: device/intel/mixins/groups/cpu-arch/skl/BoardConfig.mk
 ##############################################################
@@ -385,7 +385,7 @@ ENABLE_CPUSETS := true
 ##############################################################
 # Source: device/intel/mixins/groups/rfkill/true/BoardConfig.mk
 ##############################################################
-BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/rfkill
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/rfkill
 ##############################################################
 # Source: device/intel/mixins/groups/dexpreopt/enabled/BoardConfig.mk
 ##############################################################
@@ -395,8 +395,8 @@ WITH_DEXPREOPT_PIC := true
 ##############################################################
 # Source: device/intel/mixins/groups/thermal/dptf/BoardConfig.mk
 ##############################################################
-BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/thermal
-BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/thermal/dptf
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/thermal
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/thermal/dptf
 BOARD_KERNEL_CMDLINE += thermal.off=1
 ##############################################################
 # Source: device/intel/mixins/groups/debug-phonedoctor/true/BoardConfig.mk
@@ -422,10 +422,10 @@ BOARD_USES_TRUSTY := true
 BOARD_USES_KEYMASTER1 := true
 endif
 
-BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/trusty
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/trusty
 BOARD_SEPOLICY_M4DEFS += module_trusty=true
 
-LK_PRODUCT := androidia_64
+LK_PRODUCT := project-celadon_64
 
 LKBUILD_TOOLCHAIN_ROOT = $(PWD)/vendor/intel/external/prebuilts/elf/
 LKBUILD_X86_TOOLCHAIN =
@@ -454,11 +454,11 @@ BOARD_TOSIMAGE_PARTITION_SIZE := 10485760
 ##############################################################
 # Source: device/intel/mixins/groups/camera/usbcamera/BoardConfig.mk
 ##############################################################
-BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/camera/usbcamera
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/camera/usbcamera
 ##############################################################
 # Source: device/intel/mixins/groups/memtrack/true/BoardConfig.mk
 ##############################################################
-BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/memtrack
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/memtrack
 # ------------------ END MIX-IN DEFINITIONS ------------------
 
 # Install Native Bridge
@@ -489,4 +489,4 @@ else
 endif
 
 BOARD_SEPOLICY_M4DEFS += module_houdini=true
-BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/houdini
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/houdini
diff --git a/celadon/celadon.mk b/celadon/celadon.mk
new file mode 100644
index 000000000..edfdb18bf
--- /dev/null
+++ b/celadon/celadon.mk
@@ -0,0 +1,12 @@
+ENABLE_NATIVEBRIDGE_64BIT := true
+
+$(call inherit-product,$(SRC_TARGET_DIR)/product/core_64_bit.mk)
+$(call inherit-product,device/intel/project-celadon/celadon/device.mk)
+
+# Overrides
+PRODUCT_NAME := celadon
+PRODUCT_BRAND := celadon
+PRODUCT_DEVICE := celadon
+PRODUCT_MODEL := Generic celadon
+PRODUCT_MANUFACTURER := Intel
+
diff --git a/androidia_64/device.mk b/celadon/device.mk
similarity index 93%
rename from androidia_64/device.mk
rename to celadon/device.mk
index acd8e3e6c..11b1a7dda 100644
--- a/androidia_64/device.mk
+++ b/celadon/device.mk
@@ -1,14 +1,14 @@
 # ----------------- BEGIN MIX-IN DEFINITIONS -----------------
 # Mix-In definitions are auto-generated by mixin-update
 ##############################################################
-# Source: device/intel/mixins/groups/android_ia/default/product.mk
+# Source: device/intel/mixins/groups/project-celadon/default/product.mk
 ##############################################################
 #Product Characteristics
 PRODUCT_DIR := $(dir $(lastword $(filter-out device/common/%,$(filter device/%,$(ALL_PRODUCTS)))))
 
-INTEL_PATH_DEVICE := device/intel/android_ia
+INTEL_PATH_DEVICE := device/intel/project-celadon
 INTEL_PATH_COMMON := device/intel/common
-INTEL_PATH_SEPOLICY := device/intel/android_ia/sepolicy
+INTEL_PATH_SEPOLICY := device/intel/project-celadon/sepolicy
 INTEL_PATH_BUILD := device/intel/build
 INTEL_PATH_HARDWARE := hardware/intel
 INTEL_PATH_VENDOR := vendor/intel
@@ -20,7 +20,7 @@ PRODUCT_TAGS += dalvik.gc.type-precise
 PRODUCT_AAPT_CONFIG := normal large xlarge mdpi hdpi xhdpi xxhdpi
 PRODUCT_AAPT_PREF_CONFIG := xxhdpi
 
-DEVICE_PACKAGE_OVERLAYS += device/intel/android_ia/common/overlay
+DEVICE_PACKAGE_OVERLAYS += device/intel/project-celadon/common/overlay
 
 PRODUCT_PACKAGES += $(THIRD_PARTY_APPS)
 
@@ -118,7 +118,7 @@ PRODUCT_PACKAGES += \
     NotePad \
     Provision \
     drmserver \
-    power.android_ia \
+    power.project-celadon \
     scp \
     sftp \
     ssh \
@@ -151,9 +151,9 @@ PRODUCT_PACKAGES += \
 
 # Vendor Interface Manifest
 PRODUCT_COPY_FILES += \
-    device/intel/android_ia/manifest.xml:vendor/manifest.xml
+    device/intel/project-celadon/manifest.xml:vendor/manifest.xml
 ##############################################################
-# Source: device/intel/mixins/groups/graphics/android_ia/product.mk
+# Source: device/intel/mixins/groups/graphics/project-celadon/product.mk
 ##############################################################
 # Mesa
 PRODUCT_PACKAGES += \
@@ -166,23 +166,23 @@ PRODUCT_PACKAGES += \
     libsync
 
 PRODUCT_COPY_FILES += \
-    device/intel/android_ia/common/graphics/drirc:system/etc/drirc
+    device/intel/project-celadon/common/graphics/drirc:system/etc/drirc
 
 
 # HWComposer IA
 PRODUCT_PACKAGES += \
-    hwcomposer.android_ia
+    hwcomposer.project-celadon
 
 PRODUCT_PROPERTY_OVERRIDES += \
    hwc.drm.use_overlay_planes=1 \
-   ro.hardware.hwcomposer=android_ia
+   ro.hardware.hwcomposer=project-celadon
 
 # Mini gbm
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.hardware.gralloc=android_ia
+    ro.hardware.gralloc=project-celadon
 
 PRODUCT_PACKAGES += \
-    gralloc.android_ia
+    gralloc.project-celadon
 
 
 
@@ -208,7 +208,7 @@ PRODUCT_PACKAGES += \
    android.hardware.graphics.allocator@2.0-service \
    android.hardware.graphics.mapper@2.0-impl
 ##############################################################
-# Source: device/intel/mixins/groups/media/android_ia/product.mk
+# Source: device/intel/mixins/groups/media/project-celadon/product.mk
 ##############################################################
 # libva, vaapi
 PRODUCT_PACKAGES += \
@@ -223,9 +223,9 @@ PRODUCT_COPY_FILES += \
     frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
     frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
     frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \
-    device/intel/android_ia/common/media/media_profiles.xml:system/etc/media_profiles.xml \
-    device/intel/android_ia/common/media/media_codecs.xml:system/etc/media_codecs.xml \
-    device/intel/android_ia/common/media/media_codecs_performance.xml:system/etc/media_codecs_performance.xml
+    device/intel/project-celadon/common/media/media_profiles.xml:system/etc/media_profiles.xml \
+    device/intel/project-celadon/common/media/media_codecs.xml:system/etc/media_codecs.xml \
+    device/intel/project-celadon/common/media/media_codecs_performance.xml:system/etc/media_codecs_performance.xml
 
 #Enable deep buffer for video playback
 PRODUCT_PROPERTY_OVERRIDES += media.stagefright.audio.deep=true
@@ -306,7 +306,7 @@ endif
     update_engine_client \
     update_verifier
 ##############################################################
-# Source: device/intel/mixins/groups/kernel/android_ia/product.mk
+# Source: device/intel/mixins/groups/kernel/project-celadon/product.mk
 ##############################################################
 TARGET_KERNEL_ARCH := x86_64
 BOARD_USE_64BIT_KERNEL := true
@@ -321,7 +321,7 @@ FIRMWARES_DIR ?= vendor/linux/firmware
 FIRMWARE_FILTERS ?= .git/% %.mk
 
 # Firmware
-$(call inherit-product,device/intel/android_ia/common/firmware.mk)
+$(call inherit-product,device/intel/project-celadon/common/firmware.mk)
 ##############################################################
 # Source: device/intel/mixins/groups/bluetooth/btusb/product.mk
 ##############################################################
@@ -352,7 +352,7 @@ PRODUCT_PACKAGES += avbctl
 ##############################################################
 PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/by-name/vendor
 ##############################################################
-# Source: device/intel/mixins/groups/boot-arch/android_ia/product.mk
+# Source: device/intel/mixins/groups/boot-arch/project-celadon/product.mk
 ##############################################################
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.frp.pst=/dev/block/by-name/persistent
 
@@ -367,7 +367,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 endif
 
 ##############################################################
-# Source: device/intel/mixins/groups/audio/android_ia/product.mk
+# Source: device/intel/mixins/groups/audio/project-celadon/product.mk
 ##############################################################
 # Tinyalsa
 PRODUCT_PACKAGES_DEBUG += \
@@ -450,9 +450,9 @@ PRODUCT_PACKAGES += \
 ##############################################################
 # Lights HAL
 BOARD_SEPOLICY_DIRS += \
-    device/intel/android_ia/sepolicy/light
+    device/intel/project-celadon/sepolicy/light
 
-PRODUCT_PACKAGES += lights.android_ia \
+PRODUCT_PACKAGES += lights.project-celadon \
     android.hardware.light@2.0-service \
     android.hardware.light@2.0-impl
 ##############################################################
@@ -496,7 +496,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.intel.logger=/system/bin/logcat
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += logd.kernel.raw_message=False
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.intel.logger.rot_cnt=20
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.intel.logger.rot_size=5000
-BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/debug-logs
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/debug-logs
 BOARD_SEPOLICY_M4DEFS += module_debug_logs=true
 endif
 ##############################################################
@@ -513,7 +513,7 @@ endif
 
 ifeq ($(MIXIN_DEBUG_LOGS),true)
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.crashlogd.data_quota=50
-BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/crashlogd
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/crashlogd
 
 CRASHLOGD_LOGS_PATH := "/data/logs"
 CRASHLOGD_APLOG := true
@@ -529,7 +529,7 @@ PRODUCT_COPY_FILES += $(LOCAL_PATH)/init.coredump.rc:root/init.coredump.rc
 endif
 
 ifeq ($(MIXIN_DEBUG_LOGS),true)
-BOARD_SEPOLICY_DIRS += device/intel/android_ia/sepolicy/coredump
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/coredump
 # Enable core dump for eng builds
 ifeq ($(TARGET_BUILD_VARIANT),eng)
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.core.enabled=1
@@ -574,7 +574,7 @@ endif
 
 ifeq ($(KM_VERSION),1)
 PRODUCT_PACKAGES += \
-	keystore.android_ia
+	keystore.project-celadon
 endif
 
 PRODUCT_PACKAGES += \
@@ -594,7 +594,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 ##############################################################
 # memtrack HAL
 PRODUCT_PACKAGES += \
-	memtrack.android_ia \
+	memtrack.project-celadon \
 	android.hardware.memtrack@1.0-service \
 	android.hardware.memtrack@1.0-impl
 ##############################################################
diff --git a/androidia_64/dptf.dv b/celadon/dptf.dv
similarity index 100%
rename from androidia_64/dptf.dv
rename to celadon/dptf.dv
diff --git a/androidia_64/efivar_oemlock b/celadon/efivar_oemlock
similarity index 100%
rename from androidia_64/efivar_oemlock
rename to celadon/efivar_oemlock
diff --git a/androidia_64/flash.json b/celadon/flash.json
similarity index 99%
rename from androidia_64/flash.json
rename to celadon/flash.json
index 1685e3476..432041c04 100644
--- a/androidia_64/flash.json
+++ b/celadon/flash.json
@@ -1,7 +1,7 @@
 # ----------------- BEGIN MIX-IN DEFINITIONS -----------------
 # Mix-In definitions are auto-generated by mixin-update
 ##############################################################
-# Source: device/intel/mixins/groups/boot-arch/android_ia/flash.json
+# Source: device/intel/mixins/groups/boot-arch/project-celadon/flash.json
 ##############################################################
 {
     "flash": {
diff --git a/androidia_64/flashfiles.ini b/celadon/flashfiles.ini
similarity index 100%
rename from androidia_64/flashfiles.ini
rename to celadon/flashfiles.ini
diff --git a/androidia_64/fstab b/celadon/fstab
similarity index 98%
rename from androidia_64/fstab
rename to celadon/fstab
index 3a902bc08..07595ed6b 100644
--- a/androidia_64/fstab
+++ b/celadon/fstab
@@ -25,7 +25,7 @@
 # following line should be commented with the related ones in BoardConfig.mk
 /dev/block/by-name/vendor	    /vendor         ext4    ro                                                          wait,slotselect,avb
 ##############################################################
-# Source: device/intel/mixins/groups/boot-arch/android_ia/fstab
+# Source: device/intel/mixins/groups/boot-arch/project-celadon/fstab
 ##############################################################
 # Android fstab file.
 # <src>                   <mnt_point> <type>  <mnt_flags and options>  <fs_mgr_flags>
diff --git a/androidia_64/gpt.ini b/celadon/gpt.ini
similarity index 95%
rename from androidia_64/gpt.ini
rename to celadon/gpt.ini
index 270d78bfa..10f6ab812 100644
--- a/androidia_64/gpt.ini
+++ b/celadon/gpt.ini
@@ -1,7 +1,7 @@
 # ----------------- BEGIN MIX-IN DEFINITIONS -----------------
 # Mix-In definitions are auto-generated by mixin-update
 ##############################################################
-# Source: device/intel/mixins/groups/boot-arch/android_ia/gpt.ini
+# Source: device/intel/mixins/groups/boot-arch/project-celadon/gpt.ini
 ##############################################################
 [base]
 partitions = bootloader bootloader2 boot  misc metadata system persistent vendor config factory tos vbmeta teedata data
@@ -14,7 +14,7 @@ len = 60
 type = esp
 guid = 2568845d-2332-4675-bc39-8fa5a4748d15
 efi_loader = \loader.efi
-efi_title = Android-IA
+efi_title = PROJECT-CELADON
 flags = boot
 
 [partition.bootloader2]
diff --git a/androidia_64/hwc-valsetup.sh b/celadon/hwc-valsetup.sh
similarity index 100%
rename from androidia_64/hwc-valsetup.sh
rename to celadon/hwc-valsetup.sh
diff --git a/androidia_64/init.coredump.rc b/celadon/init.coredump.rc
similarity index 100%
rename from androidia_64/init.coredump.rc
rename to celadon/init.coredump.rc
diff --git a/androidia_64/init.crashlogd.rc b/celadon/init.crashlogd.rc
similarity index 100%
rename from androidia_64/init.crashlogd.rc
rename to celadon/init.crashlogd.rc
diff --git a/androidia_64/init.kernel.rc b/celadon/init.kernel.rc
similarity index 100%
rename from androidia_64/init.kernel.rc
rename to celadon/init.kernel.rc
diff --git a/androidia_64/init.logs.rc b/celadon/init.logs.rc
similarity index 100%
rename from androidia_64/init.logs.rc
rename to celadon/init.logs.rc
diff --git a/androidia_64/init.rc b/celadon/init.rc
similarity index 99%
rename from androidia_64/init.rc
rename to celadon/init.rc
index c47a43388..b241fbe25 100644
--- a/androidia_64/init.rc
+++ b/celadon/init.rc
@@ -1,7 +1,7 @@
 # ----------------- BEGIN MIX-IN DEFINITIONS -----------------
 # Mix-In definitions are auto-generated by mixin-update
 ##############################################################
-# Source: device/intel/mixins/groups/android_ia/default/init.rc
+# Source: device/intel/mixins/groups/project-celadon/default/init.rc
 ##############################################################
 
 on init
@@ -125,7 +125,7 @@ on fs
    # properties
    verity_update_state
 ##############################################################
-# Source: device/intel/mixins/groups/graphics/android_ia/init.rc
+# Source: device/intel/mixins/groups/graphics/project-celadon/init.rc
 ##############################################################
 on init
     chown system system /sys/class/backlight/intel_backlight/brightness
@@ -140,7 +140,7 @@ on boot
    chown system graphics /sys/kernel/debug/sync/sw_sync
    symlink /sys/kernel/debug/sync/sw_sync /dev/sw_sync
 ##############################################################
-# Source: device/intel/mixins/groups/media/android_ia/init.rc
+# Source: device/intel/mixins/groups/media/project-celadon/init.rc
 ##############################################################
 on post-fs-data
     mkdir /data/hdcp 0770 media media
@@ -331,7 +331,7 @@ service setconsole /system/bin/setconsole -g
     oneshot
 
 ##############################################################
-# Source: device/intel/mixins/groups/kernel/android_ia/init.rc
+# Source: device/intel/mixins/groups/kernel/project-celadon/init.rc
 ##############################################################
 on boot
 	write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor interactive
diff --git a/androidia_64/init.recovery.rc b/celadon/init.recovery.rc
similarity index 97%
rename from androidia_64/init.recovery.rc
rename to celadon/init.recovery.rc
index 9b877e1de..34071e37d 100644
--- a/androidia_64/init.recovery.rc
+++ b/celadon/init.recovery.rc
@@ -74,7 +74,7 @@ on init
     exec u:r:set_storage:s0 root root -- /sbin/set_storage
     symlink /dev/block/pci/pci0000:00/0000:00:1c.0/by-name /dev/block/by-name
 ##############################################################
-# Source: device/intel/mixins/groups/boot-arch/android_ia/init.recovery.rc
+# Source: device/intel/mixins/groups/boot-arch/project-celadon/init.recovery.rc
 ##############################################################
 service watchdogd /sbin/watchdogd
     user root
diff --git a/androidia_64/installer.cmd b/celadon/installer.cmd
similarity index 90%
rename from androidia_64/installer.cmd
rename to celadon/installer.cmd
index 48ba94ea6..ea2250dea 100644
--- a/androidia_64/installer.cmd
+++ b/celadon/installer.cmd
@@ -1,7 +1,7 @@
 # ----------------- BEGIN MIX-IN DEFINITIONS -----------------
 # Mix-In definitions are auto-generated by mixin-update
 ##############################################################
-# Source: device/intel/mixins/groups/boot-arch/android_ia/installer.cmd
+# Source: device/intel/mixins/groups/boot-arch/project-celadon/installer.cmd
 ##############################################################
 flashing unlock
 flash gpt gpt.bin
diff --git a/androidia_64/mixins.spec b/celadon/mixins.spec
similarity index 65%
rename from androidia_64/mixins.spec
rename to celadon/mixins.spec
index 620d860a4..572dac4cf 100644
--- a/androidia_64/mixins.spec
+++ b/celadon/mixins.spec
@@ -6,10 +6,10 @@ product.mk: device.mk
 
 [groups]
 2ndstage: oemvars
-android_ia: default
+project-celadon: default
 sepolicy: enforcing
-graphics: android_ia(gen9+=true,hwc2=true,vulkan=false,drmhwc=false,minigbm=true,gralloc1=true)
-media: android_ia(mediasdk=false,media_sdk_source=false)
+graphics: project-celadon(gen9+=true,hwc2=true,vulkan=false,drmhwc=false,minigbm=true,gralloc1=true)
+media: project-celadon(mediasdk=false,media_sdk_source=false)
 device-type: tablet
 ethernet: dhcp
 debugfs: default
@@ -17,10 +17,10 @@ storage: sdcard-mmc0-usb-sd(adoptablesd=true,adoptableusb=false)
 display-density: default
 usb-gadget: g_ffs
 adb_net: true
-kernel: android_ia(loglevel=3, disable_cpuidle_on_boot=true)
+kernel: project-celadon(loglevel=3, disable_cpuidle_on_boot=true)
 bluetooth: btusb
-boot-arch: android_ia(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true)
-audio: android_ia
+boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true)
+audio: project-celadon
 wlan: iwlwifi
 cpu-arch: skl
 cpuset: 4cores
diff --git a/androidia_64/oemvars.txt b/celadon/oemvars.txt
similarity index 87%
rename from androidia_64/oemvars.txt
rename to celadon/oemvars.txt
index 66a5632af..d4a47921d 100644
--- a/androidia_64/oemvars.txt
+++ b/celadon/oemvars.txt
@@ -1,7 +1,7 @@
 # ----------------- BEGIN MIX-IN DEFINITIONS -----------------
 # Mix-In definitions are auto-generated by mixin-update
 ##############################################################
-# Source: device/intel/mixins/groups/boot-arch/android_ia/oemvars.txt
+# Source: device/intel/mixins/groups/boot-arch/project-celadon/oemvars.txt
 ##############################################################
 # This section may appear empty if magic_key_timeout is false
 
diff --git a/androidia_64/startup.nsh b/celadon/startup.nsh
similarity index 81%
rename from androidia_64/startup.nsh
rename to celadon/startup.nsh
index 0b910247c..abab6587e 100644
--- a/androidia_64/startup.nsh
+++ b/celadon/startup.nsh
@@ -1,7 +1,7 @@
 # ----------------- BEGIN MIX-IN DEFINITIONS -----------------
 # Mix-In definitions are auto-generated by mixin-update
 ##############################################################
-# Source: device/intel/mixins/groups/boot-arch/android_ia/startup.nsh
+# Source: device/intel/mixins/groups/boot-arch/project-celadon/startup.nsh
 ##############################################################
 installer --batch installer.cmd
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/androidia_64/ueventd.rc b/celadon/ueventd.rc
similarity index 95%
rename from androidia_64/ueventd.rc
rename to celadon/ueventd.rc
index eb3010b50..8b3c30848 100644
--- a/androidia_64/ueventd.rc
+++ b/celadon/ueventd.rc
@@ -1,7 +1,7 @@
 # ----------------- BEGIN MIX-IN DEFINITIONS -----------------
 # Mix-In definitions are auto-generated by mixin-update
 ##############################################################
-# Source: device/intel/mixins/groups/android_ia/default/ueventd.rc
+# Source: device/intel/mixins/groups/project-celadon/default/ueventd.rc
 ##############################################################
 /sys/devices/system/cpu/cpu*     online     0664   system     system
 
@@ -35,7 +35,7 @@
 
 /sys/devices/pci0000:00/0000:00:02.0/drm/card*/card*/intel_backlight brightness 0644 system system
 ##############################################################
-# Source: device/intel/mixins/groups/graphics/android_ia/ueventd.rc
+# Source: device/intel/mixins/groups/graphics/project-celadon/ueventd.rc
 ##############################################################
 /dev/sw_sync                  0666   system     mediadrm
 /dev/dri                      0666   root       graphics
@@ -44,7 +44,7 @@
 /dev/graphics/fb0             0660   root       graphics
 /dev/dri/controlD64           0660   root       graphics
 ##############################################################
-# Source: device/intel/mixins/groups/media/android_ia/ueventd.rc
+# Source: device/intel/mixins/groups/media/project-celadon/ueventd.rc
 ##############################################################
 /dev/media*       0660  media  system
 /dev/video*       0660  media  system
diff --git a/androidia_64/unlock_device.nsh b/celadon/unlock_device.nsh
similarity index 80%
rename from androidia_64/unlock_device.nsh
rename to celadon/unlock_device.nsh
index abcb06543..ec3aaa8a3 100644
--- a/androidia_64/unlock_device.nsh
+++ b/celadon/unlock_device.nsh
@@ -1,7 +1,7 @@
 # ----------------- BEGIN MIX-IN DEFINITIONS -----------------
 # Mix-In definitions are auto-generated by mixin-update
 ##############################################################
-# Source: device/intel/mixins/groups/boot-arch/android_ia/unlock_device.nsh
+# Source: device/intel/mixins/groups/boot-arch/project-celadon/unlock_device.nsh
 ##############################################################
 dmpstore OEMLock -l efivar_oemlock
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/celadon/vendorsetup.sh b/celadon/vendorsetup.sh
new file mode 100644
index 000000000..f667bec87
--- /dev/null
+++ b/celadon/vendorsetup.sh
@@ -0,0 +1,6 @@
+add_lunch_combo celadon-eng
+add_lunch_combo celadon-userdebug
+add_lunch_combo celadon-user
+
+
+. $('gettop')/device/intel/project-celadon/celadon/hwc-valsetup.sh
diff --git a/common/audio/AndroidBoard.mk b/common/audio/AndroidBoard.mk
index 0da940533..eb2346342 100644
--- a/common/audio/AndroidBoard.mk
+++ b/common/audio/AndroidBoard.mk
@@ -30,7 +30,7 @@ LOCAL_REQUIRED_MODULES := \
 ifeq ($(INTEL_AUDIO_HAL), stub)
 LOCAL_REQUIRED_MODULES += audio.stub.default
 else
-LOCAL_REQUIRED_MODULES += audio.primary.android_ia
+LOCAL_REQUIRED_MODULES += audio.primary.project-celadon
 
 ifeq ($(INTEL_AUDIO_HAL),audio_pfw)
 LOCAL_REQUIRED_MODULES += audio_hal_configuration_files
@@ -171,7 +171,7 @@ endif
 include $(BUILD_PHONY_PACKAGE)
 
 ifeq ($(INTEL_AUDIO_HAL),audio_pfw)
-include device/intel/android_ia/common/audio/$(AUDIO_HARDWARE)/AndroidBoard.mk
+include device/intel/project-celadon/common/audio/$(AUDIO_HARDWARE)/AndroidBoard.mk
 else
 include $(CLEAR_VARS)
 LOCAL_MODULE := mixer_paths_0.xml
@@ -185,5 +185,5 @@ endif
 ###########################################
 
 ifeq ($(USE_CONFIGURABLE_AUDIO_POLICY), 1)
-include device/intel/android_ia/common/audio/reference_configurable_audio_policy/AndroidBoard.mk
+include device/intel/project-celadon/common/audio/reference_configurable_audio_policy/AndroidBoard.mk
 endif
diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index d7c0891db..482685a5a 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -52,7 +52,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-android_ia_64"
+CONFIG_LOCALVERSION="-project-celadon_64"
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
@@ -66,7 +66,7 @@ CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_XZ is not set
 # CONFIG_KERNEL_LZO is not set
 # CONFIG_KERNEL_LZ4 is not set
-CONFIG_DEFAULT_HOSTNAME="android_ia_64"
+CONFIG_DEFAULT_HOSTNAME="project-celadon_64"
 CONFIG_SWAP=y
 # CONFIG_SYSVIPC is not set
 # CONFIG_POSIX_MQUEUE is not set
diff --git a/patches/patch-aosp.sh b/patches/patch-aosp.sh
index da2f0fd58..0efe3243f 100755
--- a/patches/patch-aosp.sh
+++ b/patches/patch-aosp.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PATCH_DIR=`pwd`/device/intel/android_ia/patches
+PATCH_DIR=`pwd`/device/intel/project-celadon/patches
 
 echo "Android IA: Patching AOSP Tree"
 
diff --git a/sepolicy/audio/android_ia/audioserver.te b/sepolicy/audio/project-celadon/audioserver.te
similarity index 100%
rename from sepolicy/audio/android_ia/audioserver.te
rename to sepolicy/audio/project-celadon/audioserver.te
diff --git a/sepolicy/audio/android_ia/hal_audio_default.te b/sepolicy/audio/project-celadon/hal_audio_default.te
similarity index 100%
rename from sepolicy/audio/android_ia/hal_audio_default.te
rename to sepolicy/audio/project-celadon/hal_audio_default.te
diff --git a/sepolicy/boot-arch/android_ia/file_contexts b/sepolicy/boot-arch/project-celadon/file_contexts
similarity index 95%
rename from sepolicy/boot-arch/android_ia/file_contexts
rename to sepolicy/boot-arch/project-celadon/file_contexts
index 765d9971c..e6e10f988 100644
--- a/sepolicy/boot-arch/android_ia/file_contexts
+++ b/sepolicy/boot-arch/project-celadon/file_contexts
@@ -15,6 +15,6 @@
 /metadata                    u:object_r:rootfs:s0
 /misc                        u:object_r:rootfs:s0
 /boot                        u:object_r:rootfs:s0
-/gpt.androidia_64.ini        u:object_r:rootfs:s0
+/gpt.celadon.ini        u:object_r:rootfs:s0
 /persistent                  u:object_r:rootfs:s0
 /tos                         u:object_r:rootfs:s0
diff --git a/sepolicy/boot-arch/android_ia/init.te b/sepolicy/boot-arch/project-celadon/init.te
similarity index 100%
rename from sepolicy/boot-arch/android_ia/init.te
rename to sepolicy/boot-arch/project-celadon/init.te
diff --git a/sepolicy/graphics/android_ia/adbd.te b/sepolicy/graphics/project-celadon/adbd.te
similarity index 100%
rename from sepolicy/graphics/android_ia/adbd.te
rename to sepolicy/graphics/project-celadon/adbd.te
diff --git a/sepolicy/graphics/android_ia/appdomain.te b/sepolicy/graphics/project-celadon/appdomain.te
similarity index 100%
rename from sepolicy/graphics/android_ia/appdomain.te
rename to sepolicy/graphics/project-celadon/appdomain.te
diff --git a/sepolicy/graphics/android_ia/bootanim.te b/sepolicy/graphics/project-celadon/bootanim.te
similarity index 100%
rename from sepolicy/graphics/android_ia/bootanim.te
rename to sepolicy/graphics/project-celadon/bootanim.te
diff --git a/sepolicy/graphics/android_ia/file.te b/sepolicy/graphics/project-celadon/file.te
similarity index 100%
rename from sepolicy/graphics/android_ia/file.te
rename to sepolicy/graphics/project-celadon/file.te
diff --git a/sepolicy/graphics/android_ia/file_contexts b/sepolicy/graphics/project-celadon/file_contexts
similarity index 100%
rename from sepolicy/graphics/android_ia/file_contexts
rename to sepolicy/graphics/project-celadon/file_contexts
diff --git a/sepolicy/graphics/android_ia/hal_graphics_allocator_default.te b/sepolicy/graphics/project-celadon/hal_graphics_allocator_default.te
similarity index 100%
rename from sepolicy/graphics/android_ia/hal_graphics_allocator_default.te
rename to sepolicy/graphics/project-celadon/hal_graphics_allocator_default.te
diff --git a/sepolicy/graphics/android_ia/hal_graphics_composer_default.te b/sepolicy/graphics/project-celadon/hal_graphics_composer_default.te
similarity index 100%
rename from sepolicy/graphics/android_ia/hal_graphics_composer_default.te
rename to sepolicy/graphics/project-celadon/hal_graphics_composer_default.te
diff --git a/sepolicy/graphics/android_ia/mediacodec.te b/sepolicy/graphics/project-celadon/mediacodec.te
similarity index 100%
rename from sepolicy/graphics/android_ia/mediacodec.te
rename to sepolicy/graphics/project-celadon/mediacodec.te
diff --git a/sepolicy/graphics/android_ia/mediadrmserver.te b/sepolicy/graphics/project-celadon/mediadrmserver.te
similarity index 100%
rename from sepolicy/graphics/android_ia/mediadrmserver.te
rename to sepolicy/graphics/project-celadon/mediadrmserver.te
diff --git a/sepolicy/graphics/android_ia/mediaextractor.te b/sepolicy/graphics/project-celadon/mediaextractor.te
similarity index 100%
rename from sepolicy/graphics/android_ia/mediaextractor.te
rename to sepolicy/graphics/project-celadon/mediaextractor.te
diff --git a/sepolicy/graphics/android_ia/mediaserver.te b/sepolicy/graphics/project-celadon/mediaserver.te
similarity index 100%
rename from sepolicy/graphics/android_ia/mediaserver.te
rename to sepolicy/graphics/project-celadon/mediaserver.te
diff --git a/sepolicy/graphics/android_ia/platform_app.te b/sepolicy/graphics/project-celadon/platform_app.te
similarity index 100%
rename from sepolicy/graphics/android_ia/platform_app.te
rename to sepolicy/graphics/project-celadon/platform_app.te
diff --git a/sepolicy/graphics/android_ia/surfaceflinger.te b/sepolicy/graphics/project-celadon/surfaceflinger.te
similarity index 100%
rename from sepolicy/graphics/android_ia/surfaceflinger.te
rename to sepolicy/graphics/project-celadon/surfaceflinger.te
diff --git a/sepolicy/graphics/android_ia/system_server.te b/sepolicy/graphics/project-celadon/system_server.te
similarity index 100%
rename from sepolicy/graphics/android_ia/system_server.te
rename to sepolicy/graphics/project-celadon/system_server.te
diff --git a/sepolicy/graphics/android_ia/ueventd.te b/sepolicy/graphics/project-celadon/ueventd.te
similarity index 100%
rename from sepolicy/graphics/android_ia/ueventd.te
rename to sepolicy/graphics/project-celadon/ueventd.te
diff --git a/sepolicy/graphics/android_ia/vndservice.te b/sepolicy/graphics/project-celadon/vndservice.te
similarity index 100%
rename from sepolicy/graphics/android_ia/vndservice.te
rename to sepolicy/graphics/project-celadon/vndservice.te
diff --git a/sepolicy/graphics/android_ia/vndservice_contexts b/sepolicy/graphics/project-celadon/vndservice_contexts
similarity index 100%
rename from sepolicy/graphics/android_ia/vndservice_contexts
rename to sepolicy/graphics/project-celadon/vndservice_contexts

From 134ea4f8cadb51078dc490dced3289b854b88ef5 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Wed, 2 May 2018 09:19:02 +0530
Subject: [PATCH 241/427] [AIA-O] Mixinup "disable secure adb for eng builds"

Jira: None
Test: None
---
 celadon/device.mk | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/celadon/device.mk b/celadon/device.mk
index 11b1a7dda..6a37d564c 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -273,20 +273,14 @@ USB_CONFIG := mtp
 ifeq ($(TARGET_BUILD_VARIANT),user)
 # Enable Secure Debugging
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.adb.secure=1
+PRODUCT_COPY_FILES += device/intel/common/usb-gadget/adb_keys:root/adb_keys
 ifeq ($(BUILD_FOR_CTS_AUTOMATION),true)
 # Build for automated CTS
 USB_CONFIG := $(USB_CONFIG),adb
-PRODUCT_COPY_FILES += device/intel/common/usb-gadget/adb_keys:root/adb_keys
 endif #BUILD_FOR_CTS_AUTOMATION == true
 endif #TARGET_BUILD_VARIANT == user
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.sys.usb.config=$(USB_CONFIG)
 
-# Add Intel adb keys for userdebug/eng builds
-ifneq ($(TARGET_BUILD_VARIANT),user)
-# Enable Secure Debugging
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.adb.secure=1
-PRODUCT_COPY_FILES += device/intel/common/usb-gadget/adb_keys:root/adb_keys
-endif
 ##############################################################
 # Source: device/intel/mixins/groups/adb_net/true/product.mk
 ##############################################################

From 874dccb8292152a495b80f549b588e0871543bfb Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 10 May 2018 19:15:45 +0530
Subject: [PATCH 242/427] [CELADON] Add new target for apl-nuc

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 cel_apl/AndroidBoard.mk                    | 488 +++++++++++++++
 cel_apl/AndroidProducts.mk                 |   2 +
 cel_apl/BoardConfig.mk                     | 498 +++++++++++++++
 cel_apl/cel_apl.mk                         |  11 +
 cel_apl/device.mk                          | 652 ++++++++++++++++++++
 cel_apl/dptf.dv                            | Bin 0 -> 2721 bytes
 cel_apl/efivar_oemlock                     | Bin 0 -> 45 bytes
 cel_apl/flash.json                         | 509 +++++++++++++++
 cel_apl/flashfiles.ini                     | 244 ++++++++
 cel_apl/fstab                              |  49 ++
 cel_apl/gpt.ini                            | 106 ++++
 cel_apl/hwc-valsetup.sh                    |  10 +
 cel_apl/init.coredump.rc                   |  21 +
 cel_apl/init.crashlogd.rc                  |  28 +
 cel_apl/init.kernel.rc                     |  12 +
 cel_apl/init.logs.rc                       |  58 ++
 cel_apl/init.rc                            | 679 +++++++++++++++++++++
 cel_apl/init.recovery.rc                   |  87 +++
 cel_apl/installer.cmd                      |  28 +
 cel_apl/mixins.spec                        |  50 ++
 cel_apl/oemvars.txt                        |  14 +
 cel_apl/startup.nsh                        |   7 +
 cel_apl/ueventd.rc                         |  91 +++
 cel_apl/unlock_device.nsh                  |   7 +
 cel_apl/vendorsetup.sh                     |   3 +
 sepolicy/car/file.te                       |   7 +
 sepolicy/car/file_contexts                 |   5 +
 sepolicy/car/hal_broadcastradio_default.te |   8 +
 sepolicy/car/hal_vehicle_default.te        |  36 ++
 sepolicy/car/ioc_slcan.te                  |   7 +
 sepolicy/car/netd.te                       |   9 +
 sepolicy/car/platform_app.te               |   1 +
 sepolicy/car/system_app.te                 |   2 +
 sepolicy/car/system_server.te              |   1 +
 34 files changed, 3730 insertions(+)
 create mode 100644 cel_apl/AndroidBoard.mk
 create mode 100644 cel_apl/AndroidProducts.mk
 create mode 100644 cel_apl/BoardConfig.mk
 create mode 100644 cel_apl/cel_apl.mk
 create mode 100644 cel_apl/device.mk
 create mode 100644 cel_apl/dptf.dv
 create mode 100644 cel_apl/efivar_oemlock
 create mode 100644 cel_apl/flash.json
 create mode 100644 cel_apl/flashfiles.ini
 create mode 100644 cel_apl/fstab
 create mode 100644 cel_apl/gpt.ini
 create mode 100644 cel_apl/hwc-valsetup.sh
 create mode 100644 cel_apl/init.coredump.rc
 create mode 100644 cel_apl/init.crashlogd.rc
 create mode 100644 cel_apl/init.kernel.rc
 create mode 100644 cel_apl/init.logs.rc
 create mode 100644 cel_apl/init.rc
 create mode 100644 cel_apl/init.recovery.rc
 create mode 100644 cel_apl/installer.cmd
 create mode 100644 cel_apl/mixins.spec
 create mode 100644 cel_apl/oemvars.txt
 create mode 100644 cel_apl/startup.nsh
 create mode 100644 cel_apl/ueventd.rc
 create mode 100644 cel_apl/unlock_device.nsh
 create mode 100644 cel_apl/vendorsetup.sh
 create mode 100644 sepolicy/car/file.te
 create mode 100644 sepolicy/car/file_contexts
 create mode 100644 sepolicy/car/hal_broadcastradio_default.te
 create mode 100644 sepolicy/car/hal_vehicle_default.te
 create mode 100644 sepolicy/car/ioc_slcan.te
 create mode 100644 sepolicy/car/netd.te
 create mode 100644 sepolicy/car/platform_app.te
 create mode 100644 sepolicy/car/system_app.te
 create mode 100644 sepolicy/car/system_server.te

diff --git a/cel_apl/AndroidBoard.mk b/cel_apl/AndroidBoard.mk
new file mode 100644
index 000000000..e769690b0
--- /dev/null
+++ b/cel_apl/AndroidBoard.mk
@@ -0,0 +1,488 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/project-celadon/default/AndroidBoard.mk
+##############################################################
+droid: flashfiles
+	-$(hide) $(ACP) $(out_flashfiles) $(DIST_DIR)
+##############################################################
+# Source: device/intel/mixins/groups/device-type/car/AndroidBoard.mk
+##############################################################
+# Car device required kernel diff config
+#KERNEL_CAR_DIFFCONFIG = $(wildcard $(KERNEL_CONFIG_PATH)/car_diffconfig)
+#KERNEL_DIFFCONFIG += $(KERNEL_CAR_DIFFCONFIG)
+##############################################################
+# Source: device/intel/mixins/groups/slot-ab/true/AndroidBoard.mk
+##############################################################
+
+make_dir_slot_ab:
+	@mkdir -p $(PRODUCT_OUT)/root/boot
+	@mkdir -p $(PRODUCT_OUT)/root/misc
+	@mkdir -p $(PRODUCT_OUT)/root/persistent
+	@mkdir -p $(PRODUCT_OUT)/root/metadata
+
+$(PRODUCT_OUT)/ramdisk.img: make_dir_slot_ab
+##############################################################
+# Source: device/intel/mixins/groups/kernel/project-celadon/AndroidBoard.mk
+##############################################################
+ifneq ($(TARGET_PREBUILT_KERNEL),)
+$(error TARGET_PREBUILT_KERNEL defined but AndroidIA kernels build from source)
+endif
+
+TARGET_KERNEL_SRC ?= kernel/project-celadon
+
+TARGET_KERNEL_ARCH := x86_64
+TARGET_KERNEL_CONFIG ?= kernel_64_defconfig
+
+KERNEL_CONFIG_DIR := device/intel/project-celadon/kernel_config
+
+KERNEL_NAME := bzImage
+
+# Set the output for the kernel build products.
+KERNEL_OUT := $(abspath $(TARGET_OUT_INTERMEDIATES)/kernel)
+KERNEL_BIN := $(KERNEL_OUT)/arch/$(TARGET_KERNEL_ARCH)/boot/$(KERNEL_NAME)
+KERNEL_MODULES_INSTALL := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules
+
+KERNELRELEASE = $(shell cat $(KERNEL_OUT)/include/config/kernel.release)
+
+build_kernel := $(MAKE) -C $(TARGET_KERNEL_SRC) \
+		O=$(KERNEL_OUT) \
+		ARCH=$(TARGET_KERNEL_ARCH) \
+		CROSS_COMPILE="$(KERNEL_CROSS_COMPILE_WRAPPER)" \
+		KCFLAGS="$(KERNEL_CFLAGS)" \
+		KAFLAGS="$(KERNEL_AFLAGS)" \
+		$(if $(SHOW_COMMANDS),V=1) \
+		INSTALL_MOD_PATH=$(abspath "$(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)")
+
+KERNEL_CONFIG_FILE := device/intel/project-celadon/kernel_config/$(TARGET_KERNEL_CONFIG)
+
+KERNEL_CONFIG := $(KERNEL_OUT)/.config
+$(KERNEL_CONFIG): $(KERNEL_CONFIG_FILE)
+	$(hide) mkdir -p $(@D) && cat $(wildcard $^) > $@
+	$(build_kernel) oldnoconfig
+
+# Produces the actual kernel image!
+$(PRODUCT_OUT)/kernel: $(KERNEL_CONFIG) | $(ACP)
+	$(build_kernel) $(KERNEL_NAME) modules
+	$(hide) $(ACP) -fp $(KERNEL_BIN) $@
+
+EXTMOD_SRC := ../../../../../..
+TARGET_EXTRA_KERNEL_MODULES :=
+
+ALL_EXTRA_MODULES := $(patsubst %,$(TARGET_OUT_INTERMEDIATES)/kmodule/%,$(TARGET_EXTRA_KERNEL_MODULES))
+$(ALL_EXTRA_MODULES): $(TARGET_OUT_INTERMEDIATES)/kmodule/%: $(PRODUCT_OUT)/kernel
+	@echo Building additional kernel module $*
+	$(build_kernel) M=$(abspath $@) modules
+
+# Copy modules in directory pointed by $(KERNEL_MODULES_ROOT)
+# First copy modules keeping directory hierarchy lib/modules/`uname-r`for libkmod
+# Second, create flat hierarchy for insmod linking to previous hierarchy
+$(KERNEL_MODULES_INSTALL): $(PRODUCT_OUT)/kernel $(ALL_EXTRA_MODULES)
+	$(hide) rm -rf $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules
+	$(build_kernel) modules_install
+	$(hide) for kmod in "$(TARGET_EXTRA_KERNEL_MODULES)" ; do \
+		echo Installing additional kernel module $${kmod} ; \
+		$(subst +,,$(subst $(hide),,$(build_kernel))) M=$(abspath $(TARGET_OUT_INTERMEDIATES))/kernel/$${kmod} modules_install ; \
+	done
+	$(hide) rm -f $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/*/{build,source}
+	$(hide) mv $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/$(KERNELRELEASE)/* $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules
+	$(hide) rm -rf $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/$(KERNELRELEASE)
+	$(hide) touch $@
+
+# Makes sure any built modules will be included in the system image build.
+ALL_DEFAULT_INSTALLED_MODULES += $(KERNEL_MODULES_INSTALL)
+
+installclean: FILES += $(KERNEL_OUT) $(PRODUCT_OUT)/kernel
+
+.PHONY: kernel
+kernel: $(PRODUCT_OUT)/kernel
+##############################################################
+# Source: device/intel/mixins/groups/factory-partition/true/AndroidBoard.mk
+##############################################################
+INSTALLED_FACTORYIMAGE_TARGET := $(PRODUCT_OUT)/factory.img
+selinux_fc := $(TARGET_ROOT_OUT)/file_contexts.bin
+
+$(INSTALLED_FACTORYIMAGE_TARGET) : PRIVATE_SELINUX_FC := $(selinux_fc)
+$(INSTALLED_FACTORYIMAGE_TARGET) : $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK) $(selinux_fc)
+	$(call pretty,"Target factory fs image: $(INSTALLED_FACTORYIMAGE_TARGET)")
+	@mkdir -p $(PRODUCT_OUT)/factory
+	$(hide)	$(MKEXTUSERIMG) -s \
+		$(PRODUCT_OUT)/factory \
+		$(PRODUCT_OUT)/factory.img \
+		ext4 \
+		factory \
+		$(BOARD_FACTORYIMAGE_PARTITION_SIZE) \
+		$(PRIVATE_SELINUX_FC)
+
+INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_FACTORYIMAGE_TARGET)
+
+selinux_fc :=
+
+.PHONY: factoryimage
+factoryimage: $(INSTALLED_FACTORYIMAGE_TARGET)
+
+make_dir_ab_factory:
+	@mkdir -p $(PRODUCT_OUT)/root/factory
+
+$(PRODUCT_OUT)/ramdisk.img: make_dir_ab_factory
+##############################################################
+# Source: device/intel/mixins/groups/config-partition/enabled/AndroidBoard.mk
+##############################################################
+INSTALLED_CONFIGIMAGE_TARGET := $(PRODUCT_OUT)/config.img
+
+selinux_fc := $(TARGET_ROOT_OUT)/file_contexts.bin
+
+$(INSTALLED_CONFIGIMAGE_TARGET) : PRIVATE_SELINUX_FC := $(selinux_fc)
+$(INSTALLED_CONFIGIMAGE_TARGET) : $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK) $(selinux_fc)
+	$(call pretty,"Target config fs image: $(INSTALLED_CONFIGIMAGE_TARGET)")
+	@mkdir -p $(PRODUCT_OUT)/config
+	$(hide)	PATH=$(HOST_OUT_EXECUTABLES):$$PATH \
+		$(MKEXTUSERIMG) -s \
+		$(PRODUCT_OUT)/config \
+		$(PRODUCT_OUT)/config.img \
+		ext4 \
+		oem_config \
+		$(BOARD_CONFIGIMAGE_PARTITION_SIZE) \
+		$(PRIVATE_SELINUX_FC)
+
+INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_CONFIGIMAGE_TARGET)
+
+selinux_fc :=
+
+selinux_fc :=
+.PHONY: configimage
+configimage: $(INSTALLED_CONFIGIMAGE_TARGET)
+
+make_dir_ab_config:
+	@mkdir -p $(PRODUCT_OUT)/root/oem_config
+
+$(PRODUCT_OUT)/ramdisk.img: make_dir_ab_config
+##############################################################
+# Source: device/intel/mixins/groups/variants/default/AndroidBoard.mk
+##############################################################
+# flashfile_add_blob <blob_name> <path> <mandatory> <var_name>
+# - Delete ::variant:: from <path>
+# - If the result does not exists and <mandatory> is set, error
+# - If <var_name> is set, put the result in <var_name>
+# - Add the pair <result>:<blob_name> in BOARD_FLASHFILES_FIRMWARE
+define flashfile_add_blob
+$(eval blob := $(subst ::variant::,,$(2))) \
+$(if $(wildcard $(blob)), \
+    $(if $(4), $(eval $(4) := $(blob))) \
+    $(eval BOARD_FLASHFILES_FIRMWARE += $(blob):$(1)) \
+    , \
+    $(if $(3), $(error $(blob) does not exist)))
+endef
+
+##############################################################
+# Source: device/intel/mixins/groups/vendor-partition/true/AndroidBoard.mk
+##############################################################
+
+# This is to ensure that kernel modules are installed before
+# vendor.img is generated.
+$(PRODUCT_OUT)/vendor.img : $(KERNEL_MODULES_INSTALL)
+
+make_dir_ab_vendor:
+	@mkdir -p $(PRODUCT_OUT)/root/vendor
+
+$(PRODUCT_OUT)/ramdisk.img: make_dir_ab_vendor
+##############################################################
+# Source: device/intel/mixins/groups/boot-arch/project-celadon/AndroidBoard.mk
+##############################################################
+src_loader_file := $(PRODUCT_OUT)/efi/kernelflinger.efi
+tgt_loader_file := $(PRODUCT_OUT)/loader.efi
+
+define generate_flashfiles
+$(shell cp $(src_loader_file) $(tgt_loader_file))
+zip -qj $(1) $(2) $(tgt_loader_file)
+endef
+
+ifneq ($(BUILD_NUMBER),)
+out_flashfiles := $(PRODUCT_OUT)/$(TARGET_PRODUCT)-flashfiles-$(BUILD_NUMBER).zip
+else
+out_flashfiles := $(PRODUCT_OUT)/$(TARGET_PRODUCT).flashfiles.$(TARGET_BUILD_VARIANT).$(USER).zip
+endif
+
+$(PRODUCT_OUT)/efi/installer.cmd: $(TARGET_DEVICE_DIR)/$(@F)
+	$(ACP) $(TARGET_DEVICE_DIR)/$(@F) $@
+	sed -i '/#/d' $@
+
+$(PRODUCT_OUT)/efi/flash.json: $(TARGET_DEVICE_DIR)/$(@F)
+	$(ACP) $(TARGET_DEVICE_DIR)/$(@F) $@
+	sed -i '/#/d' $@
+
+$(PRODUCT_OUT)/efi/startup.nsh: $(TARGET_DEVICE_DIR)/$(@F)
+	$(ACP) $(TARGET_DEVICE_DIR)/$(@F) $@
+	sed -i '/#/d' $@
+
+$(PRODUCT_OUT)/efi/unlock_device.nsh: $(TARGET_DEVICE_DIR)/$(@F)
+	$(ACP) $(TARGET_DEVICE_DIR)/$(@F) $@
+	sed -i '/#/d' $@
+
+$(PRODUCT_OUT)/efi/efivar_oemlock: $(TARGET_DEVICE_DIR)/$(@F)
+	$(ACP) $(TARGET_DEVICE_DIR)/$(@F) $@
+
+$(out_flashfiles): $(BOARD_FLASHFILES) | $(ACP)
+	$(call generate_flashfiles,$@, $^)
+
+.PHONY: flashfiles
+flashfiles: $(out_flashfiles)
+
+# Rules to create bootloader zip file, a precursor to the bootloader
+# image that is stored in the target-files-package. There's also
+# metadata file which indicates how large to make the VFAT filesystem
+# image
+
+ifeq ($(TARGET_UEFI_ARCH),i386)
+efi_default_name := bootia32.efi
+LOADER_TYPE := linux-x86
+else
+efi_default_name := bootx64.efi
+LOADER_TYPE := linux-x86_64
+endif
+
+# (pulled from build/core/Makefile as this gets defined much later)
+# Pick a reasonable string to use to identify files.
+ifneq "" "$(filter eng.%,$(BUILD_NUMBER))"
+# BUILD_NUMBER has a timestamp in it, which means that
+# it will change every time.  Pick a stable value.
+FILE_NAME_TAG := eng.$(USER)
+else
+FILE_NAME_TAG := $(BUILD_NUMBER)
+endif
+
+BOARD_FIRST_STAGE_LOADER := $(PRODUCT_OUT)/efi/kernelflinger.efi
+BOARD_EXTRA_EFI_MODULES :=
+
+# We stash a copy of BIOSUPDATE.fv so the FW sees it, applies the
+# update, and deletes the file. Follows Google's desire to update all
+# bootloader pieces with a single "fastboot flash bootloader" command.
+# Since it gets deleted we can't do incremental updates of it, we keep
+# a copy as capsules/current.fv for this purpose.
+intermediates := $(call intermediates-dir-for,PACKAGING,bootloader_zip)
+bootloader_zip := $(intermediates)/bootloader.zip
+$(bootloader_zip): intermediates := $(intermediates)
+$(bootloader_zip): efi_root := $(intermediates)/root
+$(bootloader_zip): \
+		$(TARGET_DEVICE_DIR)/AndroidBoard.mk \
+		$(BOARD_FIRST_STAGE_LOADER) \
+		$(BOARD_EXTRA_EFI_MODULES) \
+		$(BOARD_SFU_UPDATE) \
+		| $(ACP) \
+
+	$(hide) rm -rf $(efi_root)
+	$(hide) rm -f $@
+	$(hide) mkdir -p $(efi_root)/capsules
+	$(hide) mkdir -p $(efi_root)/EFI/BOOT
+	$(foreach EXTRA,$(BOARD_EXTRA_EFI_MODULES), \
+		$(hide) $(ACP) $(EXTRA) $(efi_root)/)
+ifneq ($(BOARD_SFU_UPDATE),)
+        $(hide) $(ACP) $(BOARD_SFU_UPDATE) $(efi_root)/BIOSUPDATE.fv
+        $(hide) $(ACP) $(BOARD_SFU_UPDATE) $(efi_root)/capsules/current.fv
+endif
+	$(hide) $(ACP) $(BOARD_FIRST_STAGE_LOADER) $(efi_root)/loader.efi
+	$(hide) $(ACP) $(BOARD_FIRST_STAGE_LOADER) $(efi_root)/EFI/BOOT/$(efi_default_name)
+	$(hide) echo "Android-IA=\\EFI\\BOOT\\$(efi_default_name)" > $(efi_root)/manifest.txt
+	$(hide) echo "Fastboot=\\EFI\\BOOT\\$(efi_default_name);-f">> $(efi_root)/manifest.txt
+	$(hide) (cd $(efi_root) && zip -qry ../$(notdir $@) .)
+
+bootloader_info := $(intermediates)/bootloader_image_info.txt
+$(bootloader_info):
+	$(hide) mkdir -p $(dir $@)
+	$(hide) echo "size=$(BOARD_BOOTLOADER_PARTITION_SIZE)" > $@
+	$(hide) echo "block_size=$(BOARD_BOOTLOADER_BLOCK_SIZE)" >> $@
+
+INSTALLED_RADIOIMAGE_TARGET += $(bootloader_zip) $(bootloader_info)
+
+# Rule to create $(OUT)/bootloader image, binaries within are signed with
+# testing keys
+
+BOOTLOADER_FROM_ZIP = device/intel/build/bootloader_from_zip
+
+bootloader_bin := $(PRODUCT_OUT)/bootloader
+$(bootloader_bin): \
+		$(bootloader_zip) \
+		$(IMG2SIMG) \
+		$(BOOTLOADER_ADDITIONAL_DEPS) \
+		$(BOOTLOADER_FROM_ZIP) \
+
+	$(hide) $(BOOTLOADER_FROM_ZIP) \
+		 --size $(BOARD_BOOTLOADER_PARTITION_SIZE) \
+		--block-size $(BOARD_BOOTLOADER_BLOCK_SIZE) \
+		$(BOOTLOADER_ADDITIONAL_ARGS) \
+		--zipfile $(bootloader_zip) \
+		$@
+
+droidcore: $(bootloader_bin)
+
+.PHONY: bootloader
+bootloader: $(bootloader_bin)
+$(call dist-for-goals,droidcore,$(bootloader_bin):$(TARGET_PRODUCT)-bootloader-$(FILE_NAME_TAG))
+
+fastboot_usb_bin := $(PRODUCT_OUT)/fastboot-usb.img
+$(fastboot_usb_bin): \
+		$(bootloader_zip) \
+		$(BOOTLOADER_ADDITIONAL_DEPS) \
+		$(BOOTLOADER_FROM_ZIP) \
+
+	$(hide) $(BOOTLOADER_FROM_ZIP) \
+		$(BOOTLOADER_ADDITIONAL_ARGS) \
+		--zipfile $(bootloader_zip) \
+		--extra-size 10485760 \
+		--bootable \
+		$@
+
+# Build when 'make' is run with no args
+droidcore: $(fastboot_usb_bin)
+
+.PHONY: fastboot-usb
+fastboot-usb: $(fastboot_usb_bin)
+
+$(call dist-for-goals,droidcore,$(fastboot_usb_bin):$(TARGET_PRODUCT)-fastboot-usb-$(FILE_NAME_TAG).img)
+$(call dist-for-goals,droidcore,device/intel/build/testkeys/testkeys_lockdown.txt:test-keys_efi_lockdown.txt)
+$(call dist-for-goals,droidcore,device/intel/build/testkeys/unlock.txt:efi_unlock.txt)
+
+ifeq ($(TARGET_BOOTLOADER_POLICY),$(filter $(TARGET_BOOTLOADER_POLICY),static external))
+# The bootloader policy is not built but is provided statically in the
+# repository or in $(PRODUCT_OUT)/.
+else
+# Bootloader policy values are generated based on the
+# TARGET_BOOTLOADER_POLICY value and the
+# device/intel/build/testkeys/{odm,OAK} keys.  The OEM must provide
+# its own keys.
+GEN_BLPOLICY_OEMVARS := device/intel/build/generate_blpolicy_oemvars
+TARGET_ODM_KEY_PAIR := device/intel/build/testkeys/odm
+TARGET_OAK_KEY_PAIR := device/intel/build/testkeys/OAK
+
+$(BOOTLOADER_POLICY_OEMVARS): sign-efi-sig-list
+	$(GEN_BLPOLICY_OEMVARS) -K $(TARGET_ODM_KEY_PAIR) \
+		-O $(TARGET_OAK_KEY_PAIR).x509.pem -B $(TARGET_BOOTLOADER_POLICY) \
+		$(BOOTLOADER_POLICY_OEMVARS)
+endif
+
+
+GPT_INI2BIN := ./device/intel/common/gpt_bin/gpt_ini2bin.py
+
+$(BOARD_GPT_BIN): $(TARGET_DEVICE_DIR)/gpt.ini
+	$(hide) $(GPT_INI2BIN) $< > $@
+	$(hide) echo GEN $(notdir $@)
+
+##############################################################
+# Source: device/intel/mixins/groups/audio/project-celadon/AndroidBoard.mk
+##############################################################
+pfw_rebuild_settings := true
+# Target specific audio configuration files
+include device/intel/project-celadon/common/audio/AndroidBoard.mk
+##############################################################
+# Source: device/intel/mixins/groups/wlan/iwlwifi/AndroidBoard.mk
+##############################################################
+#LOCAL_KERNEL_PATH := $(abspath $(PRODUCT_OUT)/obj/kernel) is not defined yet
+#$(abspath $(PRODUCT_OUT)/obj/kernel)/copy_modules: iwlwifi
+##############################################################
+# Source: device/intel/mixins/groups/flashfiles/ini/AndroidBoard.mk
+##############################################################
+ff_intermediates := $(call intermediates-dir-for,PACKAGING,flashfiles)
+
+# We need a copy of the flashfiles configuration ini in the
+# TFP RADIO/ directory
+ff_config := $(ff_intermediates)/flashfiles.ini
+$(ff_config): $(FLASHFILES_CONFIG) | $(ACP)
+	$(copy-file-to-target)
+
+$(call add_variant_flashfiles,$(ff_intermediates))
+
+INSTALLED_RADIOIMAGE_TARGET += $(ff_config)
+
+
+$(call flashfile_add_blob,extra_script.edify,$(TARGET_DEVICE_DIR)/flashfiles/::variant::/extra_script.edify)
+
+# We take any required images that can't be derived elsewhere in
+# the TFP and put them in RADIO/provdata.zip.
+ff_intermediates := $(call intermediates-dir-for,PACKAGING,flashfiles)
+provdata_zip := $(ff_intermediates)/provdata.zip
+provdata_zip_deps := $(foreach pair,$(BOARD_FLASHFILES),$(call word-colon,1,$(pair)))
+ff_root := $(ff_intermediates)/root
+
+define copy-flashfile
+$(hide) $(ACP) -fp $(1) $(2)
+
+endef
+
+define deploy_provdata
+$(eval ff_var := $(subst provdata,,$(basename $(notdir $(1)))))
+$(hide) rm -f $(1)
+$(hide) rm -rf $(ff_intermediates)/root$(ff_var)
+$(hide) mkdir -p $(ff_intermediates)/root$(ff_var)
+$(foreach pair,$(BOARD_FLASHFILES$(ff_var)), \
+	$(call copy-flashfile,$(call word-colon,1,$(pair)),$(ff_intermediates)/root$(ff_var)/$(call word-colon,2,$(pair))))
+$(hide) zip -qj $(1) $(ff_intermediates)/root$(ff_var)/*
+endef
+
+ifneq ($(FLASHFILE_VARIANTS),)
+provdata_zip :=
+$(foreach var,$(FLASHFILE_VARIANTS), \
+	$(eval provdata_zip += $(ff_intermediates)/provdata_$(var).zip) \
+	$(eval BOARD_FLASHFILES_$(var) := $(BOARD_FLASHFILES)) \
+	$(eval BOARD_FLASHFILES_$(var) += $(BOARD_FLASHFILES_FIRMWARE_$(var))) \
+	$(eval provdata_zip_deps += $(foreach pair,$(BOARD_FLASHFILES_FIRMWARE_$(var)),$(call word-colon,1,$(pair)))))
+else
+$(eval BOARD_FLASHFILES += $(BOARD_FLASHFILES_FIRMWARE))
+$(eval provdata_zip_deps += $(foreach pair,$(BOARD_FLASHFILES_FIRMWARE),$(call word-colon,1,$(pair))))
+endif
+
+$(provdata_zip): $(provdata_zip_deps) | $(ACP)
+	$(call deploy_provdata,$@)
+
+
+INSTALLED_RADIOIMAGE_TARGET += $(provdata_zip)
+
+##############################################################
+# Source: device/intel/mixins/groups/trusty/true/AndroidBoard.mk
+##############################################################
+TOS_IMAGE_TARGET := $(TRUSTY_BUILDROOT)/evmm_lk_pkg.bin
+
+INTERNAL_PLATFORM := ikgt
+LOCAL_MAKE := make
+
+# Build the evmm_pkg.bin and lk.bin
+.PHONY: $(TOS_IMAGE_TARGET)
+$(TOS_IMAGE_TARGET):
+	@echo "making lk.bin.."
+	$(hide) (cd $(TOPDIR)trusty && $(TRUSTY_ENV_VAR) $(LOCAL_MAKE) sand-x86-64)
+	@echo "making tos image.."
+	$(hide) (cd $(TOPDIR)vendor/intel/fw/evmm/$(INTERNAL_PLATFORM) && $(TRUSTY_ENV_VAR) $(LOCAL_MAKE))
+
+#tos partition is assigned for trusty
+INSTALLED_TOS_IMAGE_TARGET := $(PRODUCT_OUT)/tos.img
+TOS_SIGNING_KEY := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8
+TOS_SIGNING_CERT := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem
+
+.PHONY: tosimage
+tosimage: $(INSTALLED_TOS_IMAGE_TARGET)
+
+ifeq (true,$(BOARD_AVB_ENABLE)) # BOARD_AVB_ENABLE == true
+$(INSTALLED_TOS_IMAGE_TARGET): $(TOS_IMAGE_TARGET) $(MKBOOTIMG) $(AVBTOOL)
+	@echo "mkbootimg to create boot image for TOS file: $@"
+	$(hide) $(MKBOOTIMG) --kernel $(TOS_IMAGE_TARGET) --output $@
+	$(hide) $(AVBTOOL) add_hash_footer \
+		--image $@ \
+		--partition_size $(BOARD_TOSIMAGE_PARTITION_SIZE) \
+		--partition_name tos $(INTERNAL_AVB_SIGNING_ARGS)
+BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --include_descriptors_from_image $(INSTALLED_TOS_IMAGE_TARGET)
+$(INSTALLED_VBMETAIMAGE_TARGET): $(INSTALLED_TOS_IMAGE_TARGET)
+else
+$(INSTALLED_TOS_IMAGE_TARGET): $(TOS_IMAGE_TARGET) $(MKBOOTIMG) $(BOOT_SIGNER)
+	@echo "mkbootimg to create boot image for TOS file: $@"
+	$(hide) $(MKBOOTIMG) --kernel $(TOS_IMAGE_TARGET) --output $@
+	$(if $(filter true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_BOOT_SIGNER)),\
+		@echo "sign prebuilt TOS file: $@" &&\
+		$(BOOT_SIGNER) /tos $@ $(TOS_SIGNING_KEY) $(TOS_SIGNING_CERT) $@)
+endif
+
+INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_TOS_IMAGE_TARGET)
+
+make_dir_ab_tos:
+	@mkdir -p $(PRODUCT_OUT)/root/tos
+
+$(PRODUCT_OUT)/ramdisk.img: make_dir_ab_tos
+# ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/cel_apl/AndroidProducts.mk b/cel_apl/AndroidProducts.mk
new file mode 100644
index 000000000..3781bbd6c
--- /dev/null
+++ b/cel_apl/AndroidProducts.mk
@@ -0,0 +1,2 @@
+PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/cel_apl.mk
diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
new file mode 100644
index 000000000..ed55537d0
--- /dev/null
+++ b/cel_apl/BoardConfig.mk
@@ -0,0 +1,498 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/2ndstage/oemvars/BoardConfig.mk
+##############################################################
+TARGET_BOOTLOADER_IS_2ND := true
+BOARD_OEM_VARS += $(TARGET_DEVICE_DIR)/oemvars.txt
+##############################################################
+# Source: device/intel/mixins/groups/project-celadon/default/BoardConfig.mk
+##############################################################
+KERNEL_CROSS_COMPILE_WRAPPER := x86_64-linux-android-
+##############################################################
+# Source: device/intel/mixins/groups/sepolicy/enforcing/BoardConfig.mk
+##############################################################
+# SELinux Policy
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy
+
+# Pass device target to build
+BOARD_SEPOLICY_M4DEFS += board_sepolicy_target_product=$(TARGET_PRODUCT)
+##############################################################
+# Source: device/intel/mixins/groups/graphics/project-celadon/BoardConfig.mk
+##############################################################
+BOARD_KERNEL_CMDLINE += vga=current i915.modeset=1 drm.atomic=1 i915.nuclear_pageflip=1 drm.vblankoffdelay=1 i915.fastboot=1
+USE_OPENGL_RENDERER := true
+NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
+USE_INTEL_UFO_DRIVER := false
+INTEL_VA := true
+BOARD_GRAPHIC_IS_GEN := true
+BOARD_GPU_DRIVERS := i965
+BOARD_USE_MESA := true
+LIBDRM_VER := intel
+
+# System's VSYNC phase offsets in nanoseconds
+VSYNC_EVENT_PHASE_OFFSET_NS := 7500000
+SF_VSYNC_EVENT_PHASE_OFFSET_NS := 5000000
+
+BOARD_GPU_DRIVERS ?= i965 swrast
+ifneq ($(strip $(BOARD_GPU_DRIVERS)),)
+TARGET_HARDWARE_3D := true
+endif
+
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/graphics/project-celadon
+
+
+BOARD_USES_DRM_HWCOMPOSER := false
+BOARD_USES_IA_HWCOMPOSER := true
+
+DISABLE_MEDIA_COMPOSITOR := true
+
+BOARD_USES_MINIGBM := true
+BOARD_ENABLE_EXPLICIT_SYNC := true
+INTEL_MINIGBM := external/minigbm
+
+
+BOARD_USES_GRALLOC1 := true
+
+
+TARGET_USES_HWC2 := true
+
+##############################################################
+# Source: device/intel/mixins/groups/media/project-celadon/BoardConfig.mk
+##############################################################
+##############################################################
+# Source: device/intel/mixins/groups/device-type/car/BoardConfig.mk
+##############################################################
+
+BOARD_SEPOLICY_DIRS += \
+    packages/services/Car/car_product/sepolicy \
+    device/generic/car/common/sepolicy \
+    device/intel/project-celadon/sepolicy/car
+
+TARGET_USES_CAR_FUTURE_FEATURES := true
+##############################################################
+# Source: device/intel/mixins/groups/debugfs/default/BoardConfig.mk
+##############################################################
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/debugfs
+##############################################################
+# Source: device/intel/mixins/groups/slot-ab/true/BoardConfig.mk
+##############################################################
+AB_OTA_UPDATER := true
+AB_OTA_PARTITIONS := \
+    boot \
+    system
+BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
+TARGET_NO_RECOVERY := true
+BOARD_USES_RECOVERY_AS_BOOT := true
+BOARD_SLOT_AB_ENABLE := true
+##############################################################
+# Source: device/intel/mixins/groups/kernel/project-celadon/BoardConfig.mk
+##############################################################
+TARGET_USES_64_BIT_BINDER := true
+BOARD_USE_64BIT_USERSPACE := true
+TARGET_SUPPORTS_64_BIT_APPS := true
+
+
+TARGET_PRELINK_MODULE := false
+TARGET_NO_KERNEL ?= false
+
+KERNEL_LOGLEVEL ?= 3
+SERIAL_PARAMETER := console=tty0 console=ttyS2,115200n8
+
+
+BOARD_KERNEL_CMDLINE += androidboot.hardware=$(TARGET_PRODUCT) firmware_class.path=/vendor/firmware loglevel=$(KERNEL_LOGLEVEL)
+
+ifneq ($(TARGET_BUILD_VARIANT),user)
+ifeq ($(SPARSE_IMG),true)
+BOARD_KERNEL_CMDLINE += $(SERIAL_PARAMETER)
+endif
+endif
+
+
+BOARD_SEPOLICY_M4DEFS += module_kernel=true
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/kernel
+##############################################################
+# Source: device/intel/mixins/groups/bluetooth/btusb/BoardConfig.mk
+##############################################################
+BOARD_HAVE_BLUETOOTH := true
+BOARD_HAVE_BLUETOOTH_LINUX := true
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/intel/common/bluetooth/bcm43241/
+DEVICE_PACKAGE_OVERLAYS += device/intel/common/bluetooth/overlay-bt-pan
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/bluetooth/common \
+                       device/intel/project-celadon/sepolicy/bluetooth/intel
+##############################################################
+# Source: device/intel/mixins/groups/disk-bus/auto/BoardConfig.mk
+##############################################################
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/set_storage
+##############################################################
+# Source: device/intel/mixins/groups/factory-partition/true/BoardConfig.mk
+##############################################################
+BOARD_FACTORYIMAGE_PARTITION_SIZE := 10485760
+BOARD_FLASHFILES += $(PRODUCT_OUT)/factory.img
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/factory-partition
+BOARD_SEPOLICY_M4DEFS += module_factory_partition=true
+##############################################################
+# Source: device/intel/mixins/groups/config-partition/enabled/BoardConfig.mk
+##############################################################
+BOARD_CONFIGIMAGE_PARTITION_SIZE := 8388608
+BOARD_FLASHFILES += $(PRODUCT_OUT)/config.img
+BOARD_SEPOLICY_M4DEFS += module_config_partition=true
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/config-partition
+##############################################################
+# Source: device/intel/mixins/groups/avb/true/BoardConfig.mk
+##############################################################
+BOARD_AVB_ENABLE := true
+
+KERNELFLINGER_AVB_CMDLINE := true
+
+BOARD_VBMETAIMAGE_PARTITION_SIZE := 2097152
+BOARD_FLASHFILES += $(PRODUCT_OUT)/vbmeta.img
+
+# Now use AVB to support A/B slot
+PRODUCT_STATIC_BOOT_CONTROL_HAL := bootctrl.avb libavb_user
+##############################################################
+# Source: device/intel/mixins/groups/vendor-partition/true/BoardConfig.mk
+##############################################################
+# Those 3 lines are required to enable vendor image generation.
+# Remove them if vendor partition is not used.
+TARGET_COPY_OUT_VENDOR := vendor
+BOARD_VENDORIMAGE_PARTITION_SIZE := 1572864000
+ifeq ($(SPARSE_IMG),true)
+BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
+else
+BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := squashfs
+endif
+BOARD_FLASHFILES += $(PRODUCT_OUT)/vendor.img
+##############################################################
+# Source: device/intel/mixins/groups/boot-arch/project-celadon/BoardConfig.mk
+##############################################################
+#TARGET_NO_RECOVERY ?= false
+
+TARGET_BOARD_PLATFORM := project-celadon
+
+TARGET_USERIMAGES_USE_EXT4 := true
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
+BOARD_FLASH_BLOCK_SIZE := 512
+
+BOARD_BOOTIMAGE_PARTITION_SIZE := 31457280
+
+ifeq ($(SPARSE_IMG),true)
+TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false
+BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4
+else
+TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
+BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := squashfs
+endif
+
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3758096384
+
+BOARD_BOOTLOADER_PARTITION_SIZE ?= 62914560
+BOARD_BOOTLOADER_BLOCK_SIZE := 512
+TARGET_BOOTLOADER_BOARD_NAME := $(TARGET_DEVICE)
+
+# Kernel Flinger
+TARGET_UEFI_ARCH := x86_64
+# Kernelflinger won't check the ACPI table oem_id, oem_table_id and
+# revision fields
+KERNELFLINGER_ALLOW_UNSUPPORTED_ACPI_TABLE := true
+# Allow Kernelflinger to start watchdog prior to boot the kernel
+KERNELFLINGER_USE_WATCHDOG := true
+# Tell Kernelflinger to ignore ACPI RSCI table
+KERNELFLINGER_IGNORE_RSCI := true
+#KERNELFLINGER_SSL_LIBRARY := boringssl
+KERNELFLINGER_SSL_LIBRARY := openssl
+# Specify system verity partition
+#PRODUCT_SYSTEM_VERITY_PARTITION := /dev/block/by-name/system
+
+# Avoid Watchdog truggered reboot
+BOARD_KERNEL_CMDLINE += iTCO_wdt.force_no_reboot=1
+
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/boot-arch/project-celadon
+
+# Show the "OEM unlocking" option in Android "Developer options"
+#PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.frp.pst=/dev/block/by-name/android_persistent
+
+# Specify file for creating final flashfiles
+# BOARD_GPT_INI ?= $(TARGET_DEVICE_DIR)/gpt.ini
+BOARD_GPT_BIN = $(PRODUCT_OUT)/gpt.bin
+BOARD_FLASHFILES += $(PRODUCT_OUT)/system.img
+BOARD_FLASHFILES += $(PRODUCT_OUT)/gpt.bin
+BOARD_FLASHFILES += $(PRODUCT_OUT)/boot.img
+BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/installer.efi
+BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/kernelflinger.efi
+BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/startup.nsh
+BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/unlock_device.nsh
+BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/efivar_oemlock
+BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/installer.cmd
+BOARD_FLASHFILES += $(PRODUCT_OUT)/bootloader
+BOARD_FLASHFILES += $(PRODUCT_OUT)/fastboot-usb.img
+BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/flash.json
+BOARD_FLASHFILES += $(PRODUCT_OUT)/tos.img
+
+# -- OTA RELATED DEFINES --
+# tell build system where to get the recovery.fstab.
+TARGET_RECOVERY_FSTAB ?= $(TARGET_DEVICE_DIR)/fstab
+# Used by ota_from_target_files to add platform-specific directives
+# to the OTA updater scripts
+TARGET_RELEASETOOLS_EXTENSIONS ?= device/intel/common/recovery
+# By default recovery minui expects RGBA framebuffer
+TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
+
+
+ifneq (0x0,static)
+BOOTLOADER_POLICY_OEMVARS = $(PRODUCT_OUT)/bootloader_policy-oemvars.txt
+BOARD_FLASHFILES += $(BOOTLOADER_POLICY_OEMVARS)
+BOARD_OEM_VARS += $(BOOTLOADER_POLICY_OEMVARS)
+endif
+
+# It activates the Bootloader policy and RMA refurbishing
+# features. TARGET_BOOTLOADER_POLICY is the desired bitmask for this
+# device.
+# * bit 0:
+#   - 0: GVB class B.
+#   - 1: GVB class A.  Device unlock is not permitted.  The only way
+#     to unlock is to use the secured force-unlock mechanism.
+# * bit 1 and 2 defines the minimal boot state required to boot the
+#   device:
+#   - 0x0: BOOT_STATE_RED (GVB default behavior)
+#   - 0x1: BOOT_STATE_ORANGE
+#   - 0x2: BOOT_STATE_YELLOW
+#   - 0x3: BOOT_STATE_GREEN
+# If TARGET_BOOTLOADER_POLICY is equal to 'static' the bootloader
+# policy is not built but is provided statically in the repository.
+# If TARGET_BOOTLOADER_POLICY is equal to 'external' the bootloader
+# policy OEMVARS should be installed manually in
+# $(BOOTLOADER_POLICY_OEMVARS).
+TARGET_BOOTLOADER_POLICY := 0x0
+# If the following variable is set to false, the bootloader policy and
+# RMA refurbishing features does not use time-based authenticated EFI
+# variables to store the BPM and OAK values.  The BPM value is defined
+# compilation time by the TARGET_BOOTLOADER_POLICY variable.
+TARGET_BOOTLOADER_POLICY_USE_EFI_VAR := true
+#ifeq ($(TARGET_BOOTLOADER_POLICY),$(filter $(TARGET_BOOTLOADER_POLICY),0x0 0x2 0x4 0x6))
+# OEM Unlock reporting 1
+#ADDITIONAL_DEFAULT_PROPERTIES += \
+#	ro.oem_unlock_supported=1
+#endif
+ifeq ($(TARGET_BOOTLOADER_POLICY),$(filter $(TARGET_BOOTLOADER_POLICY),static external))
+# The bootloader policy is not generated build time but is supplied
+# statically in the repository or in $(PRODUCT_OUT)/.  If your
+# bootloader policy allows the device to be unlocked, uncomment the
+# following lines:
+# ADDITIONAL_DEFAULT_PROPERTIES += \
+# 	ro.oem_unlock_supported=1
+endif
+
+
+
+# Kernelfligner will assume the BIOS support secure boot. Not check the EFI variable SecureBoot
+# It is useful when the BIOS does not support secure boot.
+KERNELFLINGER_ASSUME_BIOS_SECURE_BOOT := true
+
+
+KERNELFLINGER_USE_RPMB_SIMULATE := true
+
+##############################################################
+# Source: device/intel/mixins/groups/audio/project-celadon/BoardConfig.mk
+##############################################################
+BOARD_USES_ALSA_AUDIO := true
+BOARD_USES_TINY_ALSA_AUDIO := true
+BOARD_USES_GENERIC_AUDIO ?= false
+ifneq ($(BOARD_USES_GENERIC_AUDIO), true)
+# Audio HAL selection Flag default setting.
+#  INTEL_AUDIO_HAL:= audio     -> baseline HAL
+#  INTEL_AUDIO_HAL:= audio_pfw -> PFW-based HAL
+INTEL_AUDIO_HAL := audio
+else
+INTEL_AUDIO_HAL := stub
+endif
+
+# Use XML audio policy configuration file
+USE_XML_AUDIO_POLICY_CONF ?= 1
+# Use configurable audio policy
+USE_CONFIGURABLE_AUDIO_POLICY ?= 1
+##############################################################
+# Source: device/intel/mixins/groups/wlan/iwlwifi/BoardConfig.mk
+##############################################################
+# This enables the wpa wireless driver
+BOARD_HOSTAPD_DRIVER := NL80211
+BOARD_WPA_SUPPLICANT_DRIVER := NL80211
+WPA_SUPPLICANT_VERSION := VER_2_1_DEVEL
+# required for wifi HAL support
+BOARD_WLAN_DEVICE := iwlwifi
+
+# Enabling iwlwifi
+BOARD_USING_INTEL_IWL := true
+INTEL_IWL_MODULE_SUB_FOLDER := rel
+INTEL_IWL_PNVM_HW := DEFAULT
+INTEL_IWL_USE_COMPAT_INSTALL := y
+INTEL_IWL_COMPAT_INSTALL_DIR := updates
+INTEL_IWL_COMPAT_INSTALL_PATH ?= .
+INTEL_IWL_INSTALL_MOD_STRIP := INSTALL_MOD_STRIP=1
+CROSS_COMPILE ?= CROSS_COMPILE=$(YOCTO_CROSSCOMPILE)
+INSTALLED_KERNEL_TARGET ?= $(PREVIOUS_KERNEL_MODULE)
+KERNEL_OUT_DIR ?= $(PRODUCT_OUT)/obj/kernel
+
+COMBO_CHIP_VENDOR := intel
+COMBO_CHIP := lnp
+
+# SoftAp FW reload definitions.
+# we don't really need this, it's to avoid error when the framework
+# will trigger the fwReloadSoftap function, what will lead to an error
+# enabling the SoftAp.
+# so we set up this for letting the function execute gracefully.
+WIFI_DRIVER_FW_PATH_STA := "/system/vendor/firmware/iwlwifi-softap-dummy.ucode"
+WIFI_DRIVER_FW_PATH_AP  := "/system/vendor/firmware/iwlwifi-softap-dummy.ucode"
+WIFI_DRIVER_FW_PATH_P2P := "/system/vendor/firmware/iwlwifi-softap-dummy.ucode"
+WIFI_DRIVER_FW_PATH_PARAM := "/dev/null"
+
+# config_wifi_background_scan_support=true:
+DEVICE_PACKAGE_OVERLAYS += device/intel/common/wlan/overlay-pno
+
+DEVICE_PACKAGE_OVERLAYS += device/intel/common/wlan/overlay-tcp-buffers
+
+# Add SIM , AKA and AKA' methods in EAP entries of WiFi UI
+DEVICE_PACKAGE_OVERLAYS += device/intel/common/wlan/overlay-eap-methods
+
+ifneq (lhp,$(INTEL_IWL_MODULE_SUB_FOLDER))
+    DEVICE_PACKAGE_OVERLAYS += device/intel/common/wlan/overlay-dual-band
+endif
+
+# WiDi / Miracast Optimisations
+DEVICE_PACKAGE_OVERLAYS += device/intel/common/wlan/overlay-miracast-go
+DEVICE_PACKAGE_OVERLAYS += device/intel/common/wlan/overlay-p2p-connected-stop-scan
+DEVICE_PACKAGE_OVERLAYS += device/intel/common/wlan/overlay-miracast-force-single-ch
+
+#BOARD_SEPOLICY_DIRS += #device/intel/sepolicy/wlan/load_iwlwifi
+
+
+BOARD_SEPOLICY_M4DEFS += module_iwlwifi=true
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/wlan/iwlwifi
+##############################################################
+# Source: device/intel/mixins/groups/cpu-arch/skl/BoardConfig.mk
+##############################################################
+ifeq ($(BOARD_USE_64BIT_USERSPACE),true)
+# 64b-specific items:
+TARGET_ARCH := x86_64
+TARGET_CPU_ABI := x86_64
+TARGET_2ND_CPU_ABI := x86
+TARGET_2ND_ARCH := x86
+TARGET_2ND_ARCH_VARIANT := x86
+TARGET_2ND_CPU_VARIANT := x86
+else
+# 32b-specific items:
+TARGET_ARCH := x86
+TARGET_CPU_ABI := x86
+endif
+##############################################################
+# Source: device/intel/mixins/groups/cpuset/4cores/BoardConfig.mk
+##############################################################
+ENABLE_CPUSETS := true
+##############################################################
+# Source: device/intel/mixins/groups/rfkill/true/BoardConfig.mk
+##############################################################
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/rfkill
+##############################################################
+# Source: device/intel/mixins/groups/dexpreopt/enabled/BoardConfig.mk
+##############################################################
+# enable dex-preoptimization.
+WITH_DEXPREOPT := true
+WITH_DEXPREOPT_PIC := true
+##############################################################
+# Source: device/intel/mixins/groups/thermal/dptf/BoardConfig.mk
+##############################################################
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/thermal
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/thermal/dptf
+BOARD_KERNEL_CMDLINE += thermal.off=1
+##############################################################
+# Source: device/intel/mixins/groups/debug-phonedoctor/true/BoardConfig.mk
+##############################################################
+BOARD_SEPOLICY_M4DEFS += module_debug_phonedoctor=true
+BOARD_SEPOLICY_DIRS += device/intel/androidia/sepolicy/debug-phonedoctor
+##############################################################
+# Source: device/intel/mixins/groups/flashfiles/ini/BoardConfig.mk
+##############################################################
+FLASHFILES_CONFIG ?= $(TARGET_DEVICE_DIR)/flashfiles.ini
+USE_INTEL_FLASHFILES := true
+VARIANT_SPECIFIC_FLASHFILES ?= false
+FAST_FLASHFILES := true
+
+##############################################################
+# Source: device/intel/mixins/groups/trusty/true/BoardConfig.mk
+##############################################################
+TARGET_USE_TRUSTY := true
+
+KM_VERSION := 2
+ifeq ($(KM_VERSION),1)
+BOARD_USES_TRUSTY := true
+BOARD_USES_KEYMASTER1 := true
+endif
+
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/trusty
+BOARD_SEPOLICY_M4DEFS += module_trusty=true
+
+LK_PRODUCT := project-celadon_64
+
+LKBUILD_TOOLCHAIN_ROOT = $(PWD)/vendor/intel/external/prebuilts/elf/
+LKBUILD_X86_TOOLCHAIN =
+LKBUILD_X64_TOOLCHAIN = $(LKBUILD_TOOLCHAIN_ROOT)x86_64-elf-4.9.1-Linux-x86_64/bin
+TRUSTY_BUILDROOT = $(PWD)/$(PRODUCT_OUT)/obj/trusty/
+
+TRUSTY_ENV_VAR += LK_CORE_NUM=1
+TRUSTY_ENV_VAR += TARGET_PRODUCT=$(LK_PRODUCT)
+
+#for trusty lk
+TRUSTY_ENV_VAR += BUILDROOT=$(TRUSTY_BUILDROOT)
+TRUSTY_ENV_VAR += PATH=$(PATH):$(LKBUILD_X86_TOOLCHAIN):$(LKBUILD_X64_TOOLCHAIN)
+
+#for trusty vmm
+# use same toolchain as android kernel
+TRUSTY_ENV_VAR += COMPILE_TOOLCHAIN=$(EVMMBUILD_TOOLCHAIN)
+
+# output build dir to android out folder
+TRUSTY_ENV_VAR += BUILD_DIR=$(TRUSTY_BUILDROOT)
+TRUSTY_ENV_VAR += LKBIN_DIR=$(TRUSTY_BUILDROOT)/build-sand-x86-64/
+
+#Workaround CPU lost issue on SIMICS, will remove this line below after PO.
+BOARD_KERNEL_CMDLINE += cpu_init_udelay=500000
+
+BOARD_TOSIMAGE_PARTITION_SIZE := 10485760
+##############################################################
+# Source: device/intel/mixins/groups/camera/usbcamera/BoardConfig.mk
+##############################################################
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/camera/usbcamera
+##############################################################
+# Source: device/intel/mixins/groups/memtrack/true/BoardConfig.mk
+##############################################################
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/memtrack
+# ------------------ END MIX-IN DEFINITIONS ------------------
+
+# Install Native Bridge
+WITH_NATIVE_BRIDGE := true
+
+# Enable ARM codegen for x86 with Native Bridge
+BUILD_ARM_FOR_X86 := true
+
+# Native Bridge ABI List
+NB_ABI_LIST_32_BIT := armeabi-v7a armeabi
+NB_ABI_LIST_64_BIT := arm64-v8a
+
+# Support 64 Bit Apps
+ifeq ($(ENABLE_NATIVEBRIDGE_64BIT),true)
+  TARGET_CPU_ABI_LIST_64_BIT ?= $(TARGET_CPU_ABI) $(TARGET_CPU_ABI2)
+  TARGET_CPU_ABI_LIST_32_BIT ?= $(TARGET_2ND_CPU_ABI) $(TARGET_2ND_CPU_ABI2)
+  TARGET_CPU_ABI_LIST := \
+      $(TARGET_CPU_ABI_LIST_64_BIT) \
+      $(TARGET_CPU_ABI_LIST_32_BIT) \
+      $(NB_ABI_LIST_32_BIT) \
+      $(NB_ABI_LIST_64_BIT)
+  TARGET_CPU_ABI_LIST_32_BIT += $(NB_ABI_LIST_32_BIT)
+  TARGET_CPU_ABI_LIST_64_BIT += $(NB_ABI_LIST_64_BIT)
+else
+  TARGET_CPU_ABI_LIST_32_BIT ?= $(TARGET_CPU_ABI) $(TARGET_CPU_ABI2)
+  TARGET_CPU_ABI_LIST_32_BIT += $(NB_ABI_LIST_32_BIT)
+  TARGET_CPU_ABI_LIST := $(TARGET_CPU_ABI_LIST_32_BIT)
+endif
+
+BOARD_SEPOLICY_M4DEFS += module_houdini=true
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/houdini
diff --git a/cel_apl/cel_apl.mk b/cel_apl/cel_apl.mk
new file mode 100644
index 000000000..5cafdaf6f
--- /dev/null
+++ b/cel_apl/cel_apl.mk
@@ -0,0 +1,11 @@
+ENABLE_NATIVEBRIDGE_64BIT := true
+
+$(call inherit-product,$(SRC_TARGET_DIR)/product/core_64_bit.mk)
+$(call inherit-product,device/intel/project-celadon/cel_apl/device.mk)
+
+# Overrides
+PRODUCT_NAME := cel_apl
+PRODUCT_BRAND := cel_apl
+PRODUCT_DEVICE := cel_apl
+PRODUCT_MODEL := Generic cel_apl
+PRODUCT_MANUFACTURER := Intel
diff --git a/cel_apl/device.mk b/cel_apl/device.mk
new file mode 100644
index 000000000..05954529a
--- /dev/null
+++ b/cel_apl/device.mk
@@ -0,0 +1,652 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/project-celadon/default/product.mk
+##############################################################
+#Product Characteristics
+PRODUCT_DIR := $(dir $(lastword $(filter-out device/common/%,$(filter device/%,$(ALL_PRODUCTS)))))
+
+INTEL_PATH_DEVICE := device/intel/project-celadon
+INTEL_PATH_COMMON := device/intel/common
+INTEL_PATH_SEPOLICY := device/intel/project-celadon/sepolicy
+INTEL_PATH_BUILD := device/intel/build
+INTEL_PATH_HARDWARE := hardware/intel
+INTEL_PATH_VENDOR := vendor/intel
+
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.dalvik.vm.native.bridge=libhoudini.so
+
+PRODUCT_TAGS += dalvik.gc.type-precise
+
+PRODUCT_AAPT_CONFIG := normal large xlarge mdpi hdpi xhdpi xxhdpi
+PRODUCT_AAPT_PREF_CONFIG := xxhdpi
+
+DEVICE_PACKAGE_OVERLAYS += device/intel/project-celadon/common/overlay
+
+PRODUCT_PACKAGES += $(THIRD_PARTY_APPS)
+
+PRODUCT_PACKAGES += fio
+
+# Get a list of languages.
+$(call inherit-product,$(SRC_TARGET_DIR)/product/locales_full.mk)
+
+# Get everything else from the parent package
+$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_no_telephony.mk)
+
+# Get some sounds
+$(call inherit-product-if-exists,frameworks/base/data/sounds/AudioPackage6.mk)
+
+# Get Platform specific settings
+$(call inherit-product-if-exists,vendor/vendor.mk)
+
+#Product Characteristics
+PRODUCT_COPY_FILES += \
+    $(if $(wildcard $(PRODUCT_DIR)fstab.$(TARGET_PRODUCT)),$(PRODUCT_DIR)fstab.$(TARGET_PRODUCT),$(LOCAL_PATH)/fstab):root/fstab.$(TARGET_PRODUCT) \
+    $(if $(wildcard $(PRODUCT_DIR)init.$(TARGET_PRODUCT).rc),$(PRODUCT_DIR)init.$(TARGET_PRODUCT).rc,$(LOCAL_PATH)/init.rc):root/init.$(TARGET_PRODUCT).rc \
+    $(if $(wildcard $(PRODUCT_DIR)ueventd.$(TARGET_PRODUCT).rc),$(PRODUCT_DIR)ueventd.$(TARGET_PRODUCT).rc,$(LOCAL_PATH)/ueventd.rc):root/ueventd.$(TARGET_PRODUCT).rc \
+    $(LOCAL_PATH)/gpt.ini:root/gpt.$(TARGET_PRODUCT).ini \
+    $(LOCAL_PATH)/init.recovery.rc:root/init.recovery.$(TARGET_PRODUCT).rc \
+
+PRODUCT_COPY_FILES += \
+	frameworks/native/data/etc/tablet_core_hardware.xml:system/etc/permissions/tablet_core_hardware.xml
+
+# Voip
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
+    frameworks/native/data/etc/android.software.sip.xml:system/etc/permissions/android.software.sip.xml \
+
+# Usb
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
+    frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml
+
+# Touch
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
+    frameworks/native/data/etc/android.hardware.touchscreen.multitouch.distinct.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.distinct.xml \
+    frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
+
+# USB
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
+    frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \
+
+# please modify to appropriate value based on tuning
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.hwui.texture_cache_size=24.0f \
+    ro.hwui.text_large_cache_width=2048 \
+    ro.hwui.text_large_cache_height=512
+
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+    persist.rtc_local_time=1 \
+
+# Enable MultiWindow
+PRODUCT_PROPERTY_OVERRIDES += \
+    persist.sys.debug.multi_window=true
+
+# DRM service
+PRODUCT_PROPERTY_OVERRIDES += \
+    drm.service.enabled=true
+
+# Property to choose between virtual/external wfd display
+PRODUCT_PROPERTY_OVERRIDES += \
+    persist.sys.wfd.virtual=0
+
+# Input resampling configuration
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.input.noresample=1
+
+# set default USB configuration
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+    persist.sys.usb.config=mtp
+
+# AOSP Packages
+PRODUCT_PACKAGES += \
+    Launcher3 \
+    Terminal
+
+PRODUCT_PACKAGES += \
+    libion \
+    libxml2
+
+PRODUCT_PACKAGES += \
+    libemoji
+
+PRODUCT_PACKAGES += \
+    LiveWallpapers \
+    LiveWallpapersPicker \
+    WallpaperPicker \
+    NotePad \
+    Provision \
+    drmserver \
+    power.project-celadon \
+    scp \
+    sftp \
+    ssh \
+    sshd \
+    local_time.default.so \
+    keystore.default.so
+
+# USB
+PRODUCT_PACKAGES += \
+    com.android.future.usb.accessory
+
+# Keymaster HAL
+PRODUCT_PACKAGES += \
+    android.hardware.keymaster@3.0-impl \
+    android.hardware.keymaster@3.0-service
+
+# Power HAL
+PRODUCT_PACKAGES += \
+    android.hardware.power@1.0-impl \
+    android.hardware.power@1.0-service
+
+# DumpState HAL
+PRODUCT_PACKAGES += \
+    android.hardware.dumpstate@1.0-impl \
+    android.hardware.dumpstate@1.0-service
+
+# Configstore HAL
+PRODUCT_PACKAGES += \
+    android.hardware.configstore@1.0-impl
+
+# Vendor Interface Manifest
+PRODUCT_COPY_FILES += \
+    device/intel/project-celadon/manifest.xml:vendor/manifest.xml
+##############################################################
+# Source: device/intel/mixins/groups/graphics/project-celadon/product.mk
+##############################################################
+# Mesa
+PRODUCT_PACKAGES += \
+    libGLES_mesa \
+    libGLES_android
+
+PRODUCT_PACKAGES += \
+    libdrm \
+    libdrm_intel \
+    libsync
+
+PRODUCT_COPY_FILES += \
+    device/intel/project-celadon/common/graphics/drirc:system/etc/drirc
+
+
+# HWComposer IA
+PRODUCT_PACKAGES += \
+    hwcomposer.project-celadon
+
+PRODUCT_PROPERTY_OVERRIDES += \
+   hwc.drm.use_overlay_planes=1 \
+   ro.hardware.hwcomposer=project-celadon
+
+# Mini gbm
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.hardware.gralloc=project-celadon
+
+PRODUCT_PACKAGES += \
+    gralloc.project-celadon
+
+
+
+# Mesa
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.opengles.aep.xml:system/etc/permissions/android.hardware.opengles.aep.xml
+
+# GLES version
+PRODUCT_PROPERTY_OVERRIDES += \
+   ro.opengles.version=196610
+
+
+
+
+# Graphics HAL
+PRODUCT_PACKAGES += \
+   android.hardware.graphics.composer@2.1-impl \
+   android.hardware.graphics.composer@2.1-service
+
+# Gralloc HAL
+PRODUCT_PACKAGES += \
+   android.hardware.graphics.allocator@2.0-impl \
+   android.hardware.graphics.allocator@2.0-service \
+   android.hardware.graphics.mapper@2.0-impl
+##############################################################
+# Source: device/intel/mixins/groups/media/project-celadon/product.mk
+##############################################################
+# libva, vaapi
+PRODUCT_PACKAGES += \
+    libva \
+    libva-android \
+    libva-egl \
+    libva-tpi \
+    i965_drv_video
+
+# Audio/video codec support.
+PRODUCT_COPY_FILES += \
+    frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
+    frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
+    frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \
+    device/intel/project-celadon/common/media/media_profiles.xml:system/etc/media_profiles.xml \
+    device/intel/project-celadon/common/media/media_codecs.xml:system/etc/media_codecs.xml \
+    device/intel/project-celadon/common/media/media_codecs_performance.xml:system/etc/media_codecs_performance.xml
+
+#Enable deep buffer for video playback
+PRODUCT_PROPERTY_OVERRIDES += media.stagefright.audio.deep=true
+
+# Enable AAC 5.1 output
+PRODUCT_PROPERTY_OVERRIDES += \
+    media.aac_51_output_enabled=true
+
+##############################################################
+# Source: device/intel/mixins/groups/device-type/car/product.mk
+##############################################################
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/car_core_hardware.xml:vendor/etc/permissions/car_core_hardware.xml \
+    frameworks/native/data/etc/android.hardware.type.automotive.xml:vendor/etc/permissions/android.hardware.type.automotive.xml \
+    frameworks/native/data/etc/android.hardware.screen.landscape.xml:vendor/etc/permissions/android.hardware.screen.landscape.xml \
+    frameworks/native/data/etc/android.hardware.ethernet.xml:vendor/etc/permissions/android.hardware.ethernet.xml \
+    frameworks/native/data/etc/android.hardware.broadcastradio.xml:vendor/etc/permissions/android.hardware.broadcastradio.xml \
+    frameworks/native/data/etc/android.software.activities_on_secondary_displays.xml:vendor/etc/permissions/android.software.activities_on_secondary_displays.xml
+
+# Make sure vendor car product overlays take precedence than google definition
+# under packages/services/Car/car_product/overlay/
+PRODUCT_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/device-type/overlay-car
+$(call inherit-product, packages/services/Car/car_product/build/car.mk)
+
+PRODUCT_PACKAGES += \
+    radio.fm.default \
+    CarSettings \
+    VmsPublisherClientSample \
+    VmsSubscriberClientSample \
+
+PRODUCT_PACKAGES += android.hardware.automotive.vehicle.intel@2.0-service
+
+VEHICLE_HAL_PROTO_TYPE := google-emulator
+##############################################################
+# Source: device/intel/mixins/groups/ethernet/dhcp/product.mk
+##############################################################
+PRODUCT_COPY_FILES += \
+        frameworks/native/data/etc/android.hardware.ethernet.xml:system/etc/permissions/android.hardware.ethernet.xml
+
+# Ethernet
+PRODUCT_PROPERTY_OVERRIDES += \
+   net.eth0.startonboot=1
+
+##############################################################
+# Source: device/intel/mixins/groups/display-density/default/product.mk
+##############################################################
+# Do not remove this file. Unable to update mixins without this.
+##############################################################
+# Source: device/intel/mixins/groups/usb-gadget/g_ffs/product.mk
+##############################################################
+# Set default USB interface
+USB_CONFIG := mtp
+ifeq ($(TARGET_BUILD_VARIANT),user)
+# Enable Secure Debugging
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.adb.secure=1
+PRODUCT_COPY_FILES += device/intel/common/usb-gadget/adb_keys:root/adb_keys
+ifeq ($(BUILD_FOR_CTS_AUTOMATION),true)
+# Build for automated CTS
+USB_CONFIG := $(USB_CONFIG),adb
+endif #BUILD_FOR_CTS_AUTOMATION == true
+endif #TARGET_BUILD_VARIANT == user
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.sys.usb.config=$(USB_CONFIG)
+
+##############################################################
+# Source: device/intel/mixins/groups/adb_net/true/product.mk
+##############################################################
+# Enable Secure Debugging
+ifeq ($(TARGET_BUILD_VARIANT),user)
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.adb.secure=1
+endif
+##############################################################
+# Source: device/intel/mixins/groups/slot-ab/true/product.mk
+##############################################################
+
+
+# Currently the update_verifier does not support AVB and A/B slot, so do not include it if enable AVB and A/B slot.
+# Will enable it after the update_verifier updated.
+#PRODUCT_PACKAGES += \
+    update_engine \
+    update_engine_client \
+    update_verifier
+##############################################################
+# Source: device/intel/mixins/groups/kernel/project-celadon/product.mk
+##############################################################
+TARGET_KERNEL_ARCH := x86_64
+BOARD_USE_64BIT_KERNEL := true
+
+
+KERNEL_MODULES_ROOT_PATH ?= /vendor/lib/modules
+KERNEL_MODULES_ROOT ?= $(KERNEL_MODULES_ROOT_PATH)
+
+FIRMWARES_DIR ?= vendor/linux/firmware
+
+# Include common settings.
+FIRMWARE_FILTERS ?= .git/% %.mk
+
+# Firmware
+$(call inherit-product,device/intel/project-celadon/common/firmware.mk)
+##############################################################
+# Source: device/intel/mixins/groups/bluetooth/btusb/product.mk
+##############################################################
+PRODUCT_PACKAGES += \
+    audio.a2dp.default \
+    ath3k-1.fw
+
+PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \
+		frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml
+
+# Bluetooth HAL
+PRODUCT_PACKAGES += \
+  android.hardware.bluetooth@1.0-impl \
+  android.hardware.bluetooth@1.0-service \
+  libbt-vendor
+##############################################################
+# Source: device/intel/mixins/groups/disk-bus/auto/product.mk
+##############################################################
+# create primary storage symlink dynamically
+PRODUCT_PACKAGES += set_storage
+##############################################################
+# Source: device/intel/mixins/groups/avb/true/product.mk
+##############################################################
+
+PRODUCT_PACKAGES += avbctl
+##############################################################
+# Source: device/intel/mixins/groups/vendor-partition/true/product.mk
+##############################################################
+PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/by-name/vendor
+##############################################################
+# Source: device/intel/mixins/groups/boot-arch/project-celadon/product.mk
+##############################################################
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.frp.pst=/dev/block/by-name/persistent
+
+ifeq ($(TARGET_BOOTLOADER_POLICY),$(filter $(TARGET_BOOTLOADER_POLICY),0x0 0x2 0x4 0x6))
+# OEM Unlock reporting 1
+#ADDITIONAL_DEFAULT_PROPERTIES += \
+        ro.oem_unlock_supported=1
+
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+        ro.oem_unlock_supported=1
+
+endif
+
+##############################################################
+# Source: device/intel/mixins/groups/audio/project-celadon/product.mk
+##############################################################
+# Tinyalsa
+PRODUCT_PACKAGES_DEBUG += \
+         tinymix \
+         tinyplay \
+         tinycap
+
+# Extended Audio HALs
+PRODUCT_PACKAGES += \
+    audio.r_submix.default \
+    audio.usb.default \
+    audio_policy.default.so \
+    audio_configuration_files
+
+# Audio HAL
+PRODUCT_PACKAGES += \
+    android.hardware.audio.effect@2.0-impl \
+    android.hardware.audio@2.0-impl \
+    android.hardware.audio@2.0-service
+##############################################################
+# Source: device/intel/mixins/groups/wlan/iwlwifi/product.mk
+##############################################################
+PRODUCT_PACKAGES += \
+    hostapd \
+    hostapd_cli \
+	wificond \
+    wifilogd \
+    wpa_supplicant \
+    wpa_cli \
+    iw
+   
+# FW and PNVM
+PRODUCT_PACKAGES += \
+    iwl-fw          \
+    iwl-nvm
+
+# iwlwifi USC
+PRODUCT_PACKAGES += \
+    wifi_intel_usc
+
+#copy iwlwifi wpa config files
+PRODUCT_COPY_FILES += \
+        device/intel/common/wlan/wpa_supplicant-common.conf:system/etc/wifi/wpa_supplicant.conf \
+        device/intel/common/wlan/iwlwifi/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \
+        frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
+        frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml
+
+
+
+# Wifi configuration
+BOARD_WPA_SUPPLICANT_DRIVER := NL80211
+BOARD_WLAN_DEVICE := iwlwifi
+
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+    ro.wifi.softap_dualband_allow=false
+
+PRODUCT_PACKAGES += \
+  android.hardware.wifi@1.0-service
+##############################################################
+# Source: device/intel/mixins/groups/rfkill/true/product.mk
+##############################################################
+PRODUCT_COPY_FILES += device/intel/common/rfkill/rfkill-init.sh:system/bin/rfkill-init.sh
+##############################################################
+# Source: device/intel/mixins/groups/usb/host+acc/product.mk
+##############################################################
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
+    frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml
+
+# usb accessory
+PRODUCT_PACKAGES += \
+    com.android.future.usb.accessory
+
+# USB HAL
+PRODUCT_PACKAGES += \
+    android.hardware.usb@1.0-impl \
+    android.hardware.usb@1.0-service
+##############################################################
+# Source: device/intel/mixins/groups/lights/true/product.mk
+##############################################################
+# Lights HAL
+BOARD_SEPOLICY_DIRS += \
+    device/intel/project-celadon/sepolicy/light
+
+PRODUCT_PACKAGES += lights.project-celadon \
+    android.hardware.light@2.0-service \
+    android.hardware.light@2.0-impl
+##############################################################
+# Source: device/intel/mixins/groups/thermal/dptf/product.mk
+##############################################################
+# DPTF
+INTEL_MODEM_CTL := true
+PRODUCT_PACKAGES += esif_ufd \
+    dsp.dv \
+    dptf.dv \
+    libc++_shared.so \
+    Dptf \
+    DptfPolicyActive \
+    DptfPolicyAdaptivePerformance \
+    DptfPolicyConditionalLogicLib \
+    DptfPolicyCritical \
+    DptfPolicyEmergencyCallMode \
+    DptfPolicyPassive \
+    DptfPolicyVirtualSensor \
+    upe_java \
+    jhs
+PRODUCT_COPY_FILES += $(LOCAL_PATH)/dptf.dv:/system/etc/dptf/dv/dptf.dv
+##############################################################
+# Source: device/intel/mixins/groups/debug-logs/true/product.mk
+##############################################################
+ifneq ($(TARGET_BUILD_VARIANT),user)
+MIXIN_DEBUG_LOGS := true
+endif
+
+ifeq ($(MIXIN_DEBUG_LOGS),true)
+PRODUCT_COPY_FILES += $(LOCAL_PATH)/init.logs.rc:root/init.logs.rc
+PRODUCT_PACKAGES += \
+    elogs.sh \
+    start_log_srv.sh \
+    logcat_ep.sh
+endif
+
+ifeq ($(MIXIN_DEBUG_LOGS),true)
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.service.default_logfs=apklogfs
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.intel.logger=/system/bin/logcat
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += logd.kernel.raw_message=False
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.intel.logger.rot_cnt=20
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.intel.logger.rot_size=5000
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/debug-logs
+BOARD_SEPOLICY_M4DEFS += module_debug_logs=true
+endif
+##############################################################
+# Source: device/intel/mixins/groups/debug-crashlogd/true/product.mk
+##############################################################
+ifeq ($(MIXIN_DEBUG_LOGS),true)
+PRODUCT_COPY_FILES += \
+	$(LOCAL_PATH)/init.crashlogd.rc:root/init.crashlogd.rc \
+	$(call add-to-product-copy-files-if-exists,$(LOCAL_PATH)/ingredients.conf:$(TARGET_COPY_OUT_VENDOR)/etc/ingredients.conf) \
+	$(call add-to-product-copy-files-if-exists,$(LOCAL_PATH)/crashlog.conf:$(TARGET_COPY_OUT_VENDOR)/etc/crashlog.conf)
+PRODUCT_PACKAGES += crashlogd \
+	dumpstate_dropbox.sh
+endif
+
+ifeq ($(MIXIN_DEBUG_LOGS),true)
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.crashlogd.data_quota=50
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/crashlogd
+
+CRASHLOGD_LOGS_PATH := "/data/logs"
+CRASHLOGD_APLOG := true
+CRASHLOGD_FULL_REPORT := true
+CRASHLOGD_MODULE_MODEM ?= true
+CRASHLOGD_USE_SD := false
+endif
+##############################################################
+# Source: device/intel/mixins/groups/debug-coredump/true/product.mk
+##############################################################
+ifeq ($(MIXIN_DEBUG_LOGS),true)
+PRODUCT_COPY_FILES += $(LOCAL_PATH)/init.coredump.rc:root/init.coredump.rc
+endif
+
+ifeq ($(MIXIN_DEBUG_LOGS),true)
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/coredump
+# Enable core dump for eng builds
+ifeq ($(TARGET_BUILD_VARIANT),eng)
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.core.enabled=1
+else
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.core.enabled=0
+endif
+CRASHLOGD_COREDUMP := true
+endif
+##############################################################
+# Source: device/intel/mixins/groups/debug-phonedoctor/true/product.mk
+##############################################################
+ifeq ($(MIXIN_DEBUG_LOGS),true)
+PRODUCT_PACKAGES += crash_package
+endif
+##############################################################
+# Source: device/intel/mixins/groups/debug-tools/true/product.mk
+##############################################################
+PRODUCT_PACKAGES_DEBUG += \
+    AndroidTerm \
+    libjackpal-androidterm4 \
+    peeknpoke \
+    pytimechart-record \
+    lspci
+##############################################################
+# Source: device/intel/mixins/groups/midi/true/product.mk
+##############################################################
+# MIDI support
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.software.midi.xml:system/etc/permissions/android.software.midi.xml
+##############################################################
+# Source: device/intel/mixins/groups/trusty/true/product.mk
+##############################################################
+
+KM_VERSION := 2
+
+ifeq ($(KM_VERSION),2)
+PRODUCT_PACKAGES += \
+	keystore.trusty
+PRODUCT_PROPERTY_OVERRIDES += \
+	ro.hardware.keystore=trusty
+endif
+
+ifeq ($(KM_VERSION),1)
+PRODUCT_PACKAGES += \
+	keystore.project-celadon
+endif
+
+PRODUCT_PACKAGES += \
+	libtrusty \
+	storageproxyd \
+	libtrustystorage \
+	libtrustystorageinterface \
+	gatekeeper.trusty \
+	android.hardware.gatekeeper@1.0-impl \
+	android.hardware.gatekeeper@1.0-service
+
+PRODUCT_PROPERTY_OVERRIDES += \
+	ro.hardware.gatekeeper=trusty
+
+##############################################################
+# Source: device/intel/mixins/groups/memtrack/true/product.mk
+##############################################################
+# memtrack HAL
+PRODUCT_PACKAGES += \
+	memtrack.project-celadon \
+	android.hardware.memtrack@1.0-service \
+	android.hardware.memtrack@1.0-impl
+##############################################################
+# Source: device/intel/mixins/groups/touch/galax7200/product.mk
+##############################################################
+PRODUCT_COPY_FILES += \
+        frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:vendor/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml\
+        device/intel/common/touch/Vendor_0eef_Product_7200.idc:system/usr/idc/Vendor_0eef_Product_7200.idc
+##############################################################
+# Source: device/intel/mixins/groups/debug-kernel/default/product.mk
+##############################################################
+ifneq ($(TARGET_BUILD_VARIANT),user)
+PRODUCT_COPY_FILES += $(LOCAL_PATH)/init.kernel.rc:root/init.kernel.rc
+endif
+##############################################################
+# Source: device/intel/mixins/groups/debug-unresponsive/default/product.mk
+##############################################################
+ifneq ($(TARGET_BUILD_VARIANT),user)
+
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += sys.dropbox.max_size_kb=4096
+
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += sys.dump.binder_stats.uiwdt=1
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += sys.dump.binder_stats.anr=1
+
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += sys.dump.peer_depth=3
+
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += sys.dump.stacks_timeout=1500
+
+endif
+# ------------------ END MIX-IN DEFINITIONS ------------------
+PRODUCT_PACKAGES += libhoudini houdini
+PRODUCT_PROPERTY_OVERRIDES += ro.dalvik.vm.isa.arm=x86 ro.enable.native.bridge.exec=1
+
+ENABLE_NATIVEBRIDGE_64BIT := false
+ifeq ($(BOARD_USE_64BIT_USERSPACE),true)
+  ENABLE_NATIVEBRIDGE_64BIT = true
+else
+  ifeq ($(TARGET_SUPPORTS_64_BIT_APPS),true)
+    ENABLE_NATIVEBRIDGE_64BIT = true
+  endif
+endif
+ifeq ($(ENABLE_NATIVEBRIDGE_64BIT),true)
+  PRODUCT_PACKAGES += houdini64
+  PRODUCT_PROPERTY_OVERRIDES += ro.dalvik.vm.isa.arm64=x86_64 ro.enable.native.bridge.exec64=1
+endif
+##############################################################
+# Source: device/intel/mixins/groups/debug-phonedoctor/true/product.mk
+##############################################################
+ifeq ($(MIXIN_DEBUG_LOGS),true)
+PRODUCT_PACKAGES += crash_package
+endif
+
+
diff --git a/cel_apl/dptf.dv b/cel_apl/dptf.dv
new file mode 100644
index 0000000000000000000000000000000000000000..c973bb3478408a7f08d035765e2fa33b8efc33e9
GIT binary patch
literal 2721
zcmaDV-@yO`Odukqpd<}M;{q-LA#Mr*`8k=%l?u-Jd1;yHrA3J)nfZCRG@yywFr86R
z368z%zVYl+@h!g|NX9QLl;mPy@OF(1zOjH2s9G9`^$QY<N-~o(3lj56iuFBRLwxmI
z4D{oHf(-0H>3u-V0>mKYAix2{++Y?1Lri?IQ@mb?o1Y;z;b3n+u+9{yYLF?&>;NQj
z8zi;{5?cg`{T~QGT#z}WunBs#1nSi?put$Y=Nu4<OBmftz`z9qkT?tw!zSd!%#`8+
zaBPGCO$Eh@0Mzv7UB{;X5}o6@<7Dg#*@QeUWVz16Q>}J9(R5p?c2uV$DSI8V+%?A~
zPFd@;-Bx&e^*o=TewmO13X01h$zc=FVvvu(2^dI|9$v771TqCVyv%rk0zd!~=LEAL
zY*^9*i7()XNPyTUkklZXgPdfbN*Hi?F9aC3pwymTQk=oS22>3)_yEu}hz2zv4>fzh
zG~^@}m&B)*=O)G%<d>%wF-Sr61_BKsN-tPjd}(oN3S6%l(AR_<T2PRj3{C)Zpcca7
z0pxHP0I_#K^C&o^j36=~_61NX00IzOKpo5kvynp+Ife?vk<=iW^98C1-AtG{5Ra$=
zHDeFJlA_Flg8a<95@1P_Yyb~?P`)Nft0DPXjmXz(OukkV^0k_huhoovt>)xwwIE-s
zCAnIYi^z_gWMDl2D+CPqV40DqG@Ox-&`M$&1{SSwTR~+Y&LRL<pW-R2us9Q{0Y_G2
zf!jr-Rzz02!~=6Cky;U1Z2_rT5wV#^s#Zi+vmsS0ky#B}2ossruxTYSt6|ehWLCqb
I6*a2?0P?|j9{>OV

literal 0
HcmV?d00001

diff --git a/cel_apl/efivar_oemlock b/cel_apl/efivar_oemlock
new file mode 100644
index 0000000000000000000000000000000000000000..b93dad1699a21a139d1b37baa32c7d92901cb800
GIT binary patch
literal 45
wcmWe&U|{fPaAoji@L|YjNM^_e@|(C$Nb&e*yUv<<Z{HTfKL?qCVvHaR0M!2qY5)KL

literal 0
HcmV?d00001

diff --git a/cel_apl/flash.json b/cel_apl/flash.json
new file mode 100644
index 000000000..432041c04
--- /dev/null
+++ b/cel_apl/flash.json
@@ -0,0 +1,509 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/boot-arch/project-celadon/flash.json
+##############################################################
+{
+    "flash": {
+        "commands": [
+            {
+                "args": "flashing unlock",
+                "description": "Set device state to unlocked",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash gpt ${gpt}",
+                "description": "Initialize the partition table",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash bootloader ${bootloader}",
+                "description": "Flash bootloader partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "reboot bootloader",
+                "description": "Reboot system to fastboot mode",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "erase misc",
+                "description": "Erase misc partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "erase persistent",
+                "description": "Erase persistent partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "erase metadata",
+                "description": "Erase metadata partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "format config",
+                "description": "Format config partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "format data",
+                "description": "Format data partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash vbmeta_a ${vbmeta}",
+                "description": "Flash vbmeta_a partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash vbmeta_b ${vbmeta}",
+                "description": "Flash vbmeta_b partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash boot_a ${boot}",
+                "description": "Flash boot_a partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash boot_b ${boot}",
+                "description": "Flash boot_b partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash tos_a ${tos}",
+                "description": "Flash tos_a partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash tos_b ${tos}",
+                "description": "Flash tos_b partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash system_a ${system}",
+                "description": "Flash system_a partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 600000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash system_b ${system}",
+                "description": "Flash system_b partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 600000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash vendor_a ${vendor}",
+                "description": "Flash vendor partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash vendor_b ${vendor}",
+                "description": "Flash vendor_b partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flash factory ${factory}",
+                "description": "Flash factory partition",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "set_active a",
+                "description": "Set active slot to a",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "blank"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "flashing lock",
+                "description": "Set device state to locked",
+                "group": "lock-device",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            },
+            {
+                "args": "continue",
+                "description": "Boot to main OS",
+                "mandatory": true,
+                "precondition": {
+                    "description": "Check battery level: ${battery}mV",
+                    "expression": "${battery} >= 3500",
+                    "skipOnFailure": false
+                },
+                "restrict": [
+                    "blank",
+                    "update"
+                ],
+                "retry": 1,
+                "timeout": 60000,
+                "tool": "fastboot"
+            }
+        ],
+        "configurations": {
+            "blank": {
+                "brief": "blank",
+                "description": "erase and flash all partitions, all data will be lost.",
+                "groupsState": {
+                    "check-battery": true,
+                    "erase-efivars": true,
+                    "lock-device": true
+                },
+                "name": "blank",
+                "startState": "pos"
+            },
+            "update": {
+                "brief": "update",
+                "default": true,
+                "description": "update phone to new release",
+                "groupsState": {
+                    "check-battery": true,
+                    "lock-device": true
+                },
+                "name": "update",
+                "startState": "pos"
+            }
+        },
+        "groups": {
+            "check-battery": {
+                "description": "Check battery level before sending fastboot command",
+                "name": "Check battery level"
+            },
+            "erase-efivars": {
+                "description": "Erase all optional efi vars",
+                "name": "Erase efi vars"
+            },
+            "lock-device": {
+                "description": "Put the device in locked state at the end of the flash procedure.",
+                "name": "Lock the device (it implies the userdata partition wipe)"
+            }
+        },
+        "osplatform": "android",
+        "parameters": {
+            "battery": {
+                "computedValue": "$1",
+                "description": "Fetch battery",
+                "filter": "battery-voltage:[\\s]*([0-9]+)mV",
+                "name": "battery",
+                "subCommand": {
+                    "args": "getvar battery-voltage",
+                    "description": "Fetch battery",
+                    "mandatory": true,
+                    "retry": 1,
+                    "timeout": 60000,
+                    "tool": "fastboot"
+                },
+                "type": "variable",
+                "value": 3500
+            },
+            "boot": {
+                "description": "boot.img",
+                "name": "boot",
+                "type": "file",
+                "value": "boot.img"
+            },
+            "bootloader": {
+                "description": "bootloader",
+                "name": "bootloader",
+                "type": "file",
+                "value": "bootloader"
+            },
+            "gpt": {
+                "description": "gpt.bin",
+                "name": "gpt",
+                "type": "file",
+                "value": "gpt.bin"
+            },
+            "vbmeta": {
+                "description": "vbmeta.img",
+                "name": "vbmeta",
+                "type": "file",
+                "value": "vbmeta.img"
+            },
+            "recovery": {
+                "description": "recovery.img",
+                "name": "recovery",
+                "type": "file",
+                "value": "recovery.img"
+            },
+            "factory": {
+                "description": "factory.img",
+                "name": "factory",
+                "type": "file",
+                "value": "factory.img"
+            },
+            "system": {
+                "description": "system.img",
+                "name": "system",
+                "type": "file",
+                "value": "system.img"
+            },
+            "vendor": {
+                "description": "vendor.img",
+                "name": "vendor",
+                "type": "file",
+                "value": "vendor.img"
+            },
+            "tos": {
+                "description": "tos.img",
+                "name": "tos",
+                "type": "file",
+                "value": "tos.img"
+            }
+        },
+        "version": "3.0"
+    }
+}
+# ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/cel_apl/flashfiles.ini b/cel_apl/flashfiles.ini
new file mode 100644
index 000000000..6b93a0411
--- /dev/null
+++ b/cel_apl/flashfiles.ini
@@ -0,0 +1,244 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/factory-partition/true/flashfiles.ini
+##############################################################
+[output.installer.cmd]
+additional-files += factory.img
+
+[group.erase-factory]
+name = Erase factory partition
+description = Erase factory partition, use with caution
+default = false
+
+[command.format.factory]
+tool = fastboot
+args = format factory
+description = Format factory partition
+group = erase-factory
+##############################################################
+# Source: device/intel/mixins/groups/config-partition/enabled/flashfiles.ini
+##############################################################
+[output.install.cmd]
+additional-files += radio:config.img
+
+[command.format.config]
+tool = fastboot
+arg = format config
+description = Format config partition
+##############################################################
+# Source: device/intel/mixins/groups/avb/true/flashfiles.ini
+##############################################################
+
+[command.flash.vbmeta]
+tool = fastboot
+args = flash vbmeta_a $file
+file = images:vbmeta.img
+description = Flash vbmeta_a partition
+##############################################################
+# Source: device/intel/mixins/groups/vendor-partition/true/flashfiles.ini
+##############################################################
+##############################################################
+# Source: device/intel/mixins/groups/flashfiles/ini/flashfiles.ini
+##############################################################
+# This file describe the commands needed to flash the board.
+# it is used to generate a json file for PhoneFlashTool, and
+# also to generate a script for the USB thumb drive installer.
+
+# there are 4 types of sections:
+# [output.xxx.yy] : tell the script to generate a file named xxx.yyy
+# [configuration.xxx] : add a new configuration in the PhoneFlashTool droplist
+#     each configuration defines the list of sets of commands.
+#     each command sets will be executed in the order they are in this file.
+#     for a configuration to be embeded in a json output file, it must
+#     be present in the "configurations" list of it
+# [command.xxxx.yyyy] : add a new command yyyy to the command set xxxxx
+#     so if a configuration has sets = "format reboot" then all commands
+#     [command.format.yyy] will be executed, followed by all [command.reboot.yyy]
+#     if the command requires a file to be passed, you can use $my_file in the args
+#     and then my_file = src:filename where src is the location of the file at
+#     build time (provdatazip, image, ...).
+# [group.xxxx] : add a checkbox in PFT UI, to enable/disable all commands
+#     which are member of this group. the default can be overriden in a configuration
+#     by setting override-xxxx = true or false.
+
+
+[global]
+# if you need additional files in the flashfiles.zip.
+# additional-files += radio:dediprog.bin
+
+[output.flash.json]
+fastboot-command-options += timeout=60000 retry=1 mandatory=true
+enable = true
+version = 3.0
+configurations += update blank
+
+[output.installer.cmd]
+sets = unlock partition erase format flash configure lock reboot
+additional-files += provdatazip:installer.efi provdatazip:startup.nsh
+enable = true
+
+[configuration.update]
+startState = pos
+sets = unlock slot-ab flash capsule lock reboot
+default = true
+description = update phone to new release
+brief = update
+
+[configuration.blank]
+startState = dnx_os
+sets = fw_update bootstrap unlock partition slot-ab erase format flash capsule configure lock reboot
+description = erase and flash all partitions, all data will be lost.
+brief = blank
+
+[group.delete-capsule]
+name = Disable capsule update
+description = Disable capsule update by deleting the capsule file from the ESP partition
+default = false
+
+[output.flash.json]
+fastboot-command-preconditions += battery
+
+[parameter.battery]
+name = battery
+type = variable
+tool = fastboot
+arg = getvar battery-voltage
+description = Fetch battery
+computedValue = $1
+filter = battery-voltage:[\s]*([0-9]+)mV
+value = 3500
+
+# The command.battery will be called before each fastboot command to get the battery level
+[group.check-battery]
+name = Check battery level
+description = Check battery level before sending fastboot command
+default = true
+
+[command.battery]
+tool = setVariable
+variable = battery
+description = Get battery level
+group = check-battery
+mandatory = false
+defaultValue = 3500
+
+# The precondition.battery will be checked before each fastboot command to ensure that battery
+# level is above the specified threshold
+[precondition.battery]
+tool = fastboot
+exception = bootstrap
+description = Check battery level: ${battery}mV
+expression = ${battery} >= 3500
+skipOnFailure = false
+
+[parameter.slot]
+name = slot
+type = variable
+tool = fastboot
+arg = getvar current-slot
+description = Get current slot
+computedValue = $1
+filter = current-slot:[\s]*(_[a-z]+)
+value = _a
+
+[command.slot-ab.get-active]
+tool = setVariable
+variable = slot
+description = Get the active slot
+defaultValue = _a
+mandatory = false
+
+[command.slot-ab.set-active]
+tool = fastboot
+args = --set-active=${slot}
+description = Set the active slot
+
+[command.unlock.unlock]
+tool = fastboot
+args = flashing unlock
+description = Set device state to unlocked
+
+[command.erase.misc]
+tool = fastboot
+args = erase misc
+description = Erase misc partition
+
+[command.erase.persistent]
+tool = fastboot
+args = erase persistent
+description = Erase persistent partition
+
+[command.erase.metadata]
+tool = fastboot
+args = erase metadata
+description = Erase metadata partition
+
+[group.erase-efivars]
+name = Erase efi vars
+description = Erase all optional efi vars
+default = true
+
+[command.erase.efivars]
+tool = fastboot
+args = oem erase-efivars
+description = Erase all optional efi vars
+group = erase-efivars
+
+
+[command.flash.boot]
+tool = fastboot
+args = flash boot $file
+file = boot:boot:boot.img
+description = Flash boot partition
+
+
+[command.flash.system]
+tool = fastboot
+args = flash system $file
+file = images:system.img
+timeout = 600000
+description = Flash system partition
+
+[command.flash.bootloader]
+tool = fastboot
+args = flash bootloader $file
+file = bootloader:bootloader
+description = Flash bootloader partition
+
+[command.capsule.rm-capsule]
+tool = fastboot
+args = oem rm /ESP/BIOSUPDATE.FV
+group = delete-capsule
+description = Delete firmware capsule
+
+
+[command.format.data]
+tool = fastboot
+args = format data
+description = Format data partition
+
+[group.lock-device]
+name = Lock the device (it implies the userdata partition wipe)
+description = Put the device in locked state at the end of the flash procedure.
+default = true
+
+[command.lock.lock]
+tool = fastboot
+args = flashing lock
+group = lock-device
+description = Set device state to locked
+
+[command.reboot.continue]
+tool = fastboot
+args = continue
+description = Boot to main OS
+##############################################################
+# Source: device/intel/mixins/groups/trusty/true/flashfiles.ini
+##############################################################
+[command.flash.tos]
+tool = fastboot
+args = flash tos $file
+file = radio:tos.img
+description = Flash tos partition
+# ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/cel_apl/fstab b/cel_apl/fstab
new file mode 100644
index 000000000..07595ed6b
--- /dev/null
+++ b/cel_apl/fstab
@@ -0,0 +1,49 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/storage/sdcard-mmc0-usb-sd/fstab
+##############################################################
+*/usb*/*/host*/*/block/sd*              auto             auto    defaults                                   voldmanaged=usbdisk:auto
+*/mmc0/*/block/mmcblk*                  auto             auto    defaults                                   voldmanaged=sdcard1:auto,encryptable=userdata
+##############################################################
+# Source: device/intel/mixins/groups/factory-partition/true/fstab
+##############################################################
+/dev/block/by-name/factory      /factory        ext4    rw,noatime                                                  wait
+##############################################################
+# Source: device/intel/mixins/groups/config-partition/enabled/fstab
+##############################################################
+/dev/block/by-name/config	    /oem_config     ext4    noatime,nosuid,nodev,errors=panic                           wait,check
+##############################################################
+# Source: device/intel/mixins/groups/avb/true/fstab
+##############################################################
+/dev/block/by-name/vbmeta       /vbmeta         emmc    defaults                                                    defaults,slotselect,avb
+##############################################################
+# Source: device/intel/mixins/groups/vendor-partition/true/fstab
+##############################################################
+# Following line is required if you use a vendor image.
+# If the vendor image is not used,
+# following line should be commented with the related ones in BoardConfig.mk
+/dev/block/by-name/vendor	    /vendor         ext4    ro                                                          wait,slotselect,avb
+##############################################################
+# Source: device/intel/mixins/groups/boot-arch/project-celadon/fstab
+##############################################################
+# Android fstab file.
+# <src>                   <mnt_point> <type>  <mnt_flags and options>  <fs_mgr_flags>
+# The filesystem that contains the filesystem checker binary (typically /system) cannot
+# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
+
+/devices/*/usb*/*               auto            auto    defaults                                                    voldmanaged=usb:auto,encryptable=userdata
+/devices/*/*sdmmc*/*            auto            auto    defaults                                                    voldmanaged=sdcard1:auto,encryptable=userdata
+/devices/*/80860F14:01/mmc_*    auto            auto    defaults                                                    voldmanaged=sdcard1:auto,encryptable=userdata
+
+# If enable AVB and A/B slot, then will mount system partition as / through /dev/dm-0
+/dev/block/by-name/system       /               ext4    ro                                                          wait,slotselect,avb
+/dev/block/by-name/data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts,quota
+/dev/block/by-name/boot         /boot           emmc    defaults                                                    defaults,slotselect,avb
+/dev/block/by-name/misc         /misc           emmc    defaults                                                    defaults
+/dev/block/by-name/bootloader   /bootloader     emmc    defaults                                                    recoveryonly
+/dev/block/by-name/bootloader2  /bootloader2    emmc    defaults                                                    recoveryonly
+/dev/block/by-name/persistent   /persistent     emmc    defaults                                                    defaults
+/dev/block/by-name/metadata     /metadata       emmc    defaults                                                    defaults
+/dev/block/by-name/tos          /tos            emmc    defaults                                                    defaults,slotselect,avb
+# ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/cel_apl/gpt.ini b/cel_apl/gpt.ini
new file mode 100644
index 000000000..10f6ab812
--- /dev/null
+++ b/cel_apl/gpt.ini
@@ -0,0 +1,106 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/boot-arch/project-celadon/gpt.ini
+##############################################################
+[base]
+partitions = bootloader bootloader2 boot  misc metadata system persistent vendor config factory tos vbmeta teedata data
+device = auto
+nb_slot = 2
+
+[partition.bootloader]
+label = bootloader
+len = 60
+type = esp
+guid = 2568845d-2332-4675-bc39-8fa5a4748d15
+efi_loader = \loader.efi
+efi_title = PROJECT-CELADON
+flags = boot
+
+[partition.bootloader2]
+label = bootloader2
+len = 60
+type = fat
+guid = 114eaffe-1552-4022-b26e-9b053604cf84
+
+[partition.boot]
+label = boot
+len = 30
+type = boot
+has_slot = true
+guid = 49a4d17f-93a3-45c1-a0de-f50b2ebe2599
+
+
+[partition.misc]
+label = misc
+len = 1
+type = misc
+guid = ef32a33b-a409-486c-9141-9ffb711f6266
+
+[partition.metadata]
+label = metadata
+len = 16
+type = metadata
+guid = 20ac26be-20b7-11e3-84c5-6cfdb94711e9
+
+[partition.system]
+label = system
+len = 3584
+type = linux
+has_slot = true
+guid = 38f428e6-d326-425d-9140-6e0ea133647c
+
+
+[partition.data]
+label = data
+len = -1
+type = linux
+guid = dc76dda9-5ac1-491c-af42-a82591580c0d
+
+[partition.persistent]
+label = persistent
+len = 1
+type = linux
+guid = ebc597d0-2053-4b15-8b64-e0aac75f4db1
+
+[partition.vendor]
+label = vendor
+len = 1500
+type = linux
+has_slot = true
+guid = c5a0aeec-13ea-11e5-a1b1-001e67ca0c3c
+
+[partition.config]
+label = config
+len = 8
+type = linux
+guid = bd59408b-4514-490d-bf12-9878d963f378
+
+[partition.factory]
+label = factory
+len = 10
+type = linux
+guid = 8f68cc74-c5e5-48da-be91-a0c8c15e9c80
+
+[partition.tos]
+label = tos
+len = 10
+type = boot
+has_slot = true
+guid = 52cd00fd-f5b0-4061-b3a5-65b07f2179f0
+
+[partition.vbmeta]
+label = vbmeta
+len = 2
+type = linux
+has_slot = true
+# Randum generate a guid
+guid = 7ced364c-3b5a-4eba-9f5c-9fef1327cb50
+
+[partition.teedata]
+label = teedata
+len = 32
+type = linux
+# Randum generate a guid
+guid = f0c8e9aa-57f6-4155-8aef-4e0549217563
+# ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/cel_apl/hwc-valsetup.sh b/cel_apl/hwc-valsetup.sh
new file mode 100644
index 000000000..7a7356112
--- /dev/null
+++ b/cel_apl/hwc-valsetup.sh
@@ -0,0 +1,10 @@
+LOCAL_PATH="$(gettop)"
+HWCOMPOSER_PATH="$(find vendor -name hwcomposer*)"
+export HWCVAL_ROOT=$LOCAL_PATH/$HWCOMPOSER_PATH/tests/hwc-val/tests/hwc
+export VAL_HWC_TOP="`( cd "$HWCVAL_ROOT/../.." && pwd)`"
+export PATH=$HWCVAL_ROOT/host_scripts:$HWCVAL_ROOT/tools:$PATH
+export CLIENT_LOGS=$HOME/client_logs
+
+# Target directories
+export HWCVAL_TARGET_DIR=/data/validation/hwc
+export HWCVAL_TARGET_SCRIPT_DIR=/data/validation/hwc
diff --git a/cel_apl/init.coredump.rc b/cel_apl/init.coredump.rc
new file mode 100644
index 000000000..6263c89ca
--- /dev/null
+++ b/cel_apl/init.coredump.rc
@@ -0,0 +1,21 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/debug-coredump/true/init.coredump.rc
+##############################################################
+on early-init
+    setrlimit 4 -1 -1
+
+    # Add code sections in coredump
+    write /proc/self/coredump_filter 0x2F
+
+on post-fs-data
+    mkdir /data/core 0773 root log
+    write /proc/sys/kernel/core_pattern /data/core/%t_%p_%s_%e.core
+
+on property:persist.core.enabled=0
+    setrlimit 4 0 0
+
+on property:persist.core.enabled=1
+    setrlimit 4 -1 -1
+# ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/cel_apl/init.crashlogd.rc b/cel_apl/init.crashlogd.rc
new file mode 100644
index 000000000..c94ad194c
--- /dev/null
+++ b/cel_apl/init.crashlogd.rc
@@ -0,0 +1,28 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/debug-crashlogd/true/init.crashlogd.rc
+##############################################################
+on init
+    write /proc/sys/fs/suid_dumpable 1
+
+on post-fs-data
+##    mkdir /data/tombstones 0775 system system
+    mkdir /data/system 0755 system system
+    mkdir /data/system/dropbox 0700 system system
+    mkdir /data/logs/modemcrash 0775 system system
+    mkdir /data/logs/stats 0775 system system
+    mkdir /data/logs/aplogs 0775 system log
+    trigger delayed-fs-data
+
+on delayed-fs-data
+    mkdir /data/tombstones 0775 system system
+
+service crashlogd /system/vendor/bin/crashlogd
+    class late_start
+
+# started by vendor/intel/log_capture/crashlog
+service logsystemstate /system/vendor/bin/dumpstate_dropbox.sh -v
+    disabled
+    oneshot
+# ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/cel_apl/init.kernel.rc b/cel_apl/init.kernel.rc
new file mode 100644
index 000000000..e249cdc6e
--- /dev/null
+++ b/cel_apl/init.kernel.rc
@@ -0,0 +1,12 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/debug-kernel/default/init.kernel.rc
+##############################################################
+on early-init
+    write /proc/sys/kernel/panic_on_stackoverflow 1
+
+on fs
+    # Overwrite system/core/rootdir/init.rc config declared "on init"
+    write /proc/sys/kernel/hung_task_timeout_secs 120
+# ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/cel_apl/init.logs.rc b/cel_apl/init.logs.rc
new file mode 100644
index 000000000..04907eae8
--- /dev/null
+++ b/cel_apl/init.logs.rc
@@ -0,0 +1,58 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/debug-logs/true/init.logs.rc
+##############################################################
+on post-fs-data
+    mkdir /data/logs 0770 system log
+
+on property:persist.service.aplogfs.enable=0
+    stop ap_logfs
+
+on property:persist.service.aplogfs.enable=1
+    setprop persist.service.apklogfs.enable 0
+    restart ap_log_srv
+
+on property:persist.service.apklogfs.enable=0
+    stop apk_logfs
+
+on property:persist.service.apklogfs.enable=1
+    setprop persist.service.aplogfs.enable 0
+    restart ap_log_srv
+
+service apk_logfs /system/vendor/bin/logcat_ep.sh auto \
+        -b main -b system -b radio -b events -b crash -b kernel \
+        -v threadtime -f /data/logs/aplog
+    disabled
+
+service ap_logfs /system/vendor/bin/logcat_ep.sh auto \
+        -b main -b system -b radio -b events -b crash \
+        -v threadtime -f /data/logs/aplog
+    disabled
+
+# Service called at boot time after data is decrypted
+#
+# This is done through the late_start class or through persist properties
+# that are only available after data is decrypted.
+# The service may be called again when the properties are updated.
+service ap_log_srv /system/vendor/bin/start_log_srv.sh
+    class late_start
+    oneshot
+
+service earlylogs /system/vendor/bin/elogs.sh
+    class core
+    oneshot
+
+on nonencrypted
+    stop earlylogs
+
+on property:vold.decrypt=trigger_restart_framework
+    stop earlylogs
+
+on property:persist.service.elogs.enable=1
+    mkdir /cache/elogs 0770 system log
+    restorecon /cache/elogs
+
+on property:persist.service.elogs.enable=0
+    exec -- /system/bin/rm -rf /cache/elogs
+# ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/cel_apl/init.rc b/cel_apl/init.rc
new file mode 100644
index 000000000..b241fbe25
--- /dev/null
+++ b/cel_apl/init.rc
@@ -0,0 +1,679 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/project-celadon/default/init.rc
+##############################################################
+
+on init
+    # Android creates by-name disk links with the disk controller
+    # in the generated path, so that the names pulled out of the GPT
+    # can be associated with the correct disk. Create a shortcut to
+    # /dev/block/by-name so that we can use the same fstabs everywhere.
+    mkdir /dev/block 0755 root root
+    exec u:r:set_storage:s0 root root -- /sbin/set_storage
+    # The following line maybe replaced by scripts in SKL.
+    # symlink /dev/block/pci/pci0000:00/0000:00:1c.0/by-name /dev/block/by-name
+
+    # Load persistent dm-verity state and detect if a restart was
+    # triggered after dm-verity detected a corrupted block
+    # And maybe trigger verity-logging if verity mode is not default.
+    # Should wait for setup the by-name block device
+    verity_load_state
+
+    # If verity-logging is triggered, must mount_all after it,
+    # otherwise the warning page maybe can't be shown.
+    trigger mount-all-fs
+
+    # Since the modules are stored in /vendor, not in ram disk,
+    # so need to restart ueventd after mount_all.
+    trigger restart-ueventd
+
+
+on verity-logging
+    exec u:r:slideshow:s0 -- /sbin/slideshow -p -t 30000 warning/verity_red_1 warning/verity_red_2
+
+
+on mount-all-fs
+    mkdir /dev/pstore 0755 root system
+    mount pstore pstore /dev/pstore
+    mount_all /fstab.${ro.hardware}
+
+on restart-ueventd
+    rm /dev/.coldboot_done
+    restart ueventd
+
+on fs
+    mkdir /dev/pstore 0755 root system
+    mount pstore pstore /dev/pstore
+
+on post-fs
+    setprop ro.setupwizard.mode DISABLED
+
+on post-fs-data
+    mkdir /data/kpanic 0770 system system
+    mkdir /data/kpanic/pstore 0770 system system
+    mkdir /data/dontpanic 0750 root log
+    # Create data folder for GPS
+    mkdir /data/gps 0770 gps system
+
+    # Set indication (checked by vold) that we have finished this action
+    setprop vold.post_fs_data_done 1
+
+on boot
+    write /sys/devices/platform/INT33BB:00/power/control on
+    write /sys/devices/pci0000\:00/0000\:00\:02.0/power/control auto
+
+    setprop camera.disable_zsl_mode 1
+
+    setprop persist.sys.strictmode.visual 0
+    setprop persist.sys.strictmode.disable 1
+
+    chmod 0660 /sys/class/tty/ttyHSU1/../../power/control
+    chown system system /sys/class/tty/ttyHSU1/../../power/control
+    mkdir /dev/gps 0770 gps system
+    symlink /dev/ttyHSU1 /dev/gps/ttyGPS
+    symlink /sys/class/tty/ttyHSU1/../../power/control /dev/gps/ttyGPSPowerControl
+
+    write /proc/sys/net/ipv4/tcp_limit_output_bytes 1500000
+    write /proc/sys/net/core/rmem_max 6291456
+    write /proc/sys/net/core/wmem_max 4194304
+
+    # change group for IPC interfaces
+    chown root system /sys/devices/pci0000:00/0000:00:14.0/power/control
+    chmod 0664 /sys/devices/pci0000:00/0000:00:14.0/power/control
+    chown root system /sys/bus/usb/devices/2-0:1.0/port5/power/pm_qos_no_power_off
+    chmod 0664 /sys/bus/usb/devices/2-0:1.0/port5/power/pm_qos_no_power_off
+    chown root system /sys/devices/pci0000:00/0000:00:14.0/usb2/2-5/power/wakeup
+    chmod 0664 /sys/devices/pci0000:00/0000:00:14.0/usb2/2-5/power/wakeup
+    chown root system /sys/devices/pci0000:00/0000:00:14.0/ssic_port_enable
+    chmod 0664 /sys/devices/pci0000:00/0000:00:14.0/power/ssic_port_enable
+
+    chown root system /sys/bus/usb/devices/2-0:1.0/port5/usb3_lpm
+    chmod 0664 /sys/bus/usb/devices/2-0:1.0/port5/usb3_lpm
+
+    # disable HSIC port
+    write /sys/bus/usb/devices/1-0:1.0/port6/power/pm_qos_no_power_off 0
+
+    chown system system /sys/devices/system/cpu/intel_pstate/min_perf_pct
+    chmod 0660 /sys/devices/system/cpu/intel_pstate/min_perf_pct
+    chown system system /sys/devices/system/cpu/intel_pstate/max_perf_pct
+    chmod 0660 /sys/devices/system/cpu/intel_pstate/max_perf_pct
+    write /sys/kernel/debug/pstate_snb/setpoint 75
+
+    # adb over ethernet
+    setprop service.adb.tcp.port 5555
+
+service watchdogd /sbin/watchdogd 10 30
+    user root
+    class core
+    oneshot
+    seclabel u:r:watchdogd:s0
+
+on charger
+    start watchdogd
+
+# bugreport is triggered by holding down volume down, volume up and power
+service bugreport /system/bin/dumpstate -d -p -B \
+	-o /data/user_de/0/com.android.shell/files/bugreports/bugreport
+    class main
+    disabled
+    oneshot
+    keycodes 114 115 116
+
+on fs
+   # Update dm-verity persistent state and set partition.*.verified
+   # properties
+   verity_update_state
+##############################################################
+# Source: device/intel/mixins/groups/graphics/project-celadon/init.rc
+##############################################################
+on init
+    chown system system /sys/class/backlight/intel_backlight/brightness
+    chown system system /sys/class/backlight/acpi_video0/brightness
+    write /sys/fs/selinux/enforce 0
+
+on post-fs-data
+   #setprop debug.sf.nobootanimation 1
+   mkdir /data/system 0770 system system
+
+on boot
+   chown system graphics /sys/kernel/debug/sync/sw_sync
+   symlink /sys/kernel/debug/sync/sw_sync /dev/sw_sync
+##############################################################
+# Source: device/intel/mixins/groups/media/project-celadon/init.rc
+##############################################################
+on post-fs-data
+    mkdir /data/hdcp 0770 media media
+    mkdir /data/coreu 0770 media root
+    mkdir /data/media 0770 media_rw media_rw
+    chown media_rw media_rw /data/media
+
+on boot
+    setprop persist.media.pfw.verbose true
+##############################################################
+# Source: device/intel/mixins/groups/ethernet/dhcp/init.rc
+##############################################################
+
+service dhcpcd_eth0 /system/bin/dhcpcd -ABDKL
+    class main
+    disabled
+    oneshot
+
+service iprenew_eth0 /system/bin/dhcpcd -n
+    class main
+    disabled
+    oneshot
+
+on post-fs
+    insmod /vendor/lib/modules/kernel/drivers/pps/pps_core.ko
+    insmod /vendor/lib/modules/kernel/drivers/ptp/ptp.ko
+    insmod /vendor/lib/modules/kernel/drivers/net/ethernet/intel/e1000e/e1000e.ko
+
+on post-fs
+    insmod /vendor/lib/modules/kernel/drivers/net/mii.ko
+    insmod /vendor/lib/modules/kernel/drivers/net/phy/libphy.ko
+    insmod /vendor/lib/modules/kernel/drivers/net/usb/usbnet.ko
+    insmod /vendor/lib/modules/kernel/drivers/net/usb/asix.ko
+    insmod /vendor/lib/modules/kernel/drivers/net/usb/r8152.ko
+##############################################################
+# Source: device/intel/mixins/groups/debugfs/default/init.rc
+##############################################################
+on early-init
+    # Mount debugfs and make it writable so that debuggerd can
+    # create stack traces, required with newer kernels
+    mount debugfs debugfs /sys/kernel/debug
+    chmod 0755 /sys/kernel/debug
+
+on early-boot
+    # Needed by surfaceflinger to enable it to open trace_marker
+    # on start without file permissions error.
+    chmod 0222 /sys/kernel/debug/tracing/trace_marker
+    # tracefs is mounted after 1st access to it
+    chmod 0755 /sys/kernel/debug/tracing
+##############################################################
+# Source: device/intel/mixins/groups/storage/sdcard-mmc0-usb-sd/init.rc
+##############################################################
+on init
+    # Support legacy paths
+    symlink /sdcard /mnt/sdcard
+    symlink /sdcard /storage/sdcard0
+
+##############################################################
+# Source: device/intel/mixins/groups/usb-gadget/g_ffs/init.rc
+##############################################################
+on fs
+    write /sys/class/android_usb/android0/f_ffs/aliases adb
+    write /sys/class/android_usb/android0/iSerial ${ro.serialno}
+
+on boot
+    # Create mount-point for ConfigFS USB gadgets
+    # Add standard gadget entries
+    mount configfs none /config
+    mkdir /config/usb_gadget/g1 0770 shell shell
+    write /config/usb_gadget/g1/bcdDevice 0x0
+    write /config/usb_gadget/g1/bcdUSB 0x210
+    mkdir /config/usb_gadget/g1/strings/0x409 0770
+    write /config/usb_gadget/g1/strings/0x409/serialnumber ${ro.serialno}
+    write /config/usb_gadget/g1/strings/0x409/manufacturer ${ro.product.manufacturer}
+    write /config/usb_gadget/g1/strings/0x409/product ${ro.product.model}
+    mkdir /config/usb_gadget/g1/functions/ffs.adb
+    mkdir /config/usb_gadget/g1/functions/mtp.gs0
+    mkdir /config/usb_gadget/g1/functions/ptp.gs1
+    mkdir /config/usb_gadget/g1/functions/accessory.gs2
+    mkdir /config/usb_gadget/g1/functions/rndis.gs4
+    mkdir /config/usb_gadget/g1/functions/midi.gs5
+
+    mkdir /config/usb_gadget/g1/configs/b.1
+    mkdir /config/usb_gadget/g1/configs/b.1/strings/0x409
+    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f1
+    write /config/usb_gadget/g1/os_desc/qw_sign "MSFT100"
+    write /config/usb_gadget/g1/os_desc/b_vendor_code 0x1
+    write /config/usb_gadget/g1/configs/b.1/MaxPower 500
+    symlink /config/usb_gadget/g1/configs/b.1 /config/usb_gadget/g1/os_desc/b.1
+
+    # Create adb+ffs gadget function
+    mkdir /dev/usb-ffs 0770 shell shell
+    mkdir /dev/usb-ffs/adb 0770 shell shell
+    mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=2000
+
+    # Enable USB Gadget Configfs interface and make DWC3 the controller
+    setprop sys.usb.configfs 1
+    setprop sys.usb.controller dwc3.0.auto
+
+    # Allow auto-suspend of USB gadget devices
+    write /sys/devices/pci0000\:00/0000\:00\:15.1/power/control auto
+    write /sys/devices/pci0000\:00/0000\:00\:15.1/dwc3.0.auto/power/control auto
+    write /sys/devices/pci0000\:00/0000\:00\:15.1/dwc3.0.auto/gadget/power/control auto
+    write /sys/devices/pci0000\:00/0000\:00\:15.1/dwc3.0.auto/udc/dwc3.0.auto/power/control auto
+
+on property:sys.usb.config=none && property:sys.usb.configfs=1
+    write /config/usb_gadget/g1/os_desc/use 0
+    setprop sys.usb.ffs.ready 0
+    write /sys/power/wake_unlock mylock
+
+on property:sys.usb.config=adb && property:sys.usb.configfs=1
+    write /config/usb_gadget/g1/idVendor 0x8087
+    write /config/usb_gadget/g1/idProduct 0x09ef
+    write /sys/power/wake_lock mylock
+
+on property:init.svc.adbd=stopped
+    setprop sys.usb.ffs.ready 0
+
+on property:sys.usb.config=mtp && property:sys.usb.configfs=1
+    write /config/usb_gadget/g1/functions/mtp.gs0/os_desc/interface.MTP/compatible_id "MTP"
+    # write /config/usb_gadget/g1/os_desc/use 1
+    write /config/usb_gadget/g1/idVendor 0x8087
+    write /config/usb_gadget/g1/idProduct 0x0a5e
+
+on property:sys.usb.config=mtp,adb && property:sys.usb.configfs=1
+    write /config/usb_gadget/g1/functions/mtp.gs0/os_desc/interface.MTP/compatible_id "MTP"
+    # write /config/usb_gadget/g1/os_desc/use 1
+    write /config/usb_gadget/g1/idVendor 0x8087
+    write /config/usb_gadget/g1/idProduct 0x0a5f
+    write /sys/power/wake_lock mylock
+
+on property:sys.usb.config=ptp && property:sys.usb.configfs=1
+    write /config/usb_gadget/g1/functions/ptp.gs1/os_desc/interface.MTP/compatible_id "PTP"
+    # write /config/usb_gadget/g1/os_desc/use 1
+    write /config/usb_gadget/g1/idVendor 0x8087
+    write /config/usb_gadget/g1/idProduct 0x0a60
+
+on property:sys.usb.config=ptp,adb && property:sys.usb.configfs=1
+    write /config/usb_gadget/g1/functions/mtp.gs0/os_desc/interface.MTP/compatible_id "PTP"
+    # write /config/usb_gadget/g1/os_desc/use 1
+    write /config/usb_gadget/g1/idVendor 0x8087
+    write /config/usb_gadget/g1/idProduct 0x0a61
+    write /sys/power/wake_lock mylock
+
+on property:sys.usb.config=rndis && property:sys.usb.configfs=1
+    write /config/usb_gadget/g1/idVendor 0x8087
+    write /config/usb_gadget/g1/idProduct 0x0a62
+
+on property:sys.usb.config=rndis,adb && property:sys.usb.configfs=1
+    write /config/usb_gadget/g1/bcdUSB 0x310
+    write /config/usb_gadget/g1/idVendor 0x8087
+    write /config/usb_gadget/g1/idProduct 0x0a63
+    write /sys/power/wake_lock mylock
+
+on property:sys.usb.config=midi && property:sys.usb.configfs=1
+    write /config/usb_gadget/g1/idVendor 0x8087
+    write /config/usb_gadget/g1/idProduct 0x0a65
+
+on property:sys.usb.config=midi,adb && property:sys.usb.configfs=1
+    write /config/usb_gadget/g1/idVendor 0x8087
+    write /config/usb_gadget/g1/idProduct 0x0a67
+    write /sys/power/wake_lock mylock
+
+on property:sys.usb.config=accessory && property:sys.usb.configfs=1
+    write /config/usb_gadget/g1/idVendor 0x18d1
+    write /config/usb_gadget/g1/idProduct 0x2d00
+
+on property:sys.usb.config=accessory,adb && property:sys.usb.configfs=1
+    write /config/usb_gadget/g1/idVendor 0x18d1
+    write /config/usb_gadget/g1/idProduct 0x2d01
+    write /sys/power/wake_lock mylock
+##############################################################
+# Source: device/intel/mixins/groups/adb_net/true/init.rc
+##############################################################
+on boot
+    start adbd
+    setprop net.eth0.startonboot true
+
+on property:debug.logcat=1
+    class_start debug
+
+service logcat /system/bin/logcat -v threadtime -f /data/log.txt
+    class debug
+
+service setconsole /system/bin/setconsole -g
+    class main
+    user root
+    oneshot
+
+##############################################################
+# Source: device/intel/mixins/groups/kernel/project-celadon/init.rc
+##############################################################
+on boot
+	write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor interactive
+	write /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor interactive
+	write /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor interactive
+	write /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor interactive
+	chown system system /sys/devices/system/cpu/cpufreq/interactive/touchboostpulse
+
+	chown system system /sys/devices/system/cpu/cpufreq/interactive/timer_rate
+	chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/timer_rate
+	chown system system /sys/devices/system/cpu/cpufreq/interactive/timer_slack
+	chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/timer_slack
+	chown system system /sys/devices/system/cpu/cpufreq/interactive/min_sample_time
+	chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/min_sample_time
+	chown system system /sys/devices/system/cpu/cpufreq/interactive/hispeed_freq
+	chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/hispeed_freq
+	chown system system /sys/devices/system/cpu/cpufreq/interactive/target_loads
+	chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/target_loads
+	chown system system /sys/devices/system/cpu/cpufreq/interactive/go_hispeed_load
+	chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/go_hispeed_load
+	chown system system /sys/devices/system/cpu/cpufreq/interactive/above_hispeed_delay
+	chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/above_hispeed_delay
+	chown system system /sys/devices/system/cpu/cpufreq/interactive/boost
+	chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/boost
+	chown system system /sys/devices/system/cpu/cpufreq/interactive/boostpulse
+	chown system system /sys/devices/system/cpu/cpufreq/interactive/input_boost
+	chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/input_boost
+	chown system system /sys/devices/system/cpu/cpufreq/interactive/boostpulse_duration
+	chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/boostpulse_duration
+	chown system system /sys/devices/system/cpu/cpufreq/interactive/io_is_busy
+	chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/io_is_busy
+	# Assume SMP uses shared cpufreq policy for all CPUs
+	chown system system /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
+	chmod 0660 /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
+        #Give permission to system to use i915_videostatus sysfs interface
+        chown system system /sys/class/drm/card0/power/i915_videostatus
+
+on property:sys.boot_completed=1
+	write /sys/devices/system/cpu/cpufreq/interactive/boost 0
+	write /sys/devices/system/cpu/cpufreq/interactive/irq_load_threshold 2
+
+on early-init
+	write /sys/devices/system/cpu/cpu0/cpuidle/state1/disable 1
+	write /sys/devices/system/cpu/cpu0/cpuidle/state2/disable 1
+	write /sys/devices/system/cpu/cpu0/cpuidle/state3/disable 1
+	write /sys/devices/system/cpu/cpu0/cpuidle/state4/disable 1
+	write /sys/devices/system/cpu/cpu0/cpuidle/state5/disable 1
+	write /sys/devices/system/cpu/cpu0/cpuidle/state6/disable 1
+	write /sys/devices/system/cpu/cpu0/cpuidle/state7/disable 1
+	write /sys/devices/system/cpu/cpu1/cpuidle/state1/disable 1
+	write /sys/devices/system/cpu/cpu1/cpuidle/state2/disable 1
+	write /sys/devices/system/cpu/cpu1/cpuidle/state3/disable 1
+	write /sys/devices/system/cpu/cpu1/cpuidle/state4/disable 1
+	write /sys/devices/system/cpu/cpu1/cpuidle/state5/disable 1
+	write /sys/devices/system/cpu/cpu1/cpuidle/state6/disable 1
+	write /sys/devices/system/cpu/cpu1/cpuidle/state7/disable 1
+	write /sys/devices/system/cpu/cpu2/cpuidle/state1/disable 1
+	write /sys/devices/system/cpu/cpu2/cpuidle/state2/disable 1
+	write /sys/devices/system/cpu/cpu2/cpuidle/state3/disable 1
+	write /sys/devices/system/cpu/cpu2/cpuidle/state4/disable 1
+	write /sys/devices/system/cpu/cpu2/cpuidle/state5/disable 1
+	write /sys/devices/system/cpu/cpu2/cpuidle/state6/disable 1
+	write /sys/devices/system/cpu/cpu2/cpuidle/state7/disable 1
+	write /sys/devices/system/cpu/cpu3/cpuidle/state1/disable 1
+	write /sys/devices/system/cpu/cpu3/cpuidle/state2/disable 1
+	write /sys/devices/system/cpu/cpu3/cpuidle/state3/disable 1
+	write /sys/devices/system/cpu/cpu3/cpuidle/state4/disable 1
+	write /sys/devices/system/cpu/cpu3/cpuidle/state5/disable 1
+	write /sys/devices/system/cpu/cpu3/cpuidle/state6/disable 1
+	write /sys/devices/system/cpu/cpu3/cpuidle/state7/disable 1
+
+on property:sys.boot_completed=1
+	write /sys/devices/system/cpu/cpu0/cpuidle/state1/disable 0
+	write /sys/devices/system/cpu/cpu0/cpuidle/state2/disable 0
+	write /sys/devices/system/cpu/cpu0/cpuidle/state3/disable 0
+	write /sys/devices/system/cpu/cpu0/cpuidle/state4/disable 0
+	write /sys/devices/system/cpu/cpu0/cpuidle/state5/disable 0
+	write /sys/devices/system/cpu/cpu0/cpuidle/state6/disable 0
+	write /sys/devices/system/cpu/cpu0/cpuidle/state7/disable 0
+	write /sys/devices/system/cpu/cpu1/cpuidle/state1/disable 0
+	write /sys/devices/system/cpu/cpu1/cpuidle/state2/disable 0
+	write /sys/devices/system/cpu/cpu1/cpuidle/state3/disable 0
+	write /sys/devices/system/cpu/cpu1/cpuidle/state4/disable 0
+	write /sys/devices/system/cpu/cpu1/cpuidle/state5/disable 0
+	write /sys/devices/system/cpu/cpu1/cpuidle/state6/disable 0
+	write /sys/devices/system/cpu/cpu1/cpuidle/state7/disable 0
+	write /sys/devices/system/cpu/cpu2/cpuidle/state1/disable 0
+	write /sys/devices/system/cpu/cpu2/cpuidle/state2/disable 0
+	write /sys/devices/system/cpu/cpu2/cpuidle/state3/disable 0
+	write /sys/devices/system/cpu/cpu2/cpuidle/state4/disable 0
+	write /sys/devices/system/cpu/cpu2/cpuidle/state5/disable 0
+	write /sys/devices/system/cpu/cpu2/cpuidle/state6/disable 0
+	write /sys/devices/system/cpu/cpu2/cpuidle/state7/disable 0
+	write /sys/devices/system/cpu/cpu3/cpuidle/state1/disable 0
+	write /sys/devices/system/cpu/cpu3/cpuidle/state2/disable 0
+	write /sys/devices/system/cpu/cpu3/cpuidle/state3/disable 0
+	write /sys/devices/system/cpu/cpu3/cpuidle/state4/disable 0
+	write /sys/devices/system/cpu/cpu3/cpuidle/state5/disable 0
+	write /sys/devices/system/cpu/cpu3/cpuidle/state6/disable 0
+	write /sys/devices/system/cpu/cpu3/cpuidle/state7/disable 0
+
+##############################################################
+# Source: device/intel/mixins/groups/bluetooth/btusb/init.rc
+##############################################################
+on post-fs-data
+    # To store BT paired info
+    mkdir /data/misc/hcid 0770 bluetooth bluetooth
+
+on boot
+    chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_max_credits
+    chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_default_mps
+
+on post-fs-data
+    mkdir /data/misc/dhcp 0770 dhcp system
+
+service dhcpcd_bt-pan /system/bin/dhcpcd -ABKL
+    disabled
+    oneshot
+
+service iprenew_bt-pan /system/bin/dhcpcd -n
+    disabled
+    oneshot
+
+on post-fs
+    insmod /vendor/lib/modules/kernel/crypto/ecdh_generic.ko
+    insmod /vendor/lib/modules/kernel/net/bluetooth/bluetooth.ko
+    insmod /vendor/lib/modules/kernel/drivers/bluetooth/btintel.ko
+    insmod /vendor/lib/modules/kernel/drivers/bluetooth/btbcm.ko
+    insmod /vendor/lib/modules/kernel/drivers/bluetooth/btrtl.ko
+    insmod /vendor/lib/modules/kernel/drivers/bluetooth/btusb.ko
+##############################################################
+# Source: device/intel/mixins/groups/factory-partition/true/init.rc
+##############################################################
+# init.rc for telephony services specific to flashless platforms using /factory partition
+
+on init
+# Used as mounting point for factory partition.
+# Calibration files configuring IMEI and RF calibration will also be stored on this partition.
+    mkdir /factory 0770 system system
+
+on post-fs
+    restorecon_recursive /factory
+    trigger post-fs-factory
+##############################################################
+# Source: device/intel/mixins/groups/config-partition/enabled/init.rc
+##############################################################
+# Enable SELinux labeling
+on post-fs
+    restorecon_recursive /oem_config
+##############################################################
+# Source: device/intel/mixins/groups/wlan/iwlwifi/init.rc
+##############################################################
+on post-fs-data
+    chmod 0660 /data/misc/wifi/p2p_supplicant.conf
+	setprop wifi.interface wlan0
+	setprop wifi.direct.interface p2p0
+    # create config WiFi NVM folder
+    mkdir /oem_config/wlan 0770 wifi system
+
+
+service wpa_supplicant /vendor/bin/hw/wpa_supplicant -Dnl80211 -iwlan0 -g@android:wpa_wlan0 -c/data/misc/wifi/wpa_supplicant.conf -dt \
+    -e /data/misc/wifi/entropy.bin
+    class main
+    socket wpa_wlan0 dgram 660 wifi wifi
+    disabled
+    oneshot
+
+service dhcpcd_wlan0 /system/bin/dhcpcd -ABDKL
+    class main
+    disabled
+    oneshot
+
+service iprenew_wlan0 /system/bin/dhcpcd -n
+    class main
+    disabled
+    oneshot
+
+service p2p_supplicant /vendor/bin/hw/wpa_supplicant \
+   -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
+   -I/system/etc/wifi/wpa_supplicant_overlay.conf \
+   -m/data/misc/wifi/p2p_supplicant.conf \
+   -O/data/misc/wifi/sockets \
+   -e/data/misc/wifi/entropy.bin \
+   -dt -g@android:wpa_wlan0
+    class main
+    socket wpa_wlan0 dgram 660 wifi wifi
+    disabled
+    oneshot
+
+service dhcpcd_p2p /system/bin/dhcpcd -aABKL
+    disabled
+    oneshot
+
+service iprenew_p2p /system/bin/dhcpcd -n
+    disabled
+    oneshot
+
+
+on post-fs
+    insmod /vendor/lib/modules/kernel/net/wireless/cfg80211.ko
+    insmod /vendor/lib/modules/kernel/net/mac80211/mac80211.ko
+    insmod /vendor/lib/modules/kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko
+    insmod /vendor/lib/modules/kernel/drivers/net/wireless/intel/iwlwifi/mvm/iwlmvm.ko
+
+##############################################################
+# Source: device/intel/mixins/groups/cpuset/4cores/init.rc
+##############################################################
+on late-init
+    write /dev/cpuset/foreground/cpus 0-3
+    write /dev/cpuset/background/cpus 0-3
+    write /dev/cpuset/system-background/cpus 0-3
+    write /dev/cpuset/top-app/cpus 0-3
+    write /dev/cpuset/foreground/boost/cpus 0-3
+##############################################################
+# Source: device/intel/mixins/groups/rfkill/true/init.rc
+##############################################################
+on boot
+    start rfkill-init
+
+service rfkill-init /system/bin/rfkill-init.sh
+    disabled
+    user system
+    group system
+    oneshot
+##############################################################
+# Source: device/intel/mixins/groups/usb/host+acc/init.rc
+##############################################################
+on boot
+    write /sys/devices/pci0000\:00/0000\:00\:14.0/power/control auto
+    write /sys/devices/pci0000\:00/0000\:00\:15.0/power/control auto
+    write /sys/devices/pci0000\:00/0000\:00\:15.0/usb1/1-3/power/control auto
+
+on charger
+    write /sys/devices/pci0000\:00/0000\:00\:14.0/power/control auto
+
+on post-fs
+   insmod /vendor/lib/modules/kernel/drivers/usb/serial/usbserial.ko
+   insmod /vendor/lib/modules/kernel/drivers/usb/serial/pl2303.ko
+   insmod /vendor/lib/modules/kernel/drivers/usb/serial/ftdi_sio.ko
+##############################################################
+# Source: device/intel/mixins/groups/thermal/dptf/init.rc
+##############################################################
+on post-fs
+    setprop persist.thermal.mode dptf
+
+service esif_ufd /system/vendor/bin/esif_ufd -n
+    user system
+    group system
+    class main
+
+on post-fs-data
+    mkdir /data/misc/dptf 0770 system system
+    mkdir /data/misc/dptf/lock 0770 system system
+
+on boot
+    chown system system /sys/devices/system/cpu/intel_pstate/max_perf_pct
+    chown system system /sys/devices/system/cpu/intel_pstate/min_perf_pct
+    chown system system /sys/devices/system/cpu/intel_pstate/no_turbo
+    chown system system /sys/class/powercap/intel-rapl:0/enabled
+    chown system system /sys/class/powercap/intel-rapl:0/constraint_0_power_limit_uw
+    restorecon_recursive /sys/class/powercap
+##############################################################
+# Source: device/intel/mixins/groups/debug-logs/true/init.rc
+##############################################################
+import /init.logs.rc
+##############################################################
+# Source: device/intel/mixins/groups/debug-crashlogd/true/init.rc
+##############################################################
+import /init.crashlogd.rc
+##############################################################
+# Source: device/intel/mixins/groups/debug-coredump/true/init.rc
+##############################################################
+import /init.coredump.rc
+##############################################################
+# Source: device/intel/mixins/groups/midi/true/init.rc
+##############################################################
+on property:sys.usb.config=midi
+    write /sys/class/android_usb/android0/enable 0
+    write /sys/class/android_usb/android0/idVendor 8087
+    write /sys/class/android_usb/android0/idProduct 0a67
+    write /sys/class/android_usb/android0/functions ${sys.usb.config}
+    write /sys/class/android_usb/android0/enable 1
+    setprop sys.usb.state ${sys.usb.config}
+
+on property:sys.usb.config=midi,adb
+    write /sys/class/android_usb/android0/enable 0
+    write /sys/class/android_usb/android0/idVendor 8087
+    write /sys/class/android_usb/android0/idProduct 0a65
+    write /sys/class/android_usb/android0/functions ${sys.usb.config}
+    write /sys/class/android_usb/android0/enable 1
+    start adbd
+    setprop sys.usb.state ${sys.usb.config}
+##############################################################
+# Source: device/intel/mixins/groups/trusty/true/init.rc
+##############################################################
+on fs
+    # Update device node r/w attribute
+    chown system system /dev/trusty-ipc-dev0
+    chmod 666 /dev/trusty-ipc-dev0
+
+on post-fs-data
+    mkdir /data/misc/securestorage 0700 system system
+    chmod 666 /dev/rpmb0
+
+service storageproxyd /vendor/bin/storageproxyd -d /dev/trusty-ipc-dev0 -p /data/misc/securestorage -r /dev/rpmb0
+    class late_start
+    user root
+    group root
+
+##############################################################
+# Source: device/intel/mixins/groups/debug-kernel/default/init.rc
+##############################################################
+import /init.kernel.rc
+##############################################################
+# Source: device/intel/mixins/groups/disk-encryption/default/init.rc
+##############################################################
+# This _should_ be the very last thing that happens in
+# the device's 'on post-fs-data' sections.  Since we compose
+# init scripts from various snippets with mixins, we need to
+# ensure this is included last in the mixin-update by listing
+# disk-encryption as LAST in the mixin spec file.
+on post-fs-data
+    setprop vold.post_fs_data_done 1
+# ------------------ END MIX-IN DEFINITIONS ------------------
+# Enable native bridge for target executables
+on early-init
+    mount binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
+
+on property:ro.enable.native.bridge.exec=1
+    copy /vendor/etc/binfmt_misc/arm_exe /proc/sys/fs/binfmt_misc/register
+    copy /vendor/etc/binfmt_misc/arm_dyn /proc/sys/fs/binfmt_misc/register
+
+on property:ro.enable.native.bridge.exec64=1
+    copy /vendor/etc/binfmt_misc/arm64_exe /proc/sys/fs/binfmt_misc/register
+    copy /vendor/etc/binfmt_misc/arm64_dyn /proc/sys/fs/binfmt_misc/register
+
+on boot
+service nativebridge /system/bin/enable_nativebridge
+
+on property:persist.sys.nativebridge=1
+    mkdir /data/arm 0775 system system
+    start nativebridge
+
+on property:persist.sys.nativebridge=0
+    stop nativebridge
diff --git a/cel_apl/init.recovery.rc b/cel_apl/init.recovery.rc
new file mode 100644
index 000000000..34071e37d
--- /dev/null
+++ b/cel_apl/init.recovery.rc
@@ -0,0 +1,87 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/ethernet/dhcp/init.recovery.rc
+##############################################################
+
+service dhcpcd_eth0 /system/bin/dhcpcd -ABDKL eth0
+    class main
+    disabled
+    oneshot
+    seclabel u:r:dhcp:s0
+
+on post-fs-data
+    start dhcpcd_eth0
+
+##############################################################
+# Source: device/intel/mixins/groups/debugfs/default/init.recovery.rc
+##############################################################
+on early-init
+    # Mount debugfs and make it writable so that debuggerd can
+    # create stack traces, required with newer kernels
+    mount debugfs debugfs /sys/kernel/debug
+    chmod 0755 /sys/kernel/debug
+
+on early-boot
+    # Needed by surfaceflinger to enable it to open trace_marker
+    # on start without file permissions error.
+    chmod 0222 /sys/kernel/debug/tracing/trace_marker
+    # tracefs is mounted after 1st access to it
+    chmod 0755 /sys/kernel/debug/tracing
+##############################################################
+# Source: device/intel/mixins/groups/usb-gadget/g_ffs/init.recovery.rc
+##############################################################
+on boot
+    mkdir /config 0500 root root
+    mount configfs none /config
+    mkdir /config/usb_gadget/g1 0770 shell shell
+    write /config/usb_gadget/g1/idVendor 0x18d1
+    mkdir /config/usb_gadget/g1/strings/0x409 0770
+    write /config/usb_gadget/g1/strings/0x409/serialnumber ${ro.serialno}
+    write /config/usb_gadget/g1/strings/0x409/manufacturer ${ro.product.manufacturer}
+    write /config/usb_gadget/g1/strings/0x409/product ${ro.product.model}
+    mkdir /config/usb_gadget/g1/functions/ffs.adb
+    mkdir /config/usb_gadget/g1/configs/b.1 0770 shell shell
+    mkdir /config/usb_gadget/g1/configs/b.1/strings/0x409 0770 shell shell
+    write /config/usb_gadget/g1/configs/b.1/MaxPower 500
+    mkdir /dev/usb-ffs 0770 shell shell
+    mkdir /dev/usb-ffs/adb 0770 shell shell
+    mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=2000
+    setprop sys.usb.configfs 1
+    setprop sys.usb.controller dwc3.0.auto
+ 
+on property:sys.usb.config=none && property:sys.usb.configfs=1
+    setprop sys.usb.ffs.ready 0
+ 
+on property:init.svc.adbd=stopped
+    setprop sys.usb.ffs.ready 0
+ 
+on property:sys.usb.ffs.ready=1
+    symlink /config/usb_gadget/g1/configs/b.1 /config/usb_gadget/g1/os_desc/b.1
+    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "adb"
+    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f1
+    write /config/usb_gadget/g1/UDC dwc3.0.auto
+    setprop persist.sys.usb.config adb
+
+##############################################################
+# Source: device/intel/mixins/groups/disk-bus/auto/init.recovery.rc
+##############################################################
+on init
+    # Android creates by-name disk links with the disk controller
+    # in the generated path, so that the names pulled out of the GPT
+    # can be associated with the correct disk. Create a shortcut to
+    # /dev/block/by-name so that we can use the same fstabs everywhere.
+    exec u:r:set_storage:s0 root root -- /sbin/set_storage
+    symlink /dev/block/pci/pci0000:00/0000:00:1c.0/by-name /dev/block/by-name
+##############################################################
+# Source: device/intel/mixins/groups/boot-arch/project-celadon/init.recovery.rc
+##############################################################
+service watchdogd /sbin/watchdogd
+    user root
+    class core
+    oneshot
+    seclabel u:r:watchdogd:s0
+
+on boot
+    start watchdogd
+# ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/cel_apl/installer.cmd b/cel_apl/installer.cmd
new file mode 100644
index 000000000..ea2250dea
--- /dev/null
+++ b/cel_apl/installer.cmd
@@ -0,0 +1,28 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/boot-arch/project-celadon/installer.cmd
+##############################################################
+flashing unlock
+flash gpt gpt.bin
+erase misc
+erase persistent
+erase metadata
+format config
+format data
+flash bootloader bootloader
+flash vbmeta_a vbmeta.img
+flash vbmeta_b vbmeta.img
+flash boot_a boot.img
+flash boot_b boot.img
+flash tos_a tos.img
+flash tos_b tos.img
+flash system_a system.img
+flash system_b system.img
+flash vendor_a vendor.img
+flash vendor_b vendor.img
+flash factory factory.img
+set_active a
+flashing lock
+continue
+# ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/cel_apl/mixins.spec b/cel_apl/mixins.spec
new file mode 100644
index 000000000..23f541fbb
--- /dev/null
+++ b/cel_apl/mixins.spec
@@ -0,0 +1,50 @@
+[main]
+mixinsdir: device/intel/mixins/groups
+
+[mapping]
+product.mk: device.mk
+
+[groups]
+2ndstage: oemvars
+project-celadon: default
+sepolicy: enforcing
+graphics: project-celadon(gen9+=true,hwc2=true,vulkan=false,drmhwc=false,minigbm=true,gralloc1=true)
+media: project-celadon(mediasdk=false,media_sdk_source=false)
+device-type: car
+ethernet: dhcp
+debugfs: default
+storage: sdcard-mmc0-usb-sd(adoptablesd=true,adoptableusb=false)
+display-density: default
+usb-gadget: g_ffs
+adb_net: true
+kernel: project-celadon(loglevel=3, disable_cpuidle_on_boot=true)
+bluetooth: btusb
+boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true)
+audio: project-celadon
+wlan: iwlwifi
+cpu-arch: skl
+cpuset: 4cores
+rfkill: true(force_disable=)
+dexpreopt: enabled
+disk-bus: auto
+usb: host+acc
+lights: true
+thermal: dptf(intel_modem=true)
+config-partition: enabled
+vendor-partition: true
+factory-partition: true
+debug-crashlogd: true
+debug-logs: true
+debug-coredump: true
+debug-phonedoctor: true
+debug-tools: true
+flashfiles: ini(oemvars=false,version=3.0,fastboot_min_battery_level=3500,installer=true)
+midi: true
+trusty: true
+slcan: default
+ioc-slcan-reboot: false
+camera: usbcamera
+memtrack: true
+touch: galax7200
+avb: true
+slot-ab: true
diff --git a/cel_apl/oemvars.txt b/cel_apl/oemvars.txt
new file mode 100644
index 000000000..d4a47921d
--- /dev/null
+++ b/cel_apl/oemvars.txt
@@ -0,0 +1,14 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/boot-arch/project-celadon/oemvars.txt
+##############################################################
+# This section may appear empty if magic_key_timeout is false
+
+##########################
+GUID = 4a67b082-0a4c-41cf-b6c7-440b29bb8c4f
+
+# Maximum timeout to check for magic key at boot; loader GUID
+MagicKeyTimeout     80
+
+# ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/cel_apl/startup.nsh b/cel_apl/startup.nsh
new file mode 100644
index 000000000..abab6587e
--- /dev/null
+++ b/cel_apl/startup.nsh
@@ -0,0 +1,7 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/boot-arch/project-celadon/startup.nsh
+##############################################################
+installer --batch installer.cmd
+# ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/cel_apl/ueventd.rc b/cel_apl/ueventd.rc
new file mode 100644
index 000000000..8b3c30848
--- /dev/null
+++ b/cel_apl/ueventd.rc
@@ -0,0 +1,91 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/project-celadon/default/ueventd.rc
+##############################################################
+/sys/devices/system/cpu/cpu*     online     0664   system     system
+
+# Camera
+/dev/v4l-subdev*  0660  camera system
+/dev/ipu-psys*    0660  camera system
+
+# rfkill node
+/dev/rfkill 0660 bluetooth bluetooth
+
+#Bluedroid uhid support
+/dev/uhid                                    0660 bluetooth bluetooth
+/dev/ttyS*                                   0660   system     radio
+
+# NFCC node
+/dev/nfcc                                  0660 nfc nfc
+
+# modem tty node change to radio user can read and write
+/dev/gsmtty*              0660   system     radio
+/dev/ttyMFD*              0660   system     radio
+/dev/ttyACM*              0660   system     radio
+/dev/ttyPTI1              0660   root       radio
+/dev/ttyGS0               0660   root       radio
+/dev/mdmTrace             0660   root       radio
+/dev/mdm_ctrl*            0660   root       radio
+/dev/ttyIFX0              0660   root       radio
+/dev/ttyIFX1              0660   root       radio
+/dev/ttyUSB*              0660   radio      radio
+/dev/iio:device*          0660   system     system
+/dev/radio0               0660   bluetooth  audio
+
+/sys/devices/pci0000:00/0000:00:02.0/drm/card*/card*/intel_backlight brightness 0644 system system
+##############################################################
+# Source: device/intel/mixins/groups/graphics/project-celadon/ueventd.rc
+##############################################################
+/dev/sw_sync                  0666   system     mediadrm
+/dev/dri                      0666   root       graphics
+/dev/dri/card0                0666   root       graphics
+/dev/graphics                 0660   root       graphics
+/dev/graphics/fb0             0660   root       graphics
+/dev/dri/controlD64           0660   root       graphics
+##############################################################
+# Source: device/intel/mixins/groups/media/project-celadon/ueventd.rc
+##############################################################
+/dev/media*       0660  media  system
+/dev/video*       0660  media  system
+##############################################################
+# Source: device/intel/mixins/groups/bluetooth/btusb/ueventd.rc
+##############################################################
+#Bluedroid uhid support
+/dev/uhid                                    0660 bluetooth bluetooth
+
+# Bluetooth rfkill nodes
+/sys/devices/pci*/0000:00:*/usb*/*/*/*/bluetooth/hci0/rfkill* state  0660 bluetooth bluetooth
+/sys/devices/pci*/0000:00:*/usb*/*/*/*/bluetooth/hci0/rfkill* type   0440 bluetooth bluetooth
+/dev/rfkill                   0660   root       bluetooth
+##############################################################
+# Source: device/intel/mixins/groups/disk-bus/auto/ueventd.rc
+##############################################################
+/dev/block/*/*/*/by-name/persistent   0660 system system
+##############################################################
+# Source: device/intel/mixins/groups/wlan/iwlwifi/ueventd.rc
+##############################################################
+# WLAN GPT factory partition block device
+/dev/block/*/*/*/by-name/wlan_nvm 0660 wifi system
+##############################################################
+# Source: device/intel/mixins/groups/rfkill/true/ueventd.rc
+##############################################################
+# rfkill node
+/dev/rfkill 0660 bluetooth system
+##############################################################
+# Source: device/intel/mixins/groups/lights/true/ueventd.rc
+##############################################################
+# i915 backlight driver
+/sys/devices/pci0000:00/0000:00:02.0/drm/card*/card*/intel_backlight brightness 0644 system system
+##############################################################
+# Source: device/intel/mixins/groups/trusty/true/ueventd.rc
+##############################################################
+/dev/block/pci/pci0000:00/0000:00:*.0/by-name/teedata      0660 system system
+##############################################################
+# Source: device/intel/mixins/groups/camera/usbcamera/ueventd.rc
+##############################################################
+# Camera
+/dev/video*       0666  system  camera
+/dev/media*       0660  system  camera
+/dev/v4l-subdev*  0660  system  camera
+# ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/cel_apl/unlock_device.nsh b/cel_apl/unlock_device.nsh
new file mode 100644
index 000000000..ec3aaa8a3
--- /dev/null
+++ b/cel_apl/unlock_device.nsh
@@ -0,0 +1,7 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/boot-arch/project-celadon/unlock_device.nsh
+##############################################################
+dmpstore OEMLock -l efivar_oemlock
+# ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/cel_apl/vendorsetup.sh b/cel_apl/vendorsetup.sh
new file mode 100644
index 000000000..143b4726b
--- /dev/null
+++ b/cel_apl/vendorsetup.sh
@@ -0,0 +1,3 @@
+add_lunch_combo cel_apl-eng
+add_lunch_combo cel_apl-userdebug
+add_lunch_combo cel_apl-user
diff --git a/sepolicy/car/file.te b/sepolicy/car/file.te
new file mode 100644
index 000000000..1e3ef6fb9
--- /dev/null
+++ b/sepolicy/car/file.te
@@ -0,0 +1,7 @@
+#
+# CarService.apk
+# when system is going to suspend, by press ignition button, Carservice needs to write
+# /sys/power/state to put system to suspend
+#
+type sysfs_power_state, fs_type, sysfs_type;
+type sysfs_early_evs, fs_type, sysfs_type;
diff --git a/sepolicy/car/file_contexts b/sepolicy/car/file_contexts
new file mode 100644
index 000000000..66fd766c9
--- /dev/null
+++ b/sepolicy/car/file_contexts
@@ -0,0 +1,5 @@
+/(vendor|system/vendor)/bin/hw/android\.hardware\.automotive\.vehicle\.intel@2\.0-service  u:object_r:hal_vehicle_default_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.automotive\.vehicle\.intel@2\.1-service  u:object_r:hal_vehicle_default_exec:s0
+/sys/power/state u:object_r:sysfs_power_state:s0
+
+/vendor/bin/hw/android.hardware.broadcastradio@intel-service u:object_r:hal_broadcastradio_default_exec:s0
diff --git a/sepolicy/car/hal_broadcastradio_default.te b/sepolicy/car/hal_broadcastradio_default.te
new file mode 100644
index 000000000..6549042b1
--- /dev/null
+++ b/sepolicy/car/hal_broadcastradio_default.te
@@ -0,0 +1,8 @@
+typeattribute hal_broadcastradio_default binder_in_vendor_violators;
+binder_use(hal_broadcastradio_default)
+binder_call(hal_broadcastradio_default, system_server)
+
+allow hal_broadcastradio_default i2c_device:chr_file rw_file_perms;
+
+allow hal_broadcastradio_default rootfs:dir r_dir_perms;
+allow hal_broadcastradio_default sysfs:dir r_dir_perms;
diff --git a/sepolicy/car/hal_vehicle_default.te b/sepolicy/car/hal_vehicle_default.te
new file mode 100644
index 000000000..b32fa0156
--- /dev/null
+++ b/sepolicy/car/hal_vehicle_default.te
@@ -0,0 +1,36 @@
+#
+# Default hal vehicle service
+# oao/hardware/interfaces/automotive/vehicle
+#
+binder_use(hal_vehicle_default)
+binder_call(hal_vehicle_default, audioserver)
+binder_call(audioserver, hal_vehicle_default)
+
+allow hal_vehicle_default audioserver_service:service_manager find;
+
+binder_call(hal_audio_default, hal_vehicle_default)
+binder_call(hal_vehicle_default, hal_audio_default)
+allow hal_vehicle_default hal_audio_hwservice:hwservice_manager find;
+
+#
+# Allow hal_vehicle_default to create socket.
+# Vehicle HAL service needs to communicates with CAN devices through socketCAN.
+#
+
+allow hal_vehicle_default self:can_socket create_socket_perms;
+allowxperm hal_vehicle_default self:can_socket ioctl {
+  SIOCGIFINDEX
+  SIOCSIFNAME
+  SIOCSIFFLAGS
+};
+
+ignore_adb_debug(`hal_vehicle_default')
+
+#
+# configuration to allow Google emulator script connecting vehicle HAL
+# service through socket
+#
+
+userdebug_or_eng(`
+  unix_socket_connect(hal_vehicle_default, fwmarkd, netd)
+')
diff --git a/sepolicy/car/ioc_slcan.te b/sepolicy/car/ioc_slcan.te
new file mode 100644
index 000000000..d1788ceec
--- /dev/null
+++ b/sepolicy/car/ioc_slcan.te
@@ -0,0 +1,7 @@
+#module_only(`ioc_slcan', `
+#  # alow vns to find the slcan service
+#  allow vns ioc_slcan_service:service_manager find;
+# 
+#  # allow vns to call found interfaces belonging to ioc_slcan; 
+#  binder_call(vns, ioc_slcan)
+#')
diff --git a/sepolicy/car/netd.te b/sepolicy/car/netd.te
new file mode 100644
index 000000000..4a43f0300
--- /dev/null
+++ b/sepolicy/car/netd.te
@@ -0,0 +1,9 @@
+#
+# configuration to allow Google emulator script connecting vehicle HAL
+# service through socket
+#
+
+userdebug_or_eng(`
+  allow netd hal_vehicle_default:fd use;
+  allow netd hal_vehicle_default:tcp_socket { read write getopt setopt };
+')
diff --git a/sepolicy/car/platform_app.te b/sepolicy/car/platform_app.te
new file mode 100644
index 000000000..4ff62be5b
--- /dev/null
+++ b/sepolicy/car/platform_app.te
@@ -0,0 +1 @@
+allow platform_app broadcastradio_service:service_manager find;
diff --git a/sepolicy/car/system_app.te b/sepolicy/car/system_app.te
new file mode 100644
index 000000000..9a4a4f335
--- /dev/null
+++ b/sepolicy/car/system_app.te
@@ -0,0 +1,2 @@
+# allow CarService to write /sys/power/state to enter deep sleep.
+allow system_app sysfs_power_state:file rw_file_perms;
diff --git a/sepolicy/car/system_server.te b/sepolicy/car/system_server.te
new file mode 100644
index 000000000..2ad5fe21e
--- /dev/null
+++ b/sepolicy/car/system_server.te
@@ -0,0 +1 @@
+allow system_server sysfs_power_state:file rw_file_perms;

From 370cc96042d913f0e5e685626f85e73c4d8a86fe Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 10 May 2018 19:52:56 +0530
Subject: [PATCH 243/427] [CELADON] Mixinup "Export platform specific sepolicy
 dirs"

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 cel_apl/BoardConfig.mk                        |  2 +-
 celadon/BoardConfig.mk                        |  2 +-
 .../project-celadon/cel_apl/file_contexts     | 20 +++++++++++++++++++
 .../project-celadon/{ => cel_apl}/init.te     |  0
 .../{ => celadon}/file_contexts               |  0
 .../boot-arch/project-celadon/celadon/init.te |  1 +
 6 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 sepolicy/boot-arch/project-celadon/cel_apl/file_contexts
 rename sepolicy/boot-arch/project-celadon/{ => cel_apl}/init.te (100%)
 rename sepolicy/boot-arch/project-celadon/{ => celadon}/file_contexts (100%)
 create mode 100644 sepolicy/boot-arch/project-celadon/celadon/init.te

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index ed55537d0..d1b81e58d 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -207,7 +207,7 @@ KERNELFLINGER_SSL_LIBRARY := openssl
 # Avoid Watchdog truggered reboot
 BOARD_KERNEL_CMDLINE += iTCO_wdt.force_no_reboot=1
 
-BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/boot-arch/project-celadon
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/boot-arch/project-celadon/$(TARGET_PRODUCT)
 
 # Show the "OEM unlocking" option in Android "Developer options"
 #PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.frp.pst=/dev/block/by-name/android_persistent
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index 77e63e932..f03ccd947 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -201,7 +201,7 @@ KERNELFLINGER_SSL_LIBRARY := openssl
 # Avoid Watchdog truggered reboot
 BOARD_KERNEL_CMDLINE += iTCO_wdt.force_no_reboot=1
 
-BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/boot-arch/project-celadon
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/boot-arch/project-celadon/$(TARGET_PRODUCT)
 
 # Show the "OEM unlocking" option in Android "Developer options"
 #PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.frp.pst=/dev/block/by-name/android_persistent
diff --git a/sepolicy/boot-arch/project-celadon/cel_apl/file_contexts b/sepolicy/boot-arch/project-celadon/cel_apl/file_contexts
new file mode 100644
index 000000000..753fe9e85
--- /dev/null
+++ b/sepolicy/boot-arch/project-celadon/cel_apl/file_contexts
@@ -0,0 +1,20 @@
+#
+# Block Devices
+#
+
+/dev/block/(pci|platform)(/.*)?/.*/by-name/boot       u:object_r:boot_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/persistent u:object_r:frp_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/recovery   u:object_r:recovery_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/metadata   u:object_r:metadata_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/cache      u:object_r:cache_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/data       u:object_r:userdata_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/misc       u:object_r:misc_block_device:s0
+/dev/block/(pci|platform)(/.*)?/.*/by-name/teedata    u:object_r:tee_device:s0
+
+/file_contexts.bin           u:object_r:rootfs:s0
+/metadata                    u:object_r:rootfs:s0
+/misc                        u:object_r:rootfs:s0
+/boot                        u:object_r:rootfs:s0
+/gpt.cel_apl.ini        u:object_r:rootfs:s0
+/persistent                  u:object_r:rootfs:s0
+/tos                         u:object_r:rootfs:s0
diff --git a/sepolicy/boot-arch/project-celadon/init.te b/sepolicy/boot-arch/project-celadon/cel_apl/init.te
similarity index 100%
rename from sepolicy/boot-arch/project-celadon/init.te
rename to sepolicy/boot-arch/project-celadon/cel_apl/init.te
diff --git a/sepolicy/boot-arch/project-celadon/file_contexts b/sepolicy/boot-arch/project-celadon/celadon/file_contexts
similarity index 100%
rename from sepolicy/boot-arch/project-celadon/file_contexts
rename to sepolicy/boot-arch/project-celadon/celadon/file_contexts
diff --git a/sepolicy/boot-arch/project-celadon/celadon/init.te b/sepolicy/boot-arch/project-celadon/celadon/init.te
new file mode 100644
index 000000000..35d653a71
--- /dev/null
+++ b/sepolicy/boot-arch/project-celadon/celadon/init.te
@@ -0,0 +1 @@
+allow init userdata_block_device:{ lnk_file blk_file } w_file_perms;

From 40a79e7061d8f88f4e9ecfa9f61e395487f87f4a Mon Sep 17 00:00:00 2001
From: Muhammad Aksar <muhammad.aksar@intel.com>
Date: Mon, 23 Apr 2018 17:43:26 +0530
Subject: [PATCH 244/427] CTS Media Fix: Modified Video Performance xml file

Modified media_codecs_performance.xml file to pass
CTS Media Decoder test cases for different resolutions
by giving achievable frame rate.

Jira: None
Test: Media OMX Decoder test cases are passed

Signed-off-by: Muhammad Aksar <muhammad.aksar@intel.com>
---
 common/media/media_codecs_performance.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/media/media_codecs_performance.xml b/common/media/media_codecs_performance.xml
index 319825a09..848f6dc5c 100644
--- a/common/media/media_codecs_performance.xml
+++ b/common/media/media_codecs_performance.xml
@@ -17,13 +17,13 @@
 <MediaCodecs>
     <Decoders>
         <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="600-800" />
+            <Limit name="measured-frame-rate-176x144" range="600-2500" />
         </MediaCodec>
         <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
             <Limit name="measured-frame-rate-320x240" range="530-590" />
             <Limit name="measured-frame-rate-720x480" range="170-190" />
-            <Limit name="measured-frame-rate-1280x720" range="50-55" />
-            <Limit name="measured-frame-rate-1920x1080" range="20-22" />
+            <Limit name="measured-frame-rate-1280x720" range="50-130" />
+            <Limit name="measured-frame-rate-1920x1080" range="20-60" />
         </MediaCodec>
         <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
             <Limit name="measured-frame-rate-352x288" range="450-510" />
@@ -33,19 +33,19 @@
             <Limit name="measured-frame-rate-1920x1080" range="40-50" />
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="600-800" />
+            <Limit name="measured-frame-rate-176x144" range="1200-3700" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
             <Limit name="measured-frame-rate-320x180" range="860-930" />
             <Limit name="measured-frame-rate-640x360" range="290-320" />
-            <Limit name="measured-frame-rate-1280x720" range="65-70" />
+            <Limit name="measured-frame-rate-1280x720" range="65-180" />
             <Limit name="measured-frame-rate-1920x1080" range="25-30" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
-            <Limit name="measured-frame-rate-320x180" range="530-600" />
-            <Limit name="measured-frame-rate-640x360" range="220-240" />
-            <Limit name="measured-frame-rate-1280x720" range="80-100" />
-            <Limit name="measured-frame-rate-1920x1080" range="45-55" />
+            <Limit name="measured-frame-rate-320x180" range="530-1600" />
+            <Limit name="measured-frame-rate-640x360" range="220-620" />
+            <Limit name="measured-frame-rate-1280x720" range="80-230" />
+            <Limit name="measured-frame-rate-1920x1080" range="45-150" />
         </MediaCodec>
         <MediaCodec name="OMX.Intel.hw_vd.h264" type="video/avc" update="true">
             <Limit name="measured-frame-rate-320x240" range="740-980" />

From 76c7713e8ae7ec896141ff8c107eab7c8c85ac35 Mon Sep 17 00:00:00 2001
From: Ming Tan <ming.tan@intel.com>
Date: Wed, 28 Mar 2018 19:47:46 +0800
Subject: [PATCH 245/427] Add the sepolicy for hal_bootctl_default.

Jira: None.
Test: Test it in Joule and KBL NUC.

Signed-off-by: Ming Tan <ming.tan@intel.com>
Signed-off-by: Zhou, Lihua <lihuax.zhou@intel.com>
---
 .../project-celadon/celadon/hal_bootctl_default.te          | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 sepolicy/boot-arch/project-celadon/celadon/hal_bootctl_default.te

diff --git a/sepolicy/boot-arch/project-celadon/celadon/hal_bootctl_default.te b/sepolicy/boot-arch/project-celadon/celadon/hal_bootctl_default.te
new file mode 100644
index 000000000..2f1f82bc0
--- /dev/null
+++ b/sepolicy/boot-arch/project-celadon/celadon/hal_bootctl_default.te
@@ -0,0 +1,6 @@
+allow hal_bootctl_default rootfs:file r_file_perms;
+allow hal_bootctl_default proc:file r_file_perms;
+allow hal_bootctl_default block_device:dir r_dir_perms;
+allow hal_bootctl_default misc_block_device:blk_file rw_file_perms;
+allow hal_bootctl_default tmpfs:file r_file_perms;
+allow hal_bootctl_default tmpfs:dir r_dir_perms;

From 71963725655ab521ede75371bf565068324cd453 Mon Sep 17 00:00:00 2001
From: Ming Tan <ming.tan@intel.com>
Date: Tue, 10 Apr 2018 18:57:24 +0800
Subject: [PATCH 246/427] Add the sepolicy setting for set_storage.

Jira: None.
Test: Test it in Joule and KBL NUC.

Signed-off-by: Ming Tan <ming.tan@intel.com>
Signed-off-by: Zhou, Lihua <lihuax.zhou@intel.com>
---
 sepolicy/set_storage/set_storage.te | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sepolicy/set_storage/set_storage.te b/sepolicy/set_storage/set_storage.te
index 4d431956f..891351f73 100644
--- a/sepolicy/set_storage/set_storage.te
+++ b/sepolicy/set_storage/set_storage.te
@@ -9,6 +9,7 @@ allow set_storage self:capability { fsetid };
 allow set_storage block_device:dir rw_dir_perms;
 allow set_storage block_device:lnk_file create;
 allow set_storage rootfs:file rx_file_perms;
+allow set_storage kmsg_device:chr_file { open write };
 
 # XXX setattr here can likely be dropped as it does so on the
 # frp block device

From 824c3aa6ba70c5441d602b1b1c5efcedb6c4f6ee Mon Sep 17 00:00:00 2001
From: Ming Tan <ming.tan@intel.com>
Date: Tue, 24 Apr 2018 10:09:19 +0800
Subject: [PATCH 247/427] Add the sepolicy setting for OTA update.

Jira: None.
Test: Test it in KBL NUC.

Signed-off-by: Ming Tan <ming.tan@intel.com>
Signed-off-by: Zhou, Lihua <lihuax.zhou@intel.com>
---
 sepolicy/boot-arch/project-celadon/celadon/device.te      | 1 +
 sepolicy/boot-arch/project-celadon/celadon/init.te        | 3 +++
 sepolicy/boot-arch/project-celadon/celadon/postinstall.te | 8 ++++++++
 sepolicy/boot-arch/project-celadon/celadon/property.te    | 1 +
 sepolicy/boot-arch/project-celadon/celadon/recovery.te    | 1 +
 .../boot-arch/project-celadon/celadon/update_engine.te    | 5 +++++
 .../project-celadon/celadon/update_engine_common.te       | 3 +++
 .../project-celadon/celadon/update_engine_sideload.te     | 3 +++
 sepolicy/boot-arch/project-celadon/celadon/vold.te        | 1 +
 9 files changed, 26 insertions(+)
 create mode 100644 sepolicy/boot-arch/project-celadon/celadon/device.te
 create mode 100644 sepolicy/boot-arch/project-celadon/celadon/postinstall.te
 create mode 100644 sepolicy/boot-arch/project-celadon/celadon/property.te
 create mode 100644 sepolicy/boot-arch/project-celadon/celadon/recovery.te
 create mode 100644 sepolicy/boot-arch/project-celadon/celadon/update_engine.te
 create mode 100644 sepolicy/boot-arch/project-celadon/celadon/update_engine_common.te
 create mode 100644 sepolicy/boot-arch/project-celadon/celadon/update_engine_sideload.te
 create mode 100644 sepolicy/boot-arch/project-celadon/celadon/vold.te

diff --git a/sepolicy/boot-arch/project-celadon/celadon/device.te b/sepolicy/boot-arch/project-celadon/celadon/device.te
new file mode 100644
index 000000000..b31ee1953
--- /dev/null
+++ b/sepolicy/boot-arch/project-celadon/celadon/device.te
@@ -0,0 +1 @@
+type vendor_block_device, dev_type;
diff --git a/sepolicy/boot-arch/project-celadon/celadon/init.te b/sepolicy/boot-arch/project-celadon/celadon/init.te
index 35d653a71..a2f993a8d 100644
--- a/sepolicy/boot-arch/project-celadon/celadon/init.te
+++ b/sepolicy/boot-arch/project-celadon/celadon/init.te
@@ -1 +1,4 @@
+allow init system_file:system module_load;
+allow init tmpfs:file r_file_perms;
+allow init { boot_block_device vendor_block_device }:lnk_file relabelto;
 allow init userdata_block_device:{ lnk_file blk_file } w_file_perms;
diff --git a/sepolicy/boot-arch/project-celadon/celadon/postinstall.te b/sepolicy/boot-arch/project-celadon/celadon/postinstall.te
new file mode 100644
index 000000000..bdaf884c0
--- /dev/null
+++ b/sepolicy/boot-arch/project-celadon/celadon/postinstall.te
@@ -0,0 +1,8 @@
+set_prop(postinstall, ota_prop)
+recovery_only(`
+  allow postinstall rootfs:file rx_file_perms;
+')
+
+allow postinstall vendor_shell_exec:file rx_file_perms;
+allow postinstall vendor_toolbox_exec:file rx_file_perms;
+allow postinstall vendor_file:file rx_file_perms;
diff --git a/sepolicy/boot-arch/project-celadon/celadon/property.te b/sepolicy/boot-arch/project-celadon/celadon/property.te
new file mode 100644
index 000000000..0b672d819
--- /dev/null
+++ b/sepolicy/boot-arch/project-celadon/celadon/property.te
@@ -0,0 +1 @@
+type ota_prop, property_type;
diff --git a/sepolicy/boot-arch/project-celadon/celadon/recovery.te b/sepolicy/boot-arch/project-celadon/celadon/recovery.te
new file mode 100644
index 000000000..15fb95121
--- /dev/null
+++ b/sepolicy/boot-arch/project-celadon/celadon/recovery.te
@@ -0,0 +1 @@
+allow recovery sysfs_thermal_management:dir { search };
diff --git a/sepolicy/boot-arch/project-celadon/celadon/update_engine.te b/sepolicy/boot-arch/project-celadon/celadon/update_engine.te
new file mode 100644
index 000000000..91f256a22
--- /dev/null
+++ b/sepolicy/boot-arch/project-celadon/celadon/update_engine.te
@@ -0,0 +1,5 @@
+allow update_engine vendor_block_device:blk_file rw_file_perms;
+allow update_engine tmpfs:dir r_dir_perms;
+allow update_engine tmpfs:file r_file_perms;
+allow update_engine tmpfs:lnk_file r_file_perms;
+allow update_engine vendor_shell_exec:file rx_file_perms;
diff --git a/sepolicy/boot-arch/project-celadon/celadon/update_engine_common.te b/sepolicy/boot-arch/project-celadon/celadon/update_engine_common.te
new file mode 100644
index 000000000..eb5f3aab2
--- /dev/null
+++ b/sepolicy/boot-arch/project-celadon/celadon/update_engine_common.te
@@ -0,0 +1,3 @@
+allow update_engine_common vendor_block_device:blk_file rw_file_perms;
+allow update_engine_common tmpfs:file r_file_perms;
+allow update_engine_common tmpfs:lnk_file r_file_perms;
diff --git a/sepolicy/boot-arch/project-celadon/celadon/update_engine_sideload.te b/sepolicy/boot-arch/project-celadon/celadon/update_engine_sideload.te
new file mode 100644
index 000000000..7ef4adf62
--- /dev/null
+++ b/sepolicy/boot-arch/project-celadon/celadon/update_engine_sideload.te
@@ -0,0 +1,3 @@
+type update_engine_sideload, domain;
+
+allow update_engine_sideload recovery:capability { sys_rawio };
diff --git a/sepolicy/boot-arch/project-celadon/celadon/vold.te b/sepolicy/boot-arch/project-celadon/celadon/vold.te
new file mode 100644
index 000000000..a7cd94845
--- /dev/null
+++ b/sepolicy/boot-arch/project-celadon/celadon/vold.te
@@ -0,0 +1 @@
+allow vold tmpfs:file r_file_perms;

From 5cdddf319018c5a44f79331859d31fbd083a1868 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Wed, 23 May 2018 09:46:49 +0530
Subject: [PATCH 248/427] [CELADON] Mixinup "enbale OTA with slot a/b"

Jira: None
Test: None
---
 cel_apl/AndroidBoard.mk |  17 ++---
 cel_apl/BoardConfig.mk  |  11 ++-
 cel_apl/device.mk       |  22 ++++--
 cel_apl/flashfiles.ini  | 162 +++++++++++++++++++---------------------
 celadon/AndroidBoard.mk |  17 ++---
 celadon/BoardConfig.mk  |  11 ++-
 celadon/device.mk       |  22 ++++--
 celadon/flashfiles.ini  | 162 +++++++++++++++++++---------------------
 8 files changed, 220 insertions(+), 204 deletions(-)

diff --git a/cel_apl/AndroidBoard.mk b/cel_apl/AndroidBoard.mk
index e769690b0..b7be0bb62 100644
--- a/cel_apl/AndroidBoard.mk
+++ b/cel_apl/AndroidBoard.mk
@@ -203,13 +203,6 @@ else
 out_flashfiles := $(PRODUCT_OUT)/$(TARGET_PRODUCT).flashfiles.$(TARGET_BUILD_VARIANT).$(USER).zip
 endif
 
-$(PRODUCT_OUT)/efi/installer.cmd: $(TARGET_DEVICE_DIR)/$(@F)
-	$(ACP) $(TARGET_DEVICE_DIR)/$(@F) $@
-	sed -i '/#/d' $@
-
-$(PRODUCT_OUT)/efi/flash.json: $(TARGET_DEVICE_DIR)/$(@F)
-	$(ACP) $(TARGET_DEVICE_DIR)/$(@F) $@
-	sed -i '/#/d' $@
 
 $(PRODUCT_OUT)/efi/startup.nsh: $(TARGET_DEVICE_DIR)/$(@F)
 	$(ACP) $(TARGET_DEVICE_DIR)/$(@F) $@
@@ -225,8 +218,9 @@ $(PRODUCT_OUT)/efi/efivar_oemlock: $(TARGET_DEVICE_DIR)/$(@F)
 $(out_flashfiles): $(BOARD_FLASHFILES) | $(ACP)
 	$(call generate_flashfiles,$@, $^)
 
-.PHONY: flashfiles
-flashfiles: $(out_flashfiles)
+
+.PHONY: flashfiles_simple
+flashfiles_simple: $(out_flashfiles)
 
 # Rules to create bootloader zip file, a precursor to the bootloader
 # image that is stored in the target-files-package. There's also
@@ -367,6 +361,11 @@ $(BOARD_GPT_BIN): $(TARGET_DEVICE_DIR)/gpt.ini
 	$(hide) $(GPT_INI2BIN) $< > $@
 	$(hide) echo GEN $(notdir $@)
 
+# Use by updater_ab_esp
+$(PRODUCT_OUT)/vendor.img: $(PRODUCT_OUT)/vendor/firmware/kernelflinger.efi
+$(PRODUCT_OUT)/vendor/firmware/kernelflinger.efi: $(PRODUCT_OUT)/efi/kernelflinger.efi
+	$(ACP) $(PRODUCT_OUT)/efi/kernelflinger.efi $@
+
 ##############################################################
 # Source: device/intel/mixins/groups/audio/project-celadon/AndroidBoard.mk
 ##############################################################
diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index d1b81e58d..1240b4366 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -150,6 +150,8 @@ BOARD_FLASHFILES += $(PRODUCT_OUT)/vbmeta.img
 
 # Now use AVB to support A/B slot
 PRODUCT_STATIC_BOOT_CONTROL_HAL := bootctrl.avb libavb_user
+
+AB_OTA_PARTITIONS += vbmeta
 ##############################################################
 # Source: device/intel/mixins/groups/vendor-partition/true/BoardConfig.mk
 ##############################################################
@@ -163,6 +165,7 @@ else
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := squashfs
 endif
 BOARD_FLASHFILES += $(PRODUCT_OUT)/vendor.img
+AB_OTA_PARTITIONS += vendor
 ##############################################################
 # Source: device/intel/mixins/groups/boot-arch/project-celadon/BoardConfig.mk
 ##############################################################
@@ -223,11 +226,10 @@ BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/kernelflinger.efi
 BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/startup.nsh
 BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/unlock_device.nsh
 BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/efivar_oemlock
-BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/installer.cmd
 BOARD_FLASHFILES += $(PRODUCT_OUT)/bootloader
 BOARD_FLASHFILES += $(PRODUCT_OUT)/fastboot-usb.img
-BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/flash.json
 BOARD_FLASHFILES += $(PRODUCT_OUT)/tos.img
+AB_OTA_PARTITIONS += tos
 
 # -- OTA RELATED DEFINES --
 # tell build system where to get the recovery.fstab.
@@ -292,6 +294,11 @@ KERNELFLINGER_ASSUME_BIOS_SECURE_BOOT := true
 
 KERNELFLINGER_USE_RPMB_SIMULATE := true
 
+AB_OTA_POSTINSTALL_CONFIG += \
+    RUN_POSTINSTALL_vendor=true \
+    POSTINSTALL_PATH_vendor=bin/updater_ab_esp \
+    FILESYSTEM_TYPE_vendor=ext4 \
+    POSTINSTALL_OPTIONAL_vendor=true
 ##############################################################
 # Source: device/intel/mixins/groups/audio/project-celadon/BoardConfig.mk
 ##############################################################
diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 05954529a..81c27c896 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -299,14 +299,23 @@ endif
 ##############################################################
 # Source: device/intel/mixins/groups/slot-ab/true/product.mk
 ##############################################################
-
-
-# Currently the update_verifier does not support AVB and A/B slot, so do not include it if enable AVB and A/B slot.
-# Will enable it after the update_verifier updated.
-#PRODUCT_PACKAGES += \
+PRODUCT_PACKAGES += \
     update_engine \
+    update_verifier \
+    update_engine_sideload \
+    libavb \
+    bootctrl.avb \
+    bootctrl.intel \
+    bootctrl.intel.static \
+    android.hardware.boot@1.0-impl \
+    android.hardware.boot@1.0-service
+
+PRODUCT_PACKAGES_DEBUG += \
     update_engine_client \
-    update_verifier
+    bootctl
+
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.hardware.bootctrl=intel
 ##############################################################
 # Source: device/intel/mixins/groups/kernel/project-celadon/product.mk
 ##############################################################
@@ -368,6 +377,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 
 endif
 
+PRODUCT_PACKAGES += updater_ab_esp
 ##############################################################
 # Source: device/intel/mixins/groups/audio/project-celadon/product.mk
 ##############################################################
diff --git a/cel_apl/flashfiles.ini b/cel_apl/flashfiles.ini
index 6b93a0411..51076a5ef 100644
--- a/cel_apl/flashfiles.ini
+++ b/cel_apl/flashfiles.ini
@@ -1,44 +1,6 @@
 # ----------------- BEGIN MIX-IN DEFINITIONS -----------------
 # Mix-In definitions are auto-generated by mixin-update
 ##############################################################
-# Source: device/intel/mixins/groups/factory-partition/true/flashfiles.ini
-##############################################################
-[output.installer.cmd]
-additional-files += factory.img
-
-[group.erase-factory]
-name = Erase factory partition
-description = Erase factory partition, use with caution
-default = false
-
-[command.format.factory]
-tool = fastboot
-args = format factory
-description = Format factory partition
-group = erase-factory
-##############################################################
-# Source: device/intel/mixins/groups/config-partition/enabled/flashfiles.ini
-##############################################################
-[output.install.cmd]
-additional-files += radio:config.img
-
-[command.format.config]
-tool = fastboot
-arg = format config
-description = Format config partition
-##############################################################
-# Source: device/intel/mixins/groups/avb/true/flashfiles.ini
-##############################################################
-
-[command.flash.vbmeta]
-tool = fastboot
-args = flash vbmeta_a $file
-file = images:vbmeta.img
-description = Flash vbmeta_a partition
-##############################################################
-# Source: device/intel/mixins/groups/vendor-partition/true/flashfiles.ini
-##############################################################
-##############################################################
 # Source: device/intel/mixins/groups/flashfiles/ini/flashfiles.ini
 ##############################################################
 # This file describe the commands needed to flash the board.
@@ -74,20 +36,21 @@ version = 3.0
 configurations += update blank
 
 [output.installer.cmd]
-sets = unlock partition erase format flash configure lock reboot
-additional-files += provdatazip:installer.efi provdatazip:startup.nsh
+sets = unlock partition bootloader erase format flash configure slot-ab lock reboot
+additional-files += provdatazip:installer.efi provdatazip:startup.nsh provdatazip:efivar_oemlock provdatazip:unlock_device.nsh provdatazip:config.img provdatazip:factory.img
 enable = true
 
 [configuration.update]
 startState = pos
-sets = unlock slot-ab flash capsule lock reboot
+sets = unlock bootloader flash capsule slot-ab lock reboot
 default = true
-description = update phone to new release
+description = update device to new release
 brief = update
 
 [configuration.blank]
-startState = dnx_os
-sets = fw_update bootstrap unlock partition slot-ab erase format flash capsule configure lock reboot
+startState = pos
+#sets = fw_update bootstrap unlock partition bootloader erase format flash capsule configure slot-ab lock reboot
+sets = unlock partition bootloader reboot-bootloader erase format flash configure slot-ab lock reboot
 description = erase and flash all partitions, all data will be lost.
 brief = blank
 
@@ -131,29 +94,6 @@ exception = bootstrap
 description = Check battery level: ${battery}mV
 expression = ${battery} >= 3500
 skipOnFailure = false
-
-[parameter.slot]
-name = slot
-type = variable
-tool = fastboot
-arg = getvar current-slot
-description = Get current slot
-computedValue = $1
-filter = current-slot:[\s]*(_[a-z]+)
-value = _a
-
-[command.slot-ab.get-active]
-tool = setVariable
-variable = slot
-description = Get the active slot
-defaultValue = _a
-mandatory = false
-
-[command.slot-ab.set-active]
-tool = fastboot
-args = --set-active=${slot}
-description = Set the active slot
-
 [command.unlock.unlock]
 tool = fastboot
 args = flashing unlock
@@ -179,32 +119,80 @@ name = Erase efi vars
 description = Erase all optional efi vars
 default = true
 
-[command.erase.efivars]
+[command.erase-efivars.efivars]
 tool = fastboot
 args = oem erase-efivars
 description = Erase all optional efi vars
 group = erase-efivars
 
+[command.partition.gpt]
+tool = fastboot
+args = flash gpt $file
+file = provdatazip:gpt.bin
+description = Initialize the partition table
+
+[command.bootloader.bootloader]
+tool = fastboot
+args = flash bootloader $file
+file = bootloader:bootloader
+description = Flash bootloader partition
+
+
+
+[command.flash.vbmeta_a]
+tool = fastboot
+args = flash vbmeta_a $file
+file = images:vbmeta.img
+description = Flash vbmeta_a partition
+
 
-[command.flash.boot]
+[command.flash.tos_a]
 tool = fastboot
-args = flash boot $file
+args = flash tos_a $file
+file = radio:tos.img
+description = Flash tos_a partition
+
+
+[command.flash.boot_a]
+tool = fastboot
+args = flash boot_a $file
 file = boot:boot:boot.img
-description = Flash boot partition
+description = Flash boot_a partition
+
 
 
-[command.flash.system]
+
+[command.flash.system_a]
 tool = fastboot
-args = flash system $file
+args = flash system_a $file
 file = images:system.img
 timeout = 600000
-description = Flash system partition
+description = Flash system_a partition
+
 
-[command.flash.bootloader]
+[command.flash.vendor_a]
 tool = fastboot
-args = flash bootloader $file
-file = bootloader:bootloader
-description = Flash bootloader partition
+args = flash vendor_a $file
+file = images:vendor.img
+timeout = 600000
+description = Flash vendor_a partition
+
+
+[command.flash.factory]
+tool = fastboot
+args = flash factory $file
+file = radio:factory.img
+timeout = 600000
+description = Flash factory partition
+
+
+[command.flash.config]
+tool = fastboot
+args = flash config $file
+file = radio:config.img
+timeout = 600000
+description = Flash config partition
+
 
 [command.capsule.rm-capsule]
 tool = fastboot
@@ -218,6 +206,13 @@ tool = fastboot
 args = format data
 description = Format data partition
 
+# This will reset the setting of slot B
+
+[command.slot-ab.set-active-a]
+tool = fastboot
+args = set_active a
+description = Set the active slot to A
+
 [group.lock-device]
 name = Lock the device (it implies the userdata partition wipe)
 description = Put the device in locked state at the end of the flash procedure.
@@ -233,12 +228,9 @@ description = Set device state to locked
 tool = fastboot
 args = continue
 description = Boot to main OS
-##############################################################
-# Source: device/intel/mixins/groups/trusty/true/flashfiles.ini
-##############################################################
-[command.flash.tos]
+
+[command.reboot-bootloader.reboot]
 tool = fastboot
-args = flash tos $file
-file = radio:tos.img
-description = Flash tos partition
+args = reboot bootloader
+description = Boot to bootloader
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/celadon/AndroidBoard.mk b/celadon/AndroidBoard.mk
index 90c81da3a..7a26436ce 100644
--- a/celadon/AndroidBoard.mk
+++ b/celadon/AndroidBoard.mk
@@ -197,13 +197,6 @@ else
 out_flashfiles := $(PRODUCT_OUT)/$(TARGET_PRODUCT).flashfiles.$(TARGET_BUILD_VARIANT).$(USER).zip
 endif
 
-$(PRODUCT_OUT)/efi/installer.cmd: $(TARGET_DEVICE_DIR)/$(@F)
-	$(ACP) $(TARGET_DEVICE_DIR)/$(@F) $@
-	sed -i '/#/d' $@
-
-$(PRODUCT_OUT)/efi/flash.json: $(TARGET_DEVICE_DIR)/$(@F)
-	$(ACP) $(TARGET_DEVICE_DIR)/$(@F) $@
-	sed -i '/#/d' $@
 
 $(PRODUCT_OUT)/efi/startup.nsh: $(TARGET_DEVICE_DIR)/$(@F)
 	$(ACP) $(TARGET_DEVICE_DIR)/$(@F) $@
@@ -219,8 +212,9 @@ $(PRODUCT_OUT)/efi/efivar_oemlock: $(TARGET_DEVICE_DIR)/$(@F)
 $(out_flashfiles): $(BOARD_FLASHFILES) | $(ACP)
 	$(call generate_flashfiles,$@, $^)
 
-.PHONY: flashfiles
-flashfiles: $(out_flashfiles)
+
+.PHONY: flashfiles_simple
+flashfiles_simple: $(out_flashfiles)
 
 # Rules to create bootloader zip file, a precursor to the bootloader
 # image that is stored in the target-files-package. There's also
@@ -361,6 +355,11 @@ $(BOARD_GPT_BIN): $(TARGET_DEVICE_DIR)/gpt.ini
 	$(hide) $(GPT_INI2BIN) $< > $@
 	$(hide) echo GEN $(notdir $@)
 
+# Use by updater_ab_esp
+$(PRODUCT_OUT)/vendor.img: $(PRODUCT_OUT)/vendor/firmware/kernelflinger.efi
+$(PRODUCT_OUT)/vendor/firmware/kernelflinger.efi: $(PRODUCT_OUT)/efi/kernelflinger.efi
+	$(ACP) $(PRODUCT_OUT)/efi/kernelflinger.efi $@
+
 ##############################################################
 # Source: device/intel/mixins/groups/audio/project-celadon/AndroidBoard.mk
 ##############################################################
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index f03ccd947..6b4c7813a 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -144,6 +144,8 @@ BOARD_FLASHFILES += $(PRODUCT_OUT)/vbmeta.img
 
 # Now use AVB to support A/B slot
 PRODUCT_STATIC_BOOT_CONTROL_HAL := bootctrl.avb libavb_user
+
+AB_OTA_PARTITIONS += vbmeta
 ##############################################################
 # Source: device/intel/mixins/groups/vendor-partition/true/BoardConfig.mk
 ##############################################################
@@ -157,6 +159,7 @@ else
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := squashfs
 endif
 BOARD_FLASHFILES += $(PRODUCT_OUT)/vendor.img
+AB_OTA_PARTITIONS += vendor
 ##############################################################
 # Source: device/intel/mixins/groups/boot-arch/project-celadon/BoardConfig.mk
 ##############################################################
@@ -217,11 +220,10 @@ BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/kernelflinger.efi
 BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/startup.nsh
 BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/unlock_device.nsh
 BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/efivar_oemlock
-BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/installer.cmd
 BOARD_FLASHFILES += $(PRODUCT_OUT)/bootloader
 BOARD_FLASHFILES += $(PRODUCT_OUT)/fastboot-usb.img
-BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/flash.json
 BOARD_FLASHFILES += $(PRODUCT_OUT)/tos.img
+AB_OTA_PARTITIONS += tos
 
 # -- OTA RELATED DEFINES --
 # tell build system where to get the recovery.fstab.
@@ -286,6 +288,11 @@ KERNELFLINGER_ASSUME_BIOS_SECURE_BOOT := true
 
 KERNELFLINGER_USE_RPMB_SIMULATE := true
 
+AB_OTA_POSTINSTALL_CONFIG += \
+    RUN_POSTINSTALL_vendor=true \
+    POSTINSTALL_PATH_vendor=bin/updater_ab_esp \
+    FILESYSTEM_TYPE_vendor=ext4 \
+    POSTINSTALL_OPTIONAL_vendor=true
 ##############################################################
 # Source: device/intel/mixins/groups/audio/project-celadon/BoardConfig.mk
 ##############################################################
diff --git a/celadon/device.mk b/celadon/device.mk
index 6a37d564c..f39ef5f5c 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -291,14 +291,23 @@ endif
 ##############################################################
 # Source: device/intel/mixins/groups/slot-ab/true/product.mk
 ##############################################################
-
-
-# Currently the update_verifier does not support AVB and A/B slot, so do not include it if enable AVB and A/B slot.
-# Will enable it after the update_verifier updated.
-#PRODUCT_PACKAGES += \
+PRODUCT_PACKAGES += \
     update_engine \
+    update_verifier \
+    update_engine_sideload \
+    libavb \
+    bootctrl.avb \
+    bootctrl.intel \
+    bootctrl.intel.static \
+    android.hardware.boot@1.0-impl \
+    android.hardware.boot@1.0-service
+
+PRODUCT_PACKAGES_DEBUG += \
     update_engine_client \
-    update_verifier
+    bootctl
+
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.hardware.bootctrl=intel
 ##############################################################
 # Source: device/intel/mixins/groups/kernel/project-celadon/product.mk
 ##############################################################
@@ -360,6 +369,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 
 endif
 
+PRODUCT_PACKAGES += updater_ab_esp
 ##############################################################
 # Source: device/intel/mixins/groups/audio/project-celadon/product.mk
 ##############################################################
diff --git a/celadon/flashfiles.ini b/celadon/flashfiles.ini
index 6b93a0411..51076a5ef 100644
--- a/celadon/flashfiles.ini
+++ b/celadon/flashfiles.ini
@@ -1,44 +1,6 @@
 # ----------------- BEGIN MIX-IN DEFINITIONS -----------------
 # Mix-In definitions are auto-generated by mixin-update
 ##############################################################
-# Source: device/intel/mixins/groups/factory-partition/true/flashfiles.ini
-##############################################################
-[output.installer.cmd]
-additional-files += factory.img
-
-[group.erase-factory]
-name = Erase factory partition
-description = Erase factory partition, use with caution
-default = false
-
-[command.format.factory]
-tool = fastboot
-args = format factory
-description = Format factory partition
-group = erase-factory
-##############################################################
-# Source: device/intel/mixins/groups/config-partition/enabled/flashfiles.ini
-##############################################################
-[output.install.cmd]
-additional-files += radio:config.img
-
-[command.format.config]
-tool = fastboot
-arg = format config
-description = Format config partition
-##############################################################
-# Source: device/intel/mixins/groups/avb/true/flashfiles.ini
-##############################################################
-
-[command.flash.vbmeta]
-tool = fastboot
-args = flash vbmeta_a $file
-file = images:vbmeta.img
-description = Flash vbmeta_a partition
-##############################################################
-# Source: device/intel/mixins/groups/vendor-partition/true/flashfiles.ini
-##############################################################
-##############################################################
 # Source: device/intel/mixins/groups/flashfiles/ini/flashfiles.ini
 ##############################################################
 # This file describe the commands needed to flash the board.
@@ -74,20 +36,21 @@ version = 3.0
 configurations += update blank
 
 [output.installer.cmd]
-sets = unlock partition erase format flash configure lock reboot
-additional-files += provdatazip:installer.efi provdatazip:startup.nsh
+sets = unlock partition bootloader erase format flash configure slot-ab lock reboot
+additional-files += provdatazip:installer.efi provdatazip:startup.nsh provdatazip:efivar_oemlock provdatazip:unlock_device.nsh provdatazip:config.img provdatazip:factory.img
 enable = true
 
 [configuration.update]
 startState = pos
-sets = unlock slot-ab flash capsule lock reboot
+sets = unlock bootloader flash capsule slot-ab lock reboot
 default = true
-description = update phone to new release
+description = update device to new release
 brief = update
 
 [configuration.blank]
-startState = dnx_os
-sets = fw_update bootstrap unlock partition slot-ab erase format flash capsule configure lock reboot
+startState = pos
+#sets = fw_update bootstrap unlock partition bootloader erase format flash capsule configure slot-ab lock reboot
+sets = unlock partition bootloader reboot-bootloader erase format flash configure slot-ab lock reboot
 description = erase and flash all partitions, all data will be lost.
 brief = blank
 
@@ -131,29 +94,6 @@ exception = bootstrap
 description = Check battery level: ${battery}mV
 expression = ${battery} >= 3500
 skipOnFailure = false
-
-[parameter.slot]
-name = slot
-type = variable
-tool = fastboot
-arg = getvar current-slot
-description = Get current slot
-computedValue = $1
-filter = current-slot:[\s]*(_[a-z]+)
-value = _a
-
-[command.slot-ab.get-active]
-tool = setVariable
-variable = slot
-description = Get the active slot
-defaultValue = _a
-mandatory = false
-
-[command.slot-ab.set-active]
-tool = fastboot
-args = --set-active=${slot}
-description = Set the active slot
-
 [command.unlock.unlock]
 tool = fastboot
 args = flashing unlock
@@ -179,32 +119,80 @@ name = Erase efi vars
 description = Erase all optional efi vars
 default = true
 
-[command.erase.efivars]
+[command.erase-efivars.efivars]
 tool = fastboot
 args = oem erase-efivars
 description = Erase all optional efi vars
 group = erase-efivars
 
+[command.partition.gpt]
+tool = fastboot
+args = flash gpt $file
+file = provdatazip:gpt.bin
+description = Initialize the partition table
+
+[command.bootloader.bootloader]
+tool = fastboot
+args = flash bootloader $file
+file = bootloader:bootloader
+description = Flash bootloader partition
+
+
+
+[command.flash.vbmeta_a]
+tool = fastboot
+args = flash vbmeta_a $file
+file = images:vbmeta.img
+description = Flash vbmeta_a partition
+
 
-[command.flash.boot]
+[command.flash.tos_a]
 tool = fastboot
-args = flash boot $file
+args = flash tos_a $file
+file = radio:tos.img
+description = Flash tos_a partition
+
+
+[command.flash.boot_a]
+tool = fastboot
+args = flash boot_a $file
 file = boot:boot:boot.img
-description = Flash boot partition
+description = Flash boot_a partition
+
 
 
-[command.flash.system]
+
+[command.flash.system_a]
 tool = fastboot
-args = flash system $file
+args = flash system_a $file
 file = images:system.img
 timeout = 600000
-description = Flash system partition
+description = Flash system_a partition
+
 
-[command.flash.bootloader]
+[command.flash.vendor_a]
 tool = fastboot
-args = flash bootloader $file
-file = bootloader:bootloader
-description = Flash bootloader partition
+args = flash vendor_a $file
+file = images:vendor.img
+timeout = 600000
+description = Flash vendor_a partition
+
+
+[command.flash.factory]
+tool = fastboot
+args = flash factory $file
+file = radio:factory.img
+timeout = 600000
+description = Flash factory partition
+
+
+[command.flash.config]
+tool = fastboot
+args = flash config $file
+file = radio:config.img
+timeout = 600000
+description = Flash config partition
+
 
 [command.capsule.rm-capsule]
 tool = fastboot
@@ -218,6 +206,13 @@ tool = fastboot
 args = format data
 description = Format data partition
 
+# This will reset the setting of slot B
+
+[command.slot-ab.set-active-a]
+tool = fastboot
+args = set_active a
+description = Set the active slot to A
+
 [group.lock-device]
 name = Lock the device (it implies the userdata partition wipe)
 description = Put the device in locked state at the end of the flash procedure.
@@ -233,12 +228,9 @@ description = Set device state to locked
 tool = fastboot
 args = continue
 description = Boot to main OS
-##############################################################
-# Source: device/intel/mixins/groups/trusty/true/flashfiles.ini
-##############################################################
-[command.flash.tos]
+
+[command.reboot-bootloader.reboot]
 tool = fastboot
-args = flash tos $file
-file = radio:tos.img
-description = Flash tos partition
+args = reboot bootloader
+description = Boot to bootloader
 # ------------------ END MIX-IN DEFINITIONS ------------------

From 9b45d0d09c0f42120c08d558861b01d6a72dc622 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Fri, 25 May 2018 05:52:57 +0530
Subject: [PATCH 249/427] [CELADON] Mixinup "Add vehicle hal for car"

Jira: None
Test: None
---
 cel_apl/device.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 81c27c896..ec7e405b3 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -256,7 +256,9 @@ PRODUCT_PACKAGES += \
     VmsPublisherClientSample \
     VmsSubscriberClientSample \
 
-PRODUCT_PACKAGES += android.hardware.automotive.vehicle.intel@2.0-service
+PRODUCT_PACKAGES += android.hardware.automotive.vehicle.intel@2.0-service \
+					android.hardware.automotive.vehicle@2.0-service \
+					android.hardware.automotive.vehicle@2.0-impl
 
 VEHICLE_HAL_PROTO_TYPE := google-emulator
 ##############################################################

From 43163b46a22de4131096f242cd0fcc2ed0d5d6cc Mon Sep 17 00:00:00 2001
From: "Zhou, Lihua" <lihuax.zhou@intel.com>
Date: Mon, 28 May 2018 14:26:24 +0800
Subject: [PATCH 250/427] Add the sepolicy for updater_ab_esp

Jira: None.
Test: Test it on Joule and KBL NUC.

Signed-off-by: Zhou, Lihua <lihuax.zhou@intel.com>
---
 sepolicy/boot-arch/project-celadon/celadon/postinstall.te | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sepolicy/boot-arch/project-celadon/celadon/postinstall.te b/sepolicy/boot-arch/project-celadon/celadon/postinstall.te
index bdaf884c0..d04464da6 100644
--- a/sepolicy/boot-arch/project-celadon/celadon/postinstall.te
+++ b/sepolicy/boot-arch/project-celadon/celadon/postinstall.te
@@ -6,3 +6,9 @@ recovery_only(`
 allow postinstall vendor_shell_exec:file rx_file_perms;
 allow postinstall vendor_toolbox_exec:file rx_file_perms;
 allow postinstall vendor_file:file rx_file_perms;
+allow postinstall rootfs:dir { write add_name create mounton };
+allow postinstall self:capability { sys_admin };
+allow postinstall vfat:filesystem { mount unmount };
+allow postinstall vfat:dir { write add_name search };
+allow postinstall vfat:file { create write open getattr };
+allow postinstall block_device:dir { search };

From 4c9fba0dd4485943974527e3fe3e781cddd27308 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 31 May 2018 23:50:29 +0530
Subject: [PATCH 251/427] [CELADON] Mixinup "usb-gadget: Fix for CTS
 UsbDebugging test"

Jira: None
Test: None
---
 cel_apl/device.mk | 2 +-
 celadon/device.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index ec7e405b3..99b81bb38 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -283,7 +283,6 @@ USB_CONFIG := mtp
 ifeq ($(TARGET_BUILD_VARIANT),user)
 # Enable Secure Debugging
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.adb.secure=1
-PRODUCT_COPY_FILES += device/intel/common/usb-gadget/adb_keys:root/adb_keys
 ifeq ($(BUILD_FOR_CTS_AUTOMATION),true)
 # Build for automated CTS
 USB_CONFIG := $(USB_CONFIG),adb
@@ -380,6 +379,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 endif
 
 PRODUCT_PACKAGES += updater_ab_esp
+
 ##############################################################
 # Source: device/intel/mixins/groups/audio/project-celadon/product.mk
 ##############################################################
diff --git a/celadon/device.mk b/celadon/device.mk
index f39ef5f5c..4e7b28a47 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -273,7 +273,6 @@ USB_CONFIG := mtp
 ifeq ($(TARGET_BUILD_VARIANT),user)
 # Enable Secure Debugging
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.adb.secure=1
-PRODUCT_COPY_FILES += device/intel/common/usb-gadget/adb_keys:root/adb_keys
 ifeq ($(BUILD_FOR_CTS_AUTOMATION),true)
 # Build for automated CTS
 USB_CONFIG := $(USB_CONFIG),adb
@@ -370,6 +369,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 endif
 
 PRODUCT_PACKAGES += updater_ab_esp
+
 ##############################################################
 # Source: device/intel/mixins/groups/audio/project-celadon/product.mk
 ##############################################################

From 9040bc666f3b449c18a9b163974bbb0dc4a21354 Mon Sep 17 00:00:00 2001
From: rugnathr <rugnath.ram@intel.com>
Date: Wed, 23 May 2018 15:00:49 +0530
Subject: [PATCH 252/427] Updating defconfig to 4.14.35

Jira: None
Test: None
Signed-off-by: rugnathr <rugnath.ram@intel.com>
---
 kernel_config/kernel_64_defconfig | 98 ++++++++++++++++++-------------
 1 file changed, 58 insertions(+), 40 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 482685a5a..a90717e81 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.14.0 Kernel Configuration
+# Linux/x86_64 4.14.35 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -151,21 +151,21 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_CGROUPS=y
-CONFIG_CGROUP_DEBUG=y
-CONFIG_CGROUP_FREEZER=y
-# CONFIG_CGROUP_PIDS is not set
-# CONFIG_CGROUP_DEVICE is not set
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_CPUACCT=y
 # CONFIG_MEMCG is not set
 # CONFIG_BLK_CGROUP is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_CFS_BANDWIDTH is not set
 CONFIG_RT_GROUP_SCHED=y
+# CONFIG_CGROUP_PIDS is not set
 # CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+# CONFIG_CGROUP_DEVICE is not set
+CONFIG_CGROUP_CPUACCT=y
 # CONFIG_CGROUP_PERF is not set
+CONFIG_CGROUP_DEBUG=y
 # CONFIG_SOCK_CGROUP_DATA is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_NAMESPACES=y
@@ -325,6 +325,7 @@ CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
 CONFIG_STRICT_KERNEL_RWX=y
 CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
 CONFIG_STRICT_MODULE_RWX=y
+CONFIG_ARCH_HAS_REFCOUNT=y
 # CONFIG_REFCOUNT_FULL is not set
 
 #
@@ -426,6 +427,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y
 # CONFIG_X86_X2APIC is not set
 CONFIG_X86_MPPARSE=y
 # CONFIG_GOLDFISH is not set
+CONFIG_RETPOLINE=y
 # CONFIG_INTEL_RDT is not set
 CONFIG_X86_EXTENDED_PLATFORM=y
 # CONFIG_X86_VSMP is not set
@@ -441,6 +443,7 @@ CONFIG_HYPERVISOR_GUEST=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_DEBUG is not set
 # CONFIG_PARAVIRT_SPINLOCKS is not set
+# CONFIG_ACRN is not set
 # CONFIG_XEN is not set
 CONFIG_KVM_GUEST=y
 # CONFIG_KVM_DEBUG_FS is not set
@@ -698,16 +701,12 @@ CONFIG_CPU_FREQ_STAT=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHED is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-# CONFIG_CPU_FREQ_GOV_SCHED is not set
-CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
 # CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set
 
 #
@@ -826,6 +825,7 @@ CONFIG_PCCARD_NONSTATIC=y
 CONFIG_BINFMT_ELF=y
 CONFIG_COMPAT_BINFMT_ELF=y
 CONFIG_ELFCORE=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
 # CONFIG_HAVE_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
@@ -1180,6 +1180,7 @@ CONFIG_NET_SCH_HTB=y
 # CONFIG_NET_SCH_SFQ is not set
 # CONFIG_NET_SCH_TEQL is not set
 # CONFIG_NET_SCH_TBF is not set
+# CONFIG_NET_SCH_CBS is not set
 # CONFIG_NET_SCH_GRED is not set
 # CONFIG_NET_SCH_DSMARK is not set
 # CONFIG_NET_SCH_NETEM is not set
@@ -1400,6 +1401,7 @@ CONFIG_DEV_COREDUMP=y
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPI=y
@@ -1486,7 +1488,6 @@ CONFIG_MTD_CFI_I2=y
 # Disk-On-Chip Device Drivers
 #
 # CONFIG_MTD_DOCG3 is not set
-CONFIG_MTD_NAND_IDS=m
 CONFIG_MTD_NAND_ECC=m
 # CONFIG_MTD_NAND_ECC_SMC is not set
 CONFIG_MTD_NAND=m
@@ -1599,9 +1600,8 @@ CONFIG_VIRTIO_BLK=y
 # CONFIG_VIRTIO_BLK_SCSI is not set
 # CONFIG_BLK_DEV_RBD is not set
 # CONFIG_BLK_DEV_RSXX is not set
-CONFIG_NVME_CORE=y
-CONFIG_BLK_DEV_NVME=y
-
+# CONFIG_BLK_DEV_NVME is not set
+# CONFIG_NVME_FC is not set
 # CONFIG_NVME_TARGET is not set
 
 #
@@ -3318,6 +3318,7 @@ CONFIG_GPIO_ARIZONA=m
 CONFIG_GPIO_CRYSTAL_COVE=y
 # CONFIG_GPIO_TPS65218 is not set
 CONFIG_GPIO_UCB1400=m
+# CONFIG_GPIO_WHISKEY_COVE is not set
 
 #
 # PCI GPIO expanders
@@ -3557,6 +3558,7 @@ CONFIG_INTEL_SOC_DTS_THERMAL=m
 CONFIG_INT340X_THERMAL=m
 CONFIG_ACPI_THERMAL_REL=m
 # CONFIG_INT3406_THERMAL is not set
+# CONFIG_INTEL_BXT_PMIC_THERMAL is not set
 CONFIG_INTEL_PCH_THERMAL=m
 # CONFIG_GENERIC_ADC_THERMAL is not set
 
@@ -4604,6 +4606,7 @@ CONFIG_DRM_I915_CAPTURE_ERROR=y
 CONFIG_DRM_I915_COMPRESS_ERROR=y
 CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_I915_GVT is not set
+# CONFIG_DRM_I915_LOAD_ASYNC_SUPPORT is not set
 
 #
 # drm/i915 Debugging
@@ -4997,6 +5000,7 @@ CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 CONFIG_SND_SOC_COMPRESS=y
 CONFIG_SND_SOC_TOPOLOGY=y
+CONFIG_SND_SOC_ACPI=m
 # CONFIG_SND_SOC_AMD_ACP is not set
 CONFIG_SND_ATMEL_SOC=m
 CONFIG_SND_DESIGNWARE_I2S=m
@@ -5017,18 +5021,20 @@ CONFIG_SND_DESIGNWARE_I2S=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_I2S_HI6210_I2S is not set
 # CONFIG_SND_SOC_IMG is not set
-CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
+CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
 CONFIG_SND_SST_IPC=m
 CONFIG_SND_SST_IPC_ACPI=m
+CONFIG_SND_SOC_INTEL_SST_ACPI=m
 CONFIG_SND_SOC_INTEL_SST=m
 CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m
-CONFIG_SND_SOC_INTEL_SST_ACPI=m
-CONFIG_SND_SOC_INTEL_SST_MATCH=m
 CONFIG_SND_SOC_INTEL_HASWELL=m
+# CONFIG_SND_SOC_INTEL_BAYTRAIL is not set
+# CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI is not set
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
+CONFIG_SND_SOC_INTEL_SKYLAKE=m
+CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
+CONFIG_SND_SOC_INTEL_MACH=y
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
-# CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXT_TDF8532_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
@@ -5039,18 +5045,23 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 # CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH is not set
 # CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH is not set
 # CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set
-# CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH is not set
-# CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH is not set
-CONFIG_SND_SOC_INTEL_SKYLAKE=m
 CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
 # CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH is not set
 # CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH is not set
+# CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set
+# CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set
+# CONFIG_SND_SOC_INTEL_BXT_TDF8532_MACH is not set
+# CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH is not set
+# CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH is not set
 # CONFIG_SND_SOC_INTEL_CNL_FPGA is not set
 # CONFIG_SND_SOC_INTEL_CNL_CS42L42_MACH is not set
 # CONFIG_SND_SOC_INTEL_CNL_RT700_MACH is not set
 # CONFIG_SND_SOC_INTEL_CNL_SVFPGA_MACH is not set
 # CONFIG_SND_SOC_INTEL_CNL_RT274_MACH is not set
 # CONFIG_SND_SOC_SDW_AGGM1M2 is not set
+CONFIG_SND_SOC_SOF=m
+# CONFIG_SND_SOC_SOF_NOCODEC is not set
+# CONFIG_SND_SOC_SOF_INTEL is not set
 
 #
 # STMicroelectronics STM32 SOC audio support
@@ -5637,7 +5648,6 @@ CONFIG_SDIO_UART=m
 # CONFIG_MMC_TEST is not set
 # CONFIG_MMC_EMBEDDED_SDIO is not set
 # CONFIG_MMC_PARANOID_SD_INIT is not set
-# CONFIG_MMC_SIMULATE_MAX_SPEED is not set
 
 #
 # MMC/SD/SDIO Host Controller Drivers
@@ -5910,6 +5920,13 @@ CONFIG_DMA_ENGINE_RAID=y
 #
 CONFIG_SYNC_FILE=y
 CONFIG_SW_SYNC=y
+
+#
+# hyper_dmabuf options
+#
+CONFIG_HYPER_DMABUF=y
+CONFIG_HYPER_DMABUF_SYSFS=y
+# CONFIG_HYPER_DMABUF_EVENT_GEN is not set
 CONFIG_DCA=m
 # CONFIG_AUXDISPLAY is not set
 CONFIG_CHARLCD=m
@@ -5940,6 +5957,7 @@ CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_MMIO=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+# CONFIG_ACRN_VIRTIO_DEVICES is not set
 
 #
 # Microsoft Hyper-V guest support
@@ -6072,11 +6090,14 @@ CONFIG_ASHMEM=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
 CONFIG_SYNC=y
+# CONFIG_ANDROID_FWDATA is not set
 CONFIG_ION=y
 # CONFIG_ION_SYSTEM_HEAP is not set
 # CONFIG_ION_CARVEOUT_HEAP is not set
 # CONFIG_ION_CHUNK_HEAP is not set
 # CONFIG_ABL_BOOTLOADER_CONTROL is not set
+# CONFIG_SBL_BOOTLOADER_CONTROL is not set
+# CONFIG_VSBL_BOOTLOADER_CONTROL is not set
 # CONFIG_FIQ_WATCHDOG is not set
 # CONFIG_STAGING_BOARD is not set
 # CONFIG_LTE_GDM724X is not set
@@ -6164,6 +6185,7 @@ CONFIG_INTEL_RST=m
 CONFIG_INTEL_SMARTCONNECT=m
 CONFIG_PVPANIC=m
 CONFIG_INTEL_PMC_IPC=y
+# CONFIG_INTEL_BXTWC_PMIC_TMU is not set
 CONFIG_SURFACE_PRO3_BUTTON=m
 # CONFIG_SURFACE_3_BUTTON is not set
 CONFIG_INTEL_PUNIT_IPC=y
@@ -6288,7 +6310,6 @@ CONFIG_EXTCON_RT8973A=m
 CONFIG_EXTCON_SM5502=m
 CONFIG_EXTCON_USB_GPIO=m
 # CONFIG_EXTCON_USBC_CROS_EC is not set
-# CONFIG_EXTCON_INTEL_USB is not set
 CONFIG_EXTCON_INTEL_USB=y
 # CONFIG_MEMORY is not set
 CONFIG_IIO=m
@@ -6811,10 +6832,6 @@ CONFIG_BTRFS_FS=m
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_NILFS2_FS is not set
 # CONFIG_F2FS_FS is not set
-# CONFIG_F2FS_STAT_FS is not set
-# CONFIG_F2FS_FS_XATTR is not set
-# CONFIG_F2FS_FS_POSIX_ACL is not set
-# CONFIG_F2FS_FS_SECURITY is not set
 # CONFIG_FS_DAX is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=m
@@ -6897,8 +6914,6 @@ CONFIG_SDCARD_FS=y
 # CONFIG_UBIFS_FS is not set
 # CONFIG_CRAMFS is not set
 CONFIG_SQUASHFS=y
-# CONFIG_SQUASHFS_FILE_CACHE is not set
-CONFIG_SQUASHFS_FILE_DIRECT=y
 # CONFIG_SQUASHFS_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
@@ -6941,6 +6956,8 @@ CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_SUNRPC_DEBUG is not set
 # CONFIG_CEPH_FS is not set
 CONFIG_CIFS=m
@@ -7038,8 +7055,7 @@ CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_STACK_VALIDATION is not set
+CONFIG_STACK_VALIDATION=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
@@ -7069,7 +7085,6 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
 CONFIG_HAVE_ARCH_KASAN=y
 # CONFIG_KASAN is not set
 CONFIG_ARCH_HAS_KCOV=y
@@ -7095,7 +7110,6 @@ CONFIG_PANIC_ON_OOPS_VALUE=1
 CONFIG_PANIC_TIMEOUT=5
 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHED_INFO=y
-# CONFIG_PANIC_ON_RT_THROTTLING is not set
 CONFIG_SCHEDSTATS=y
 # CONFIG_SCHED_STACK_END_CHECK is not set
 # CONFIG_DEBUG_TIMEKEEPING is not set
@@ -7162,6 +7176,7 @@ CONFIG_TRACING_SUPPORT=y
 CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
 CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_PREEMPT_TRACER is not set
 # CONFIG_SCHED_TRACER is not set
@@ -7255,9 +7270,9 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DEBUG_NMI_SELFTEST is not set
 CONFIG_X86_DEBUG_FPU=y
 # CONFIG_PUNIT_ATOM_DEBUG is not set
-CONFIG_FRAME_POINTER_UNWINDER=y
-# CONFIG_ORC_UNWINDER is not set
-# CONFIG_GUESS_UNWINDER is not set
+CONFIG_UNWINDER_ORC=y
+# CONFIG_UNWINDER_FRAME_POINTER is not set
+# CONFIG_UNWINDER_GUESS is not set
 
 #
 # Security options
@@ -7274,6 +7289,7 @@ CONFIG_SECURITY=y
 CONFIG_SECURITY_WRITABLE_HOOKS=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
+CONFIG_PAGE_TABLE_ISOLATION=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
 CONFIG_SECURITY_PATH=y
 CONFIG_LSM_MMAP_MIN_ADDR=65536
@@ -7322,6 +7338,7 @@ CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_AKCIPHER2=y
 CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
+CONFIG_CRYPTO_KPP=m
 CONFIG_CRYPTO_ACOMP2=y
 CONFIG_CRYPTO_RSA=y
 # CONFIG_CRYPTO_DH is not set
@@ -7438,6 +7455,7 @@ CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
 CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
 CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
+# CONFIG_CRYPTO_SPECK is not set
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=y
 CONFIG_CRYPTO_TWOFISH_COMMON=y

From c0bb70d0ae558c8d11b1df8256050bfabe4ef0cd Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 14 Jun 2018 21:31:00 +0530
Subject: [PATCH 253/427] Revert "Updating defconfig to 4.14.35"

This reverts commit 9040bc666f3b449c18a9b163974bbb0dc4a21354.
---
 kernel_config/kernel_64_defconfig | 98 +++++++++++++------------------
 1 file changed, 40 insertions(+), 58 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index a90717e81..482685a5a 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.14.35 Kernel Configuration
+# Linux/x86_64 4.14.0 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -151,21 +151,21 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_CGROUPS=y
+CONFIG_CGROUP_DEBUG=y
+CONFIG_CGROUP_FREEZER=y
+# CONFIG_CGROUP_PIDS is not set
+# CONFIG_CGROUP_DEVICE is not set
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
 # CONFIG_MEMCG is not set
 # CONFIG_BLK_CGROUP is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_CFS_BANDWIDTH is not set
 CONFIG_RT_GROUP_SCHED=y
-# CONFIG_CGROUP_PIDS is not set
 # CONFIG_CGROUP_RDMA is not set
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-# CONFIG_CGROUP_DEVICE is not set
-CONFIG_CGROUP_CPUACCT=y
 # CONFIG_CGROUP_PERF is not set
-CONFIG_CGROUP_DEBUG=y
 # CONFIG_SOCK_CGROUP_DATA is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_NAMESPACES=y
@@ -325,7 +325,6 @@ CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
 CONFIG_STRICT_KERNEL_RWX=y
 CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
 CONFIG_STRICT_MODULE_RWX=y
-CONFIG_ARCH_HAS_REFCOUNT=y
 # CONFIG_REFCOUNT_FULL is not set
 
 #
@@ -427,7 +426,6 @@ CONFIG_X86_FAST_FEATURE_TESTS=y
 # CONFIG_X86_X2APIC is not set
 CONFIG_X86_MPPARSE=y
 # CONFIG_GOLDFISH is not set
-CONFIG_RETPOLINE=y
 # CONFIG_INTEL_RDT is not set
 CONFIG_X86_EXTENDED_PLATFORM=y
 # CONFIG_X86_VSMP is not set
@@ -443,7 +441,6 @@ CONFIG_HYPERVISOR_GUEST=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_DEBUG is not set
 # CONFIG_PARAVIRT_SPINLOCKS is not set
-# CONFIG_ACRN is not set
 # CONFIG_XEN is not set
 CONFIG_KVM_GUEST=y
 # CONFIG_KVM_DEBUG_FS is not set
@@ -701,12 +698,16 @@ CONFIG_CPU_FREQ_STAT=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHED is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+# CONFIG_CPU_FREQ_GOV_SCHED is not set
+CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
 # CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set
 
 #
@@ -825,7 +826,6 @@ CONFIG_PCCARD_NONSTATIC=y
 CONFIG_BINFMT_ELF=y
 CONFIG_COMPAT_BINFMT_ELF=y
 CONFIG_ELFCORE=y
-CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
 # CONFIG_HAVE_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
@@ -1180,7 +1180,6 @@ CONFIG_NET_SCH_HTB=y
 # CONFIG_NET_SCH_SFQ is not set
 # CONFIG_NET_SCH_TEQL is not set
 # CONFIG_NET_SCH_TBF is not set
-# CONFIG_NET_SCH_CBS is not set
 # CONFIG_NET_SCH_GRED is not set
 # CONFIG_NET_SCH_DSMARK is not set
 # CONFIG_NET_SCH_NETEM is not set
@@ -1401,7 +1400,6 @@ CONFIG_DEV_COREDUMP=y
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPI=y
@@ -1488,6 +1486,7 @@ CONFIG_MTD_CFI_I2=y
 # Disk-On-Chip Device Drivers
 #
 # CONFIG_MTD_DOCG3 is not set
+CONFIG_MTD_NAND_IDS=m
 CONFIG_MTD_NAND_ECC=m
 # CONFIG_MTD_NAND_ECC_SMC is not set
 CONFIG_MTD_NAND=m
@@ -1600,8 +1599,9 @@ CONFIG_VIRTIO_BLK=y
 # CONFIG_VIRTIO_BLK_SCSI is not set
 # CONFIG_BLK_DEV_RBD is not set
 # CONFIG_BLK_DEV_RSXX is not set
-# CONFIG_BLK_DEV_NVME is not set
-# CONFIG_NVME_FC is not set
+CONFIG_NVME_CORE=y
+CONFIG_BLK_DEV_NVME=y
+
 # CONFIG_NVME_TARGET is not set
 
 #
@@ -3318,7 +3318,6 @@ CONFIG_GPIO_ARIZONA=m
 CONFIG_GPIO_CRYSTAL_COVE=y
 # CONFIG_GPIO_TPS65218 is not set
 CONFIG_GPIO_UCB1400=m
-# CONFIG_GPIO_WHISKEY_COVE is not set
 
 #
 # PCI GPIO expanders
@@ -3558,7 +3557,6 @@ CONFIG_INTEL_SOC_DTS_THERMAL=m
 CONFIG_INT340X_THERMAL=m
 CONFIG_ACPI_THERMAL_REL=m
 # CONFIG_INT3406_THERMAL is not set
-# CONFIG_INTEL_BXT_PMIC_THERMAL is not set
 CONFIG_INTEL_PCH_THERMAL=m
 # CONFIG_GENERIC_ADC_THERMAL is not set
 
@@ -4606,7 +4604,6 @@ CONFIG_DRM_I915_CAPTURE_ERROR=y
 CONFIG_DRM_I915_COMPRESS_ERROR=y
 CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_I915_GVT is not set
-# CONFIG_DRM_I915_LOAD_ASYNC_SUPPORT is not set
 
 #
 # drm/i915 Debugging
@@ -5000,7 +4997,6 @@ CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 CONFIG_SND_SOC_COMPRESS=y
 CONFIG_SND_SOC_TOPOLOGY=y
-CONFIG_SND_SOC_ACPI=m
 # CONFIG_SND_SOC_AMD_ACP is not set
 CONFIG_SND_ATMEL_SOC=m
 CONFIG_SND_DESIGNWARE_I2S=m
@@ -5021,20 +5017,18 @@ CONFIG_SND_DESIGNWARE_I2S=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_I2S_HI6210_I2S is not set
 # CONFIG_SND_SOC_IMG is not set
-CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
 CONFIG_SND_SST_IPC=m
 CONFIG_SND_SST_IPC_ACPI=m
-CONFIG_SND_SOC_INTEL_SST_ACPI=m
 CONFIG_SND_SOC_INTEL_SST=m
 CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m
+CONFIG_SND_SOC_INTEL_SST_ACPI=m
+CONFIG_SND_SOC_INTEL_SST_MATCH=m
 CONFIG_SND_SOC_INTEL_HASWELL=m
-# CONFIG_SND_SOC_INTEL_BAYTRAIL is not set
-# CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI is not set
-CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
-CONFIG_SND_SOC_INTEL_SKYLAKE=m
-CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
-CONFIG_SND_SOC_INTEL_MACH=y
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
+# CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set
+# CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set
+# CONFIG_SND_SOC_INTEL_BXT_TDF8532_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
@@ -5045,23 +5039,18 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 # CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH is not set
 # CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH is not set
 # CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set
+# CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH is not set
+# CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH is not set
+CONFIG_SND_SOC_INTEL_SKYLAKE=m
 CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
 # CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH is not set
 # CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXT_TDF8532_MACH is not set
-# CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH is not set
-# CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH is not set
 # CONFIG_SND_SOC_INTEL_CNL_FPGA is not set
 # CONFIG_SND_SOC_INTEL_CNL_CS42L42_MACH is not set
 # CONFIG_SND_SOC_INTEL_CNL_RT700_MACH is not set
 # CONFIG_SND_SOC_INTEL_CNL_SVFPGA_MACH is not set
 # CONFIG_SND_SOC_INTEL_CNL_RT274_MACH is not set
 # CONFIG_SND_SOC_SDW_AGGM1M2 is not set
-CONFIG_SND_SOC_SOF=m
-# CONFIG_SND_SOC_SOF_NOCODEC is not set
-# CONFIG_SND_SOC_SOF_INTEL is not set
 
 #
 # STMicroelectronics STM32 SOC audio support
@@ -5648,6 +5637,7 @@ CONFIG_SDIO_UART=m
 # CONFIG_MMC_TEST is not set
 # CONFIG_MMC_EMBEDDED_SDIO is not set
 # CONFIG_MMC_PARANOID_SD_INIT is not set
+# CONFIG_MMC_SIMULATE_MAX_SPEED is not set
 
 #
 # MMC/SD/SDIO Host Controller Drivers
@@ -5920,13 +5910,6 @@ CONFIG_DMA_ENGINE_RAID=y
 #
 CONFIG_SYNC_FILE=y
 CONFIG_SW_SYNC=y
-
-#
-# hyper_dmabuf options
-#
-CONFIG_HYPER_DMABUF=y
-CONFIG_HYPER_DMABUF_SYSFS=y
-# CONFIG_HYPER_DMABUF_EVENT_GEN is not set
 CONFIG_DCA=m
 # CONFIG_AUXDISPLAY is not set
 CONFIG_CHARLCD=m
@@ -5957,7 +5940,6 @@ CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_MMIO=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-# CONFIG_ACRN_VIRTIO_DEVICES is not set
 
 #
 # Microsoft Hyper-V guest support
@@ -6090,14 +6072,11 @@ CONFIG_ASHMEM=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
 CONFIG_SYNC=y
-# CONFIG_ANDROID_FWDATA is not set
 CONFIG_ION=y
 # CONFIG_ION_SYSTEM_HEAP is not set
 # CONFIG_ION_CARVEOUT_HEAP is not set
 # CONFIG_ION_CHUNK_HEAP is not set
 # CONFIG_ABL_BOOTLOADER_CONTROL is not set
-# CONFIG_SBL_BOOTLOADER_CONTROL is not set
-# CONFIG_VSBL_BOOTLOADER_CONTROL is not set
 # CONFIG_FIQ_WATCHDOG is not set
 # CONFIG_STAGING_BOARD is not set
 # CONFIG_LTE_GDM724X is not set
@@ -6185,7 +6164,6 @@ CONFIG_INTEL_RST=m
 CONFIG_INTEL_SMARTCONNECT=m
 CONFIG_PVPANIC=m
 CONFIG_INTEL_PMC_IPC=y
-# CONFIG_INTEL_BXTWC_PMIC_TMU is not set
 CONFIG_SURFACE_PRO3_BUTTON=m
 # CONFIG_SURFACE_3_BUTTON is not set
 CONFIG_INTEL_PUNIT_IPC=y
@@ -6310,6 +6288,7 @@ CONFIG_EXTCON_RT8973A=m
 CONFIG_EXTCON_SM5502=m
 CONFIG_EXTCON_USB_GPIO=m
 # CONFIG_EXTCON_USBC_CROS_EC is not set
+# CONFIG_EXTCON_INTEL_USB is not set
 CONFIG_EXTCON_INTEL_USB=y
 # CONFIG_MEMORY is not set
 CONFIG_IIO=m
@@ -6832,6 +6811,10 @@ CONFIG_BTRFS_FS=m
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_NILFS2_FS is not set
 # CONFIG_F2FS_FS is not set
+# CONFIG_F2FS_STAT_FS is not set
+# CONFIG_F2FS_FS_XATTR is not set
+# CONFIG_F2FS_FS_POSIX_ACL is not set
+# CONFIG_F2FS_FS_SECURITY is not set
 # CONFIG_FS_DAX is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=m
@@ -6914,6 +6897,8 @@ CONFIG_SDCARD_FS=y
 # CONFIG_UBIFS_FS is not set
 # CONFIG_CRAMFS is not set
 CONFIG_SQUASHFS=y
+# CONFIG_SQUASHFS_FILE_CACHE is not set
+CONFIG_SQUASHFS_FILE_DIRECT=y
 # CONFIG_SQUASHFS_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
@@ -6956,8 +6941,6 @@ CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_SUNRPC_DEBUG is not set
 # CONFIG_CEPH_FS is not set
 CONFIG_CIFS=m
@@ -7055,7 +7038,8 @@ CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-CONFIG_STACK_VALIDATION=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_STACK_VALIDATION is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
@@ -7085,6 +7069,7 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
 CONFIG_HAVE_ARCH_KASAN=y
 # CONFIG_KASAN is not set
 CONFIG_ARCH_HAS_KCOV=y
@@ -7110,6 +7095,7 @@ CONFIG_PANIC_ON_OOPS_VALUE=1
 CONFIG_PANIC_TIMEOUT=5
 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHED_INFO=y
+# CONFIG_PANIC_ON_RT_THROTTLING is not set
 CONFIG_SCHEDSTATS=y
 # CONFIG_SCHED_STACK_END_CHECK is not set
 # CONFIG_DEBUG_TIMEKEEPING is not set
@@ -7176,7 +7162,6 @@ CONFIG_TRACING_SUPPORT=y
 CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
 CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_PREEMPT_TRACER is not set
 # CONFIG_SCHED_TRACER is not set
@@ -7270,9 +7255,9 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DEBUG_NMI_SELFTEST is not set
 CONFIG_X86_DEBUG_FPU=y
 # CONFIG_PUNIT_ATOM_DEBUG is not set
-CONFIG_UNWINDER_ORC=y
-# CONFIG_UNWINDER_FRAME_POINTER is not set
-# CONFIG_UNWINDER_GUESS is not set
+CONFIG_FRAME_POINTER_UNWINDER=y
+# CONFIG_ORC_UNWINDER is not set
+# CONFIG_GUESS_UNWINDER is not set
 
 #
 # Security options
@@ -7289,7 +7274,6 @@ CONFIG_SECURITY=y
 CONFIG_SECURITY_WRITABLE_HOOKS=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
-CONFIG_PAGE_TABLE_ISOLATION=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
 CONFIG_SECURITY_PATH=y
 CONFIG_LSM_MMAP_MIN_ADDR=65536
@@ -7338,7 +7322,6 @@ CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_AKCIPHER2=y
 CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
-CONFIG_CRYPTO_KPP=m
 CONFIG_CRYPTO_ACOMP2=y
 CONFIG_CRYPTO_RSA=y
 # CONFIG_CRYPTO_DH is not set
@@ -7455,7 +7438,6 @@ CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
 CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
 CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
-# CONFIG_CRYPTO_SPECK is not set
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=y
 CONFIG_CRYPTO_TWOFISH_COMMON=y

From e4196bd8b2eade373c9e21c21ebb77847f949565 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 14 Jun 2018 21:31:12 +0530
Subject: [PATCH 254/427] [CELADON] Mixinup "Removing adoptable storage feature
 for encrytable sd/usb"

Jira: None
Test: None
---
 cel_apl/fstab | 8 ++++----
 celadon/fstab | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cel_apl/fstab b/cel_apl/fstab
index 07595ed6b..842315754 100644
--- a/cel_apl/fstab
+++ b/cel_apl/fstab
@@ -4,7 +4,7 @@
 # Source: device/intel/mixins/groups/storage/sdcard-mmc0-usb-sd/fstab
 ##############################################################
 */usb*/*/host*/*/block/sd*              auto             auto    defaults                                   voldmanaged=usbdisk:auto
-*/mmc0/*/block/mmcblk*                  auto             auto    defaults                                   voldmanaged=sdcard1:auto,encryptable=userdata
+*/mmc0/*/block/mmcblk*                  auto             auto    defaults                                   voldmanaged=sdcard1:auto
 ##############################################################
 # Source: device/intel/mixins/groups/factory-partition/true/fstab
 ##############################################################
@@ -32,9 +32,9 @@
 # The filesystem that contains the filesystem checker binary (typically /system) cannot
 # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
 
-/devices/*/usb*/*               auto            auto    defaults                                                    voldmanaged=usb:auto,encryptable=userdata
-/devices/*/*sdmmc*/*            auto            auto    defaults                                                    voldmanaged=sdcard1:auto,encryptable=userdata
-/devices/*/80860F14:01/mmc_*    auto            auto    defaults                                                    voldmanaged=sdcard1:auto,encryptable=userdata
+/devices/*/usb*/*               auto            auto    defaults                                                    voldmanaged=usb:auto
+/devices/*/*sdmmc*/*            auto            auto    defaults                                                    voldmanaged=sdcard1:auto
+/devices/*/80860F14:01/mmc_*    auto            auto    defaults                                                    voldmanaged=sdcard1:auto
 
 # If enable AVB and A/B slot, then will mount system partition as / through /dev/dm-0
 /dev/block/by-name/system       /               ext4    ro                                                          wait,slotselect,avb
diff --git a/celadon/fstab b/celadon/fstab
index 07595ed6b..842315754 100644
--- a/celadon/fstab
+++ b/celadon/fstab
@@ -4,7 +4,7 @@
 # Source: device/intel/mixins/groups/storage/sdcard-mmc0-usb-sd/fstab
 ##############################################################
 */usb*/*/host*/*/block/sd*              auto             auto    defaults                                   voldmanaged=usbdisk:auto
-*/mmc0/*/block/mmcblk*                  auto             auto    defaults                                   voldmanaged=sdcard1:auto,encryptable=userdata
+*/mmc0/*/block/mmcblk*                  auto             auto    defaults                                   voldmanaged=sdcard1:auto
 ##############################################################
 # Source: device/intel/mixins/groups/factory-partition/true/fstab
 ##############################################################
@@ -32,9 +32,9 @@
 # The filesystem that contains the filesystem checker binary (typically /system) cannot
 # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
 
-/devices/*/usb*/*               auto            auto    defaults                                                    voldmanaged=usb:auto,encryptable=userdata
-/devices/*/*sdmmc*/*            auto            auto    defaults                                                    voldmanaged=sdcard1:auto,encryptable=userdata
-/devices/*/80860F14:01/mmc_*    auto            auto    defaults                                                    voldmanaged=sdcard1:auto,encryptable=userdata
+/devices/*/usb*/*               auto            auto    defaults                                                    voldmanaged=usb:auto
+/devices/*/*sdmmc*/*            auto            auto    defaults                                                    voldmanaged=sdcard1:auto
+/devices/*/80860F14:01/mmc_*    auto            auto    defaults                                                    voldmanaged=sdcard1:auto
 
 # If enable AVB and A/B slot, then will mount system partition as / through /dev/dm-0
 /dev/block/by-name/system       /               ext4    ro                                                          wait,slotselect,avb

From d6b678a3cea7339103628fd4b1d2001dbce194f1 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 14 Jun 2018 21:34:34 +0530
Subject: [PATCH 255/427] [CELADON] Mixinup "Fix for CtsMediaTestCases
 assertion failure"

Jira: None
Test: None
---
 cel_apl/device.mk | 1 -
 celadon/device.mk | 1 -
 2 files changed, 2 deletions(-)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 99b81bb38..32c29066f 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -222,7 +222,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
     frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
-    frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \
     device/intel/project-celadon/common/media/media_profiles.xml:system/etc/media_profiles.xml \
     device/intel/project-celadon/common/media/media_codecs.xml:system/etc/media_codecs.xml \
     device/intel/project-celadon/common/media/media_codecs_performance.xml:system/etc/media_codecs_performance.xml
diff --git a/celadon/device.mk b/celadon/device.mk
index 4e7b28a47..8f7c0034a 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -222,7 +222,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
     frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
-    frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \
     device/intel/project-celadon/common/media/media_profiles.xml:system/etc/media_profiles.xml \
     device/intel/project-celadon/common/media/media_codecs.xml:system/etc/media_codecs.xml \
     device/intel/project-celadon/common/media/media_codecs_performance.xml:system/etc/media_codecs_performance.xml

From a9cac8aa033c55f38a12bbcb78f41cd3db44ce92 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 14 Jun 2018 21:37:18 +0530
Subject: [PATCH 256/427] [CELADON] Mixinup "Add default dalvik memory config"

Jira: None
Test: None
---
 cel_apl/device.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 32c29066f..58530f891 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -249,6 +249,8 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/device-type/overlay-car
 $(call inherit-product, packages/services/Car/car_product/build/car.mk)
 
+$(call inherit-product,frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-heap.mk)
+
 PRODUCT_PACKAGES += \
     radio.fm.default \
     CarSettings \

From 0a76805daf0b6ed06e37d15f3e734571e37c3e57 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 14 Jun 2018 21:39:35 +0530
Subject: [PATCH 257/427] [CELADON] Mixinup "Enable secure adb for user and
 userdebug build but add adb_keys only"

Jira: None
Test: None
---
 cel_apl/device.mk | 12 ++++++++++++
 celadon/device.mk | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 58530f891..8c39a69d8 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -281,16 +281,28 @@ PRODUCT_PROPERTY_OVERRIDES += \
 ##############################################################
 # Set default USB interface
 USB_CONFIG := mtp
+
 ifeq ($(TARGET_BUILD_VARIANT),user)
 # Enable Secure Debugging
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.adb.secure=1
 ifeq ($(BUILD_FOR_CTS_AUTOMATION),true)
 # Build for automated CTS
+ifneq ($(USB_CONFIG), adb)
 USB_CONFIG := $(USB_CONFIG),adb
+endif
+PRODUCT_COPY_FILES += $(INTEL_PATH_COMMON)/usb-gadget/adb_keys:root/adb_keys
 endif #BUILD_FOR_CTS_AUTOMATION == true
 endif #TARGET_BUILD_VARIANT == user
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.sys.usb.config=$(USB_CONFIG)
 
+# Add Intel adb keys for userdebug/eng builds
+ifneq ($(TARGET_BUILD_VARIANT),user)
+PRODUCT_COPY_FILES += $(INTEL_PATH_COMMON)/usb-gadget/adb_keys:root/adb_keys
+# Enable Secure Debugging for userdebug
+ifeq ($(TARGET_BUILD_VARIANT),userdebug) #userdebug
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.adb.secure=1
+endif #userdebug
+endif #userdebug/eng
 ##############################################################
 # Source: device/intel/mixins/groups/adb_net/true/product.mk
 ##############################################################
diff --git a/celadon/device.mk b/celadon/device.mk
index 8f7c0034a..807644360 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -269,16 +269,28 @@ PRODUCT_PROPERTY_OVERRIDES += \
 ##############################################################
 # Set default USB interface
 USB_CONFIG := mtp
+
 ifeq ($(TARGET_BUILD_VARIANT),user)
 # Enable Secure Debugging
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.adb.secure=1
 ifeq ($(BUILD_FOR_CTS_AUTOMATION),true)
 # Build for automated CTS
+ifneq ($(USB_CONFIG), adb)
 USB_CONFIG := $(USB_CONFIG),adb
+endif
+PRODUCT_COPY_FILES += $(INTEL_PATH_COMMON)/usb-gadget/adb_keys:root/adb_keys
 endif #BUILD_FOR_CTS_AUTOMATION == true
 endif #TARGET_BUILD_VARIANT == user
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.sys.usb.config=$(USB_CONFIG)
 
+# Add Intel adb keys for userdebug/eng builds
+ifneq ($(TARGET_BUILD_VARIANT),user)
+PRODUCT_COPY_FILES += $(INTEL_PATH_COMMON)/usb-gadget/adb_keys:root/adb_keys
+# Enable Secure Debugging for userdebug
+ifeq ($(TARGET_BUILD_VARIANT),userdebug) #userdebug
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.adb.secure=1
+endif #userdebug
+endif #userdebug/eng
 ##############################################################
 # Source: device/intel/mixins/groups/adb_net/true/product.mk
 ##############################################################

From fff9411a271707fdcbfeceb9f29c9329ce874cff Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 14 Jun 2018 21:42:01 +0530
Subject: [PATCH 258/427] [CELADON] Mixinup "Allow to set volume to max for
 3.5mm device"

Jira: None
Test: None
---
 cel_apl/device.mk | 2 ++
 celadon/device.mk | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 8c39a69d8..24722ab85 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -414,6 +414,8 @@ PRODUCT_PACKAGES += \
     android.hardware.audio.effect@2.0-impl \
     android.hardware.audio@2.0-impl \
     android.hardware.audio@2.0-service
+
+PRODUCT_PROPERTY_OVERRIDES += audio.safemedia.bypass=true
 ##############################################################
 # Source: device/intel/mixins/groups/wlan/iwlwifi/product.mk
 ##############################################################
diff --git a/celadon/device.mk b/celadon/device.mk
index 807644360..af3949b3b 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -402,6 +402,8 @@ PRODUCT_PACKAGES += \
     android.hardware.audio.effect@2.0-impl \
     android.hardware.audio@2.0-impl \
     android.hardware.audio@2.0-service
+
+PRODUCT_PROPERTY_OVERRIDES += audio.safemedia.bypass=true
 ##############################################################
 # Source: device/intel/mixins/groups/wlan/iwlwifi/product.mk
 ##############################################################

From 4652dd2692a56c37996cf8fb71123b6c2ba1c2a3 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 14 Jun 2018 21:44:51 +0530
Subject: [PATCH 259/427] [CELADON] Mixinup "Add config for medium density"

Jira: None
Test: None
---
 cel_apl/device.mk | 5 ++++-
 celadon/device.mk | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 24722ab85..4a858ed51 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -275,7 +275,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
 ##############################################################
 # Source: device/intel/mixins/groups/display-density/default/product.mk
 ##############################################################
-# Do not remove this file. Unable to update mixins without this.
+PRODUCT_AAPT_CONFIG := normal
+PRODUCT_AAPT_PREF_CONFIG := mdpi
+
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.sf.lcd_density=160
 ##############################################################
 # Source: device/intel/mixins/groups/usb-gadget/g_ffs/product.mk
 ##############################################################
diff --git a/celadon/device.mk b/celadon/device.mk
index af3949b3b..b64763b52 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -263,7 +263,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
 ##############################################################
 # Source: device/intel/mixins/groups/display-density/default/product.mk
 ##############################################################
-# Do not remove this file. Unable to update mixins without this.
+PRODUCT_AAPT_CONFIG := normal
+PRODUCT_AAPT_PREF_CONFIG := mdpi
+
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.sf.lcd_density=160
 ##############################################################
 # Source: device/intel/mixins/groups/usb-gadget/g_ffs/product.mk
 ##############################################################

From 8987a5b27ae84b255c4f9895b770360d0d6ba00a Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 14 Jun 2018 21:47:15 +0530
Subject: [PATCH 260/427] [CELADON] Mixinup "Disable the 'Fastboot' boot option
 by default"

Jira: None
Test: None
---
 cel_apl/AndroidBoard.mk | 2 ++
 celadon/AndroidBoard.mk | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/cel_apl/AndroidBoard.mk b/cel_apl/AndroidBoard.mk
index b7be0bb62..e29d151c4 100644
--- a/cel_apl/AndroidBoard.mk
+++ b/cel_apl/AndroidBoard.mk
@@ -277,7 +277,9 @@ endif
 	$(hide) $(ACP) $(BOARD_FIRST_STAGE_LOADER) $(efi_root)/loader.efi
 	$(hide) $(ACP) $(BOARD_FIRST_STAGE_LOADER) $(efi_root)/EFI/BOOT/$(efi_default_name)
 	$(hide) echo "Android-IA=\\EFI\\BOOT\\$(efi_default_name)" > $(efi_root)/manifest.txt
+ifeq ($(BOARD_BOOTOPTION_FASTBOOT),true)
 	$(hide) echo "Fastboot=\\EFI\\BOOT\\$(efi_default_name);-f">> $(efi_root)/manifest.txt
+endif
 	$(hide) (cd $(efi_root) && zip -qry ../$(notdir $@) .)
 
 bootloader_info := $(intermediates)/bootloader_image_info.txt
diff --git a/celadon/AndroidBoard.mk b/celadon/AndroidBoard.mk
index 7a26436ce..c2bd18455 100644
--- a/celadon/AndroidBoard.mk
+++ b/celadon/AndroidBoard.mk
@@ -271,7 +271,9 @@ endif
 	$(hide) $(ACP) $(BOARD_FIRST_STAGE_LOADER) $(efi_root)/loader.efi
 	$(hide) $(ACP) $(BOARD_FIRST_STAGE_LOADER) $(efi_root)/EFI/BOOT/$(efi_default_name)
 	$(hide) echo "Android-IA=\\EFI\\BOOT\\$(efi_default_name)" > $(efi_root)/manifest.txt
+ifeq ($(BOARD_BOOTOPTION_FASTBOOT),true)
 	$(hide) echo "Fastboot=\\EFI\\BOOT\\$(efi_default_name);-f">> $(efi_root)/manifest.txt
+endif
 	$(hide) (cd $(efi_root) && zip -qry ../$(notdir $@) .)
 
 bootloader_info := $(intermediates)/bootloader_image_info.txt

From 7e2c69d9ce970d25a94660f04d156bc2451f19ec Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 14 Jun 2018 21:49:05 +0530
Subject: [PATCH 261/427] [CELADON] Mixinup "Gamepad Testcase fails in
 CtsHardwareTestCases"

Jira: None
Test: None
---
 cel_apl/ueventd.rc | 5 -----
 celadon/ueventd.rc | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/cel_apl/ueventd.rc b/cel_apl/ueventd.rc
index 8b3c30848..b8c000a5f 100644
--- a/cel_apl/ueventd.rc
+++ b/cel_apl/ueventd.rc
@@ -12,8 +12,6 @@
 # rfkill node
 /dev/rfkill 0660 bluetooth bluetooth
 
-#Bluedroid uhid support
-/dev/uhid                                    0660 bluetooth bluetooth
 /dev/ttyS*                                   0660   system     radio
 
 # NFCC node
@@ -51,9 +49,6 @@
 ##############################################################
 # Source: device/intel/mixins/groups/bluetooth/btusb/ueventd.rc
 ##############################################################
-#Bluedroid uhid support
-/dev/uhid                                    0660 bluetooth bluetooth
-
 # Bluetooth rfkill nodes
 /sys/devices/pci*/0000:00:*/usb*/*/*/*/bluetooth/hci0/rfkill* state  0660 bluetooth bluetooth
 /sys/devices/pci*/0000:00:*/usb*/*/*/*/bluetooth/hci0/rfkill* type   0440 bluetooth bluetooth
diff --git a/celadon/ueventd.rc b/celadon/ueventd.rc
index 8b3c30848..b8c000a5f 100644
--- a/celadon/ueventd.rc
+++ b/celadon/ueventd.rc
@@ -12,8 +12,6 @@
 # rfkill node
 /dev/rfkill 0660 bluetooth bluetooth
 
-#Bluedroid uhid support
-/dev/uhid                                    0660 bluetooth bluetooth
 /dev/ttyS*                                   0660   system     radio
 
 # NFCC node
@@ -51,9 +49,6 @@
 ##############################################################
 # Source: device/intel/mixins/groups/bluetooth/btusb/ueventd.rc
 ##############################################################
-#Bluedroid uhid support
-/dev/uhid                                    0660 bluetooth bluetooth
-
 # Bluetooth rfkill nodes
 /sys/devices/pci*/0000:00:*/usb*/*/*/*/bluetooth/hci0/rfkill* state  0660 bluetooth bluetooth
 /sys/devices/pci*/0000:00:*/usb*/*/*/*/bluetooth/hci0/rfkill* type   0440 bluetooth bluetooth

From 8a9a6960f26b6ce135092d74d996fd72d810850b Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 14 Jun 2018 21:52:41 +0530
Subject: [PATCH 262/427] [CELADON] Mixinup "Remove the tablet sepcific config
 from base"

Jira: None
Test: None
---
 cel_apl/device.mk | 3 ---
 celadon/device.mk | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 4a858ed51..400abe44d 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -46,9 +46,6 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/gpt.ini:root/gpt.$(TARGET_PRODUCT).ini \
     $(LOCAL_PATH)/init.recovery.rc:root/init.recovery.$(TARGET_PRODUCT).rc \
 
-PRODUCT_COPY_FILES += \
-	frameworks/native/data/etc/tablet_core_hardware.xml:system/etc/permissions/tablet_core_hardware.xml
-
 # Voip
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
diff --git a/celadon/device.mk b/celadon/device.mk
index b64763b52..1592f2ab4 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -46,9 +46,6 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/gpt.ini:root/gpt.$(TARGET_PRODUCT).ini \
     $(LOCAL_PATH)/init.recovery.rc:root/init.recovery.$(TARGET_PRODUCT).rc \
 
-PRODUCT_COPY_FILES += \
-	frameworks/native/data/etc/tablet_core_hardware.xml:system/etc/permissions/tablet_core_hardware.xml
-
 # Voip
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \

From 6f72f0aaebf9c95ce6513327f4e9d9a373aa6077 Mon Sep 17 00:00:00 2001
From: Chen Lin Z <lin.z.chen@intel.com>
Date: Thu, 31 May 2018 10:24:56 +0800
Subject: [PATCH 263/427] [CELADON] UP2 board enable

Change cpuset configuration from hard-coded into configure dynamically,
then cpuset feature can work on other hardware platform with different
cpu core numbers.

Jira: https://01.org/jira/browse/CEL-3
Test: Test it in UP2 board.

Signed-off-by: Chen Lin Z <lin.z.chen@intel.com>
---
 cel_apl/BoardConfig.mk |  4 ----
 cel_apl/init.rc        | 12 ++++++------
 cel_apl/mixins.spec    |  2 +-
 celadon/BoardConfig.mk |  4 ----
 celadon/init.rc        | 12 ++++++------
 celadon/mixins.spec    |  2 +-
 6 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index 1240b4366..a0e212776 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -392,10 +392,6 @@ TARGET_ARCH := x86
 TARGET_CPU_ABI := x86
 endif
 ##############################################################
-# Source: device/intel/mixins/groups/cpuset/4cores/BoardConfig.mk
-##############################################################
-ENABLE_CPUSETS := true
-##############################################################
 # Source: device/intel/mixins/groups/rfkill/true/BoardConfig.mk
 ##############################################################
 BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/rfkill
diff --git a/cel_apl/init.rc b/cel_apl/init.rc
index b241fbe25..d9e7c694a 100644
--- a/cel_apl/init.rc
+++ b/cel_apl/init.rc
@@ -537,14 +537,14 @@ on post-fs
     insmod /vendor/lib/modules/kernel/drivers/net/wireless/intel/iwlwifi/mvm/iwlmvm.ko
 
 ##############################################################
-# Source: device/intel/mixins/groups/cpuset/4cores/init.rc
+# Source: device/intel/mixins/groups/cpuset/autocores/init.rc
 ##############################################################
 on late-init
-    write /dev/cpuset/foreground/cpus 0-3
-    write /dev/cpuset/background/cpus 0-3
-    write /dev/cpuset/system-background/cpus 0-3
-    write /dev/cpuset/top-app/cpus 0-3
-    write /dev/cpuset/foreground/boost/cpus 0-3
+    copy /sys/devices/system/cpu/online /dev/cpuset/foreground/cpus
+    copy /sys/devices/system/cpu/online /dev/cpuset/background/cpus
+    copy /sys/devices/system/cpu/online /dev/cpuset/system-background/cpus
+    copy /sys/devices/system/cpu/online /dev/cpuset/top-app/cpus
+    copy /sys/devices/system/cpu/online /dev/cpuset/foreground/boost/cpus
 ##############################################################
 # Source: device/intel/mixins/groups/rfkill/true/init.rc
 ##############################################################
diff --git a/cel_apl/mixins.spec b/cel_apl/mixins.spec
index 23f541fbb..51c3bd25e 100644
--- a/cel_apl/mixins.spec
+++ b/cel_apl/mixins.spec
@@ -23,7 +23,7 @@ boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_tim
 audio: project-celadon
 wlan: iwlwifi
 cpu-arch: skl
-cpuset: 4cores
+cpuset: autocores
 rfkill: true(force_disable=)
 dexpreopt: enabled
 disk-bus: auto
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index 6b4c7813a..922f60bc4 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -386,10 +386,6 @@ TARGET_ARCH := x86
 TARGET_CPU_ABI := x86
 endif
 ##############################################################
-# Source: device/intel/mixins/groups/cpuset/4cores/BoardConfig.mk
-##############################################################
-ENABLE_CPUSETS := true
-##############################################################
 # Source: device/intel/mixins/groups/rfkill/true/BoardConfig.mk
 ##############################################################
 BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/rfkill
diff --git a/celadon/init.rc b/celadon/init.rc
index b241fbe25..d9e7c694a 100644
--- a/celadon/init.rc
+++ b/celadon/init.rc
@@ -537,14 +537,14 @@ on post-fs
     insmod /vendor/lib/modules/kernel/drivers/net/wireless/intel/iwlwifi/mvm/iwlmvm.ko
 
 ##############################################################
-# Source: device/intel/mixins/groups/cpuset/4cores/init.rc
+# Source: device/intel/mixins/groups/cpuset/autocores/init.rc
 ##############################################################
 on late-init
-    write /dev/cpuset/foreground/cpus 0-3
-    write /dev/cpuset/background/cpus 0-3
-    write /dev/cpuset/system-background/cpus 0-3
-    write /dev/cpuset/top-app/cpus 0-3
-    write /dev/cpuset/foreground/boost/cpus 0-3
+    copy /sys/devices/system/cpu/online /dev/cpuset/foreground/cpus
+    copy /sys/devices/system/cpu/online /dev/cpuset/background/cpus
+    copy /sys/devices/system/cpu/online /dev/cpuset/system-background/cpus
+    copy /sys/devices/system/cpu/online /dev/cpuset/top-app/cpus
+    copy /sys/devices/system/cpu/online /dev/cpuset/foreground/boost/cpus
 ##############################################################
 # Source: device/intel/mixins/groups/rfkill/true/init.rc
 ##############################################################
diff --git a/celadon/mixins.spec b/celadon/mixins.spec
index 572dac4cf..ff547085e 100644
--- a/celadon/mixins.spec
+++ b/celadon/mixins.spec
@@ -23,7 +23,7 @@ boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_tim
 audio: project-celadon
 wlan: iwlwifi
 cpu-arch: skl
-cpuset: 4cores
+cpuset: autocores
 rfkill: true(force_disable=)
 dexpreopt: enabled
 disk-bus: auto

From 967b6428e6b7a9582d04b16d40d20d64929f6379 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Fri, 22 Jun 2018 00:25:29 +0530
Subject: [PATCH 264/427] [CELADON] Mixinup "groups/kernel: Prefer readlink
 over abspath"

Jira: None
Test: None
---
 cel_apl/AndroidBoard.mk | 4 +++-
 celadon/AndroidBoard.mk | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cel_apl/AndroidBoard.mk b/cel_apl/AndroidBoard.mk
index e29d151c4..5344b7f27 100644
--- a/cel_apl/AndroidBoard.mk
+++ b/cel_apl/AndroidBoard.mk
@@ -45,6 +45,8 @@ KERNEL_MODULES_INSTALL := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules
 
 KERNELRELEASE = $(shell cat $(KERNEL_OUT)/include/config/kernel.release)
 
+KMOD_OUT := $(shell readlink -f "$(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)")
+
 build_kernel := $(MAKE) -C $(TARGET_KERNEL_SRC) \
 		O=$(KERNEL_OUT) \
 		ARCH=$(TARGET_KERNEL_ARCH) \
@@ -52,7 +54,7 @@ build_kernel := $(MAKE) -C $(TARGET_KERNEL_SRC) \
 		KCFLAGS="$(KERNEL_CFLAGS)" \
 		KAFLAGS="$(KERNEL_AFLAGS)" \
 		$(if $(SHOW_COMMANDS),V=1) \
-		INSTALL_MOD_PATH=$(abspath "$(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)")
+		INSTALL_MOD_PATH=$(KMOD_OUT)
 
 KERNEL_CONFIG_FILE := device/intel/project-celadon/kernel_config/$(TARGET_KERNEL_CONFIG)
 
diff --git a/celadon/AndroidBoard.mk b/celadon/AndroidBoard.mk
index c2bd18455..6b76acff2 100644
--- a/celadon/AndroidBoard.mk
+++ b/celadon/AndroidBoard.mk
@@ -39,6 +39,8 @@ KERNEL_MODULES_INSTALL := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules
 
 KERNELRELEASE = $(shell cat $(KERNEL_OUT)/include/config/kernel.release)
 
+KMOD_OUT := $(shell readlink -f "$(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)")
+
 build_kernel := $(MAKE) -C $(TARGET_KERNEL_SRC) \
 		O=$(KERNEL_OUT) \
 		ARCH=$(TARGET_KERNEL_ARCH) \
@@ -46,7 +48,7 @@ build_kernel := $(MAKE) -C $(TARGET_KERNEL_SRC) \
 		KCFLAGS="$(KERNEL_CFLAGS)" \
 		KAFLAGS="$(KERNEL_AFLAGS)" \
 		$(if $(SHOW_COMMANDS),V=1) \
-		INSTALL_MOD_PATH=$(abspath "$(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)")
+		INSTALL_MOD_PATH=$(KMOD_OUT)
 
 KERNEL_CONFIG_FILE := device/intel/project-celadon/kernel_config/$(TARGET_KERNEL_CONFIG)
 

From b7f2cc3592cbadec53e9c96f26dc8ec232734a61 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Tue, 26 Jun 2018 14:39:19 +0530
Subject: [PATCH 265/427] [CELADON] Mixinup "Trusty update"

Jira: None
Test: None
---
 cel_apl/BoardConfig.mk | 3 ++-
 cel_apl/init.rc        | 4 ++--
 celadon/BoardConfig.mk | 3 ++-
 celadon/init.rc        | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index a0e212776..09b39c3c8 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -439,10 +439,11 @@ LK_PRODUCT := project-celadon_64
 LKBUILD_TOOLCHAIN_ROOT = $(PWD)/vendor/intel/external/prebuilts/elf/
 LKBUILD_X86_TOOLCHAIN =
 LKBUILD_X64_TOOLCHAIN = $(LKBUILD_TOOLCHAIN_ROOT)x86_64-elf-4.9.1-Linux-x86_64/bin
+EVMMBUILD_TOOLCHAIN ?= x86_64-linux-android-
 TRUSTY_BUILDROOT = $(PWD)/$(PRODUCT_OUT)/obj/trusty/
 
 TRUSTY_ENV_VAR += LK_CORE_NUM=1
-TRUSTY_ENV_VAR += TARGET_PRODUCT=$(LK_PRODUCT)
+TRUSTY_ENV_VAR += TRUSTY_REF_TARGET=
 
 #for trusty lk
 TRUSTY_ENV_VAR += BUILDROOT=$(TRUSTY_BUILDROOT)
diff --git a/cel_apl/init.rc b/cel_apl/init.rc
index d9e7c694a..7bdeedbef 100644
--- a/cel_apl/init.rc
+++ b/cel_apl/init.rc
@@ -638,8 +638,8 @@ on post-fs-data
 
 service storageproxyd /vendor/bin/storageproxyd -d /dev/trusty-ipc-dev0 -p /data/misc/securestorage -r /dev/rpmb0
     class late_start
-    user root
-    group root
+    user system
+    group system
 
 ##############################################################
 # Source: device/intel/mixins/groups/debug-kernel/default/init.rc
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index 922f60bc4..a0732cc96 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -433,10 +433,11 @@ LK_PRODUCT := project-celadon_64
 LKBUILD_TOOLCHAIN_ROOT = $(PWD)/vendor/intel/external/prebuilts/elf/
 LKBUILD_X86_TOOLCHAIN =
 LKBUILD_X64_TOOLCHAIN = $(LKBUILD_TOOLCHAIN_ROOT)x86_64-elf-4.9.1-Linux-x86_64/bin
+EVMMBUILD_TOOLCHAIN ?= x86_64-linux-android-
 TRUSTY_BUILDROOT = $(PWD)/$(PRODUCT_OUT)/obj/trusty/
 
 TRUSTY_ENV_VAR += LK_CORE_NUM=1
-TRUSTY_ENV_VAR += TARGET_PRODUCT=$(LK_PRODUCT)
+TRUSTY_ENV_VAR += TRUSTY_REF_TARGET=
 
 #for trusty lk
 TRUSTY_ENV_VAR += BUILDROOT=$(TRUSTY_BUILDROOT)
diff --git a/celadon/init.rc b/celadon/init.rc
index d9e7c694a..7bdeedbef 100644
--- a/celadon/init.rc
+++ b/celadon/init.rc
@@ -638,8 +638,8 @@ on post-fs-data
 
 service storageproxyd /vendor/bin/storageproxyd -d /dev/trusty-ipc-dev0 -p /data/misc/securestorage -r /dev/rpmb0
     class late_start
-    user root
-    group root
+    user system
+    group system
 
 ##############################################################
 # Source: device/intel/mixins/groups/debug-kernel/default/init.rc

From b0c583cc4b92993d8cc7999573b4bbafadace60c Mon Sep 17 00:00:00 2001
From: swei22 <w.sheng@intel.com>
Date: Tue, 22 May 2018 16:48:08 +0800
Subject: [PATCH 266/427] trusty: set ref_target=project-celadon_64 for trusty

set ref_target=project-celadon_64 for trusty in celadon and cel_apl

Jira: None
Test: Device boots to home screen.

Signed-off-by: swei22 <w.sheng@intel.com>
---
 cel_apl/mixins.spec | 2 +-
 celadon/mixins.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cel_apl/mixins.spec b/cel_apl/mixins.spec
index 51c3bd25e..cc58b26af 100644
--- a/cel_apl/mixins.spec
+++ b/cel_apl/mixins.spec
@@ -40,7 +40,7 @@ debug-phonedoctor: true
 debug-tools: true
 flashfiles: ini(oemvars=false,version=3.0,fastboot_min_battery_level=3500,installer=true)
 midi: true
-trusty: true
+trusty: true(ref_target=project-celadon_64)
 slcan: default
 ioc-slcan-reboot: false
 camera: usbcamera
diff --git a/celadon/mixins.spec b/celadon/mixins.spec
index ff547085e..21b0d27dc 100644
--- a/celadon/mixins.spec
+++ b/celadon/mixins.spec
@@ -40,7 +40,7 @@ debug-phonedoctor: true
 debug-tools: true
 flashfiles: ini(oemvars=false,version=3.0,fastboot_min_battery_level=3500,installer=true)
 midi: true
-trusty: true
+trusty: true(ref_target=project-celadon_64)
 slcan: default
 ioc-slcan-reboot: false
 camera: usbcamera

From 83b1730493918f5d5f262634fc1a043eca5ce52f Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Tue, 26 Jun 2018 14:41:29 +0530
Subject: [PATCH 267/427] [CELADON] Mixinup "trusty: set ref_target=project
 -celadon_64 for trusty"

Jira: None
Test: None
---
 cel_apl/BoardConfig.mk | 2 +-
 celadon/BoardConfig.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index 09b39c3c8..de3e89b69 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -443,7 +443,7 @@ EVMMBUILD_TOOLCHAIN ?= x86_64-linux-android-
 TRUSTY_BUILDROOT = $(PWD)/$(PRODUCT_OUT)/obj/trusty/
 
 TRUSTY_ENV_VAR += LK_CORE_NUM=1
-TRUSTY_ENV_VAR += TRUSTY_REF_TARGET=
+TRUSTY_ENV_VAR += TRUSTY_REF_TARGET=project-celadon_64
 
 #for trusty lk
 TRUSTY_ENV_VAR += BUILDROOT=$(TRUSTY_BUILDROOT)
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index a0732cc96..b71408bb3 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -437,7 +437,7 @@ EVMMBUILD_TOOLCHAIN ?= x86_64-linux-android-
 TRUSTY_BUILDROOT = $(PWD)/$(PRODUCT_OUT)/obj/trusty/
 
 TRUSTY_ENV_VAR += LK_CORE_NUM=1
-TRUSTY_ENV_VAR += TRUSTY_REF_TARGET=
+TRUSTY_ENV_VAR += TRUSTY_REF_TARGET=project-celadon_64
 
 #for trusty lk
 TRUSTY_ENV_VAR += BUILDROOT=$(TRUSTY_BUILDROOT)

From 7aedf09f81f66ce14eda8f8c6142fd31feef9e5d Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 28 Jun 2018 10:09:30 +0530
Subject: [PATCH 268/427] [CELADON] Disable hwc-valsetup.sh script

Jira: None
Test: None

Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 celadon/hwc-valsetup.sh | 2 +-
 celadon/vendorsetup.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/celadon/hwc-valsetup.sh b/celadon/hwc-valsetup.sh
index 7a7356112..9246afa1c 100644
--- a/celadon/hwc-valsetup.sh
+++ b/celadon/hwc-valsetup.sh
@@ -1,5 +1,5 @@
 LOCAL_PATH="$(gettop)"
-HWCOMPOSER_PATH="$(find vendor -name hwcomposer*)"
+HWCOMPOSER_PATH="$(find vendor/intel/external -name hwcomposer*)"
 export HWCVAL_ROOT=$LOCAL_PATH/$HWCOMPOSER_PATH/tests/hwc-val/tests/hwc
 export VAL_HWC_TOP="`( cd "$HWCVAL_ROOT/../.." && pwd)`"
 export PATH=$HWCVAL_ROOT/host_scripts:$HWCVAL_ROOT/tools:$PATH
diff --git a/celadon/vendorsetup.sh b/celadon/vendorsetup.sh
index f667bec87..8d1de0bcf 100644
--- a/celadon/vendorsetup.sh
+++ b/celadon/vendorsetup.sh
@@ -3,4 +3,4 @@ add_lunch_combo celadon-userdebug
 add_lunch_combo celadon-user
 
 
-. $('gettop')/device/intel/project-celadon/celadon/hwc-valsetup.sh
+#. $('gettop')/device/intel/project-celadon/celadon/hwc-valsetup.sh

From 019791707876b7b5e310cf2a495e6dbb51b91f47 Mon Sep 17 00:00:00 2001
From: "Yan, WalterX" <walterx.yan@intel.com>
Date: Thu, 21 Jun 2018 17:34:04 +0800
Subject: [PATCH 269/427] Move the round icon config into tablet config.

This config is not suitable for IVI.
Move it to tablet config.

Jira: OAM-65700
Test: Run the cases in OAM-65700
Signed-off-by: Yan, Walter <walterx.yan@intel.com>
---
 common/overlay/frameworks/base/core/res/res/values/config.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/common/overlay/frameworks/base/core/res/res/values/config.xml b/common/overlay/frameworks/base/core/res/res/values/config.xml
index 1c224bf8c..009ab4a8b 100644
--- a/common/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/common/overlay/frameworks/base/core/res/res/values/config.xml
@@ -82,8 +82,6 @@
     -->
     <bool name="config_enableWifiDisplay">true</bool>
 
-    <!-- Flag indicating whether round icons should be parsed from the application manifest. -->
-    <bool name="config_useRoundIcon">true</bool>
     <string-array translatable="false" name="config_globalActionsList">
         <item>power</item>
         <item>restart</item>

From 9799ba886a47da660ef434346be83742fcbd3e8d Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 28 Jun 2018 23:42:42 +0530
Subject: [PATCH 270/427] [CELADON] MixinUp Set default sound for ringtone,
 alarm and notification. #26

Jira: None
Test: None
---
 cel_apl/device.mk | 13 +++++++++----
 celadon/device.mk | 19 +++++++++----------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 400abe44d..da0f115f3 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -17,15 +17,20 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.dalvik.vm.native.bridge=libhoudini.so
 
 PRODUCT_TAGS += dalvik.gc.type-precise
 
-PRODUCT_AAPT_CONFIG := normal large xlarge mdpi hdpi xhdpi xxhdpi
-PRODUCT_AAPT_PREF_CONFIG := xxhdpi
-
 DEVICE_PACKAGE_OVERLAYS += device/intel/project-celadon/common/overlay
 
 PRODUCT_PACKAGES += $(THIRD_PARTY_APPS)
 
 PRODUCT_PACKAGES += fio
 
+# Set default sounds
+# Note: As the override mechanism, must make sure this config 
+# being in front of generic_no_telephony.mk(defined the aosp sound config) 
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.config.notification_sound=Xenon.ogg \
+    ro.config.alarm_alert=Cesium.ogg \
+    ro.config.ringtone=Sceptrum.ogg \
+
 # Get a list of languages.
 $(call inherit-product,$(SRC_TARGET_DIR)/product/locales_full.mk)
 
@@ -272,7 +277,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 ##############################################################
 # Source: device/intel/mixins/groups/display-density/default/product.mk
 ##############################################################
-PRODUCT_AAPT_CONFIG := normal
+PRODUCT_AAPT_CONFIG := normal large mdpi
 PRODUCT_AAPT_PREF_CONFIG := mdpi
 
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.sf.lcd_density=160
diff --git a/celadon/device.mk b/celadon/device.mk
index 1592f2ab4..6a4b70177 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -17,15 +17,20 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.dalvik.vm.native.bridge=libhoudini.so
 
 PRODUCT_TAGS += dalvik.gc.type-precise
 
-PRODUCT_AAPT_CONFIG := normal large xlarge mdpi hdpi xhdpi xxhdpi
-PRODUCT_AAPT_PREF_CONFIG := xxhdpi
-
 DEVICE_PACKAGE_OVERLAYS += device/intel/project-celadon/common/overlay
 
 PRODUCT_PACKAGES += $(THIRD_PARTY_APPS)
 
 PRODUCT_PACKAGES += fio
 
+# Set default sounds
+# Note: As the override mechanism, must make sure this config 
+# being in front of generic_no_telephony.mk(defined the aosp sound config) 
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.config.notification_sound=Xenon.ogg \
+    ro.config.alarm_alert=Cesium.ogg \
+    ro.config.ringtone=Sceptrum.ogg \
+
 # Get a list of languages.
 $(call inherit-product,$(SRC_TARGET_DIR)/product/locales_full.mk)
 
@@ -240,12 +245,6 @@ $(call inherit-product,frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-hea
 PRODUCT_COPY_FILES += \
         frameworks/native/data/etc/tablet_core_hardware.xml:system/etc/permissions/tablet_core_hardware.xml
 
-PRODUCT_AAPT_CONFIG := normal large xlarge mdpi hdpi xhdpi
-PRODUCT_AAPT_PREF_CONFIG :=
-
-PRODUCT_PROPERTY_OVERRIDES += \
-   ro.sf.lcd_density=160
-
 
 ##############################################################
 # Source: device/intel/mixins/groups/ethernet/dhcp/product.mk
@@ -260,7 +259,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 ##############################################################
 # Source: device/intel/mixins/groups/display-density/default/product.mk
 ##############################################################
-PRODUCT_AAPT_CONFIG := normal
+PRODUCT_AAPT_CONFIG := normal large mdpi
 PRODUCT_AAPT_PREF_CONFIG := mdpi
 
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.sf.lcd_density=160

From 3197ab82e609a2d74003af4602bc93be015a8b62 Mon Sep 17 00:00:00 2001
From: "ji, zhenlong z" <zhenlong.z.ji@intel.com>
Date: Fri, 29 Jun 2018 09:15:13 +0800
Subject: [PATCH 271/427] SELinux: grant app map permission for app_fuse_file

This is used to resolve the issue that images on other
android devices in MTP initiator role cannot be opened.

Jira: None.
Test: images on other android devices in MTP initiator
role can be opened.

Signed-off-by: ji, zhenlong z <zhenlong.z.ji@intel.com>
---
 sepolicy/graphics/project-celadon/appdomain.te | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sepolicy/graphics/project-celadon/appdomain.te b/sepolicy/graphics/project-celadon/appdomain.te
index be5eb35b9..fe7d3d296 100644
--- a/sepolicy/graphics/project-celadon/appdomain.te
+++ b/sepolicy/graphics/project-celadon/appdomain.te
@@ -4,3 +4,4 @@ allow appdomain hal_graphics_allocator_default_tmpfs:file { read write map };
 allow appdomain hal_graphics_composer_default_tmpfs:file { read write map };
 allow appdomain gpu_device:dir r_dir_perms;
 allow appdomain sysfs_app_readable:file r_file_perms;
+allow appdomain app_fuse_file:file map;

From f140a464aa66e9fbe8d04346d8d69be854e01ddf Mon Sep 17 00:00:00 2001
From: Umesh Agarwal <umeshx.agarwal@intel.com>
Date: Mon, 2 Jul 2018 12:26:36 +0530
Subject: [PATCH 272/427] Summary: - Set ivi flag true for car(cel_apl).

Description:
- Need to maintain seperate bluetooth configuration header
  file (bdroid_buildcfg.h) based on device (car or tablet)
- To decide device-type at compile time, used one flag
  "ivi" with default value "false" and it will be "true"
  only in case of device type "car".
- To make its value "true" for car, set its value to "true"
  in mixins.spec present under cel_apl.

Jira: https://jira01.devtools.intel.com/browse/OAM-65576

Test:
- For cel_apl build,it should refer to bluetooth header file
  selected for car - PASS
- BT AVRCP should work, user shouble be able to control music
  from Bluetooth Audio App on kabylake IVI - PASS

Signed-off-by: Umesh Agarwal <umeshx.agarwal@intel.com>
---
 cel_apl/mixins.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cel_apl/mixins.spec b/cel_apl/mixins.spec
index cc58b26af..22329c2d0 100644
--- a/cel_apl/mixins.spec
+++ b/cel_apl/mixins.spec
@@ -18,7 +18,7 @@ display-density: default
 usb-gadget: g_ffs
 adb_net: true
 kernel: project-celadon(loglevel=3, disable_cpuidle_on_boot=true)
-bluetooth: btusb
+bluetooth: btusb (ivi=true)
 boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true)
 audio: project-celadon
 wlan: iwlwifi

From 9cdb835af165d11f1a0d8493b485a54e04b500b5 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Thu, 5 Jul 2018 11:33:28 +0530
Subject: [PATCH 273/427] [MIXINUP] Enabling Wi-Fi Hostspot & Tethering 
 Selection of Bluetooth Build Config header  file based on device-type (car or
 tablet)

Jira: None
Test: None
---
 cel_apl/BoardConfig.mk | 4 +++-
 celadon/BoardConfig.mk | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index de3e89b69..4a59ba743 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -116,10 +116,11 @@ BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/kernel
 ##############################################################
 BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_LINUX := true
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/intel/common/bluetooth/bcm43241/
 DEVICE_PACKAGE_OVERLAYS += device/intel/common/bluetooth/overlay-bt-pan
 BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/bluetooth/common \
                        device/intel/project-celadon/sepolicy/bluetooth/intel
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/intel/common/bluetooth/intel/car/
+
 ##############################################################
 # Source: device/intel/mixins/groups/disk-bus/auto/BoardConfig.mk
 ##############################################################
@@ -369,6 +370,7 @@ endif
 DEVICE_PACKAGE_OVERLAYS += device/intel/common/wlan/overlay-miracast-go
 DEVICE_PACKAGE_OVERLAYS += device/intel/common/wlan/overlay-p2p-connected-stop-scan
 DEVICE_PACKAGE_OVERLAYS += device/intel/common/wlan/overlay-miracast-force-single-ch
+DEVICE_PACKAGE_OVERLAYS += device/intel/common/wlan/overlay-wifi-tethering
 
 #BOARD_SEPOLICY_DIRS += #device/intel/sepolicy/wlan/load_iwlwifi
 
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index b71408bb3..7d9a3cb23 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -110,10 +110,11 @@ BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/kernel
 ##############################################################
 BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_LINUX := true
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/intel/common/bluetooth/bcm43241/
 DEVICE_PACKAGE_OVERLAYS += device/intel/common/bluetooth/overlay-bt-pan
 BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/bluetooth/common \
                        device/intel/project-celadon/sepolicy/bluetooth/intel
+
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/intel/common/bluetooth/intel/tablet/
 ##############################################################
 # Source: device/intel/mixins/groups/disk-bus/auto/BoardConfig.mk
 ##############################################################
@@ -363,6 +364,7 @@ endif
 DEVICE_PACKAGE_OVERLAYS += device/intel/common/wlan/overlay-miracast-go
 DEVICE_PACKAGE_OVERLAYS += device/intel/common/wlan/overlay-p2p-connected-stop-scan
 DEVICE_PACKAGE_OVERLAYS += device/intel/common/wlan/overlay-miracast-force-single-ch
+DEVICE_PACKAGE_OVERLAYS += device/intel/common/wlan/overlay-wifi-tethering
 
 #BOARD_SEPOLICY_DIRS += #device/intel/sepolicy/wlan/load_iwlwifi
 

From c5066308407ff484a5b25ffdcf1a6ce477b48d5f Mon Sep 17 00:00:00 2001
From: ops <ramya.v.naidu@intel.com>
Date: Thu, 5 Jul 2018 02:55:43 -0400
Subject: [PATCH 274/427] Updating kernel configuration to 4.14.52

Jira: None
Test: None
Signed-off-by: rnaidu <ramya.v.naidu@intel.com>
---
 kernel_config/kernel_64_defconfig | 136 +++++++++++++++++++++---------
 1 file changed, 97 insertions(+), 39 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 482685a5a..0c66ba1f7 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.14.0 Kernel Configuration
+# Linux/x86_64 4.14.52 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -151,21 +151,21 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_CGROUPS=y
-CONFIG_CGROUP_DEBUG=y
-CONFIG_CGROUP_FREEZER=y
-# CONFIG_CGROUP_PIDS is not set
-# CONFIG_CGROUP_DEVICE is not set
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_CPUACCT=y
 # CONFIG_MEMCG is not set
 # CONFIG_BLK_CGROUP is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_CFS_BANDWIDTH is not set
 CONFIG_RT_GROUP_SCHED=y
+# CONFIG_CGROUP_PIDS is not set
 # CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+# CONFIG_CGROUP_DEVICE is not set
+CONFIG_CGROUP_CPUACCT=y
 # CONFIG_CGROUP_PERF is not set
+CONFIG_CGROUP_DEBUG=y
 # CONFIG_SOCK_CGROUP_DATA is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_NAMESPACES=y
@@ -292,6 +292,8 @@ CONFIG_CC_STACKPROTECTOR=y
 # CONFIG_CC_STACKPROTECTOR_REGULAR is not set
 CONFIG_CC_STACKPROTECTOR_STRONG=y
 CONFIG_THIN_ARCHIVES=y
+# CONFIG_LTO is not set
+CONFIG_LTO_NONE=y
 CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
@@ -325,6 +327,7 @@ CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
 CONFIG_STRICT_KERNEL_RWX=y
 CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
 CONFIG_STRICT_MODULE_RWX=y
+CONFIG_ARCH_HAS_REFCOUNT=y
 # CONFIG_REFCOUNT_FULL is not set
 
 #
@@ -426,6 +429,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y
 # CONFIG_X86_X2APIC is not set
 CONFIG_X86_MPPARSE=y
 # CONFIG_GOLDFISH is not set
+CONFIG_RETPOLINE=y
 # CONFIG_INTEL_RDT is not set
 CONFIG_X86_EXTENDED_PLATFORM=y
 # CONFIG_X86_VSMP is not set
@@ -441,6 +445,7 @@ CONFIG_HYPERVISOR_GUEST=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_DEBUG is not set
 # CONFIG_PARAVIRT_SPINLOCKS is not set
+# CONFIG_ACRN is not set
 # CONFIG_XEN is not set
 CONFIG_KVM_GUEST=y
 # CONFIG_KVM_DEBUG_FS is not set
@@ -693,21 +698,18 @@ CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_GOV_ATTR_SET=y
 CONFIG_CPU_FREQ_GOV_COMMON=y
 CONFIG_CPU_FREQ_STAT=y
+# CONFIG_CPU_FREQ_TIMES is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHED is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-# CONFIG_CPU_FREQ_GOV_SCHED is not set
-CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
 # CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set
 
 #
@@ -826,6 +828,7 @@ CONFIG_PCCARD_NONSTATIC=y
 CONFIG_BINFMT_ELF=y
 CONFIG_COMPAT_BINFMT_ELF=y
 CONFIG_ELFCORE=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
 # CONFIG_HAVE_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
@@ -1180,6 +1183,7 @@ CONFIG_NET_SCH_HTB=y
 # CONFIG_NET_SCH_SFQ is not set
 # CONFIG_NET_SCH_TEQL is not set
 # CONFIG_NET_SCH_TBF is not set
+# CONFIG_NET_SCH_CBS is not set
 # CONFIG_NET_SCH_GRED is not set
 # CONFIG_NET_SCH_DSMARK is not set
 # CONFIG_NET_SCH_NETEM is not set
@@ -1400,6 +1404,7 @@ CONFIG_DEV_COREDUMP=y
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPI=y
@@ -1486,7 +1491,6 @@ CONFIG_MTD_CFI_I2=y
 # Disk-On-Chip Device Drivers
 #
 # CONFIG_MTD_DOCG3 is not set
-CONFIG_MTD_NAND_IDS=m
 CONFIG_MTD_NAND_ECC=m
 # CONFIG_MTD_NAND_ECC_SMC is not set
 CONFIG_MTD_NAND=m
@@ -1602,6 +1606,7 @@ CONFIG_VIRTIO_BLK=y
 CONFIG_NVME_CORE=y
 CONFIG_BLK_DEV_NVME=y
 
+# CONFIG_NVME_FC is not set
 # CONFIG_NVME_TARGET is not set
 
 #
@@ -1990,6 +1995,7 @@ CONFIG_DM_VERITY_FEC=y
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
 # CONFIG_DM_INTEGRITY is not set
+# CONFIG_DM_ANDROID_VERITY_AT_MOST_ONCE_DEFAULT_ENABLED is not set
 # CONFIG_TARGET_CORE is not set
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=y
@@ -2186,7 +2192,6 @@ CONFIG_MLX5_CORE=m
 # CONFIG_MLX5_FPGA is not set
 CONFIG_MLX5_CORE_EN=y
 CONFIG_MLX5_MPFS=y
-CONFIG_MLX5_ESWITCH=y
 # CONFIG_MLX5_CORE_IPOIB is not set
 CONFIG_MLXSW_CORE=m
 CONFIG_MLXSW_CORE_HWMON=y
@@ -2991,6 +2996,7 @@ CONFIG_LEGACY_PTY_COUNT=32
 # CONFIG_NOZOMI is not set
 # CONFIG_N_GSM is not set
 # CONFIG_TRACE_SINK is not set
+# CONFIG_CBC_LDISC is not set
 # CONFIG_DEVMEM is not set
 # CONFIG_DEVKMEM is not set
 
@@ -3318,6 +3324,7 @@ CONFIG_GPIO_ARIZONA=m
 CONFIG_GPIO_CRYSTAL_COVE=y
 # CONFIG_GPIO_TPS65218 is not set
 CONFIG_GPIO_UCB1400=m
+# CONFIG_GPIO_WHISKEY_COVE is not set
 
 #
 # PCI GPIO expanders
@@ -3557,6 +3564,7 @@ CONFIG_INTEL_SOC_DTS_THERMAL=m
 CONFIG_INT340X_THERMAL=m
 CONFIG_ACPI_THERMAL_REL=m
 # CONFIG_INT3406_THERMAL is not set
+# CONFIG_INTEL_BXT_PMIC_THERMAL is not set
 CONFIG_INTEL_PCH_THERMAL=m
 # CONFIG_GENERIC_ADC_THERMAL is not set
 
@@ -4070,6 +4078,9 @@ CONFIG_VIDEO_MEYE=m
 # CONFIG_VIDEO_TW68 is not set
 # CONFIG_VIDEO_TW686X is not set
 # CONFIG_VIDEO_ZORAN is not set
+# CONFIG_VIDEO_INTEL_IPU is not set
+# CONFIG_VIDEO_INTEL_IPU_FW_LIB is not set
+# CONFIG_VIDEO_INTEL_UOS is not set
 
 #
 # Media capture/analog TV support
@@ -4130,9 +4141,20 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_CAFE_CCIC=m
 CONFIG_VIDEO_VIA_CAMERA=m
 # CONFIG_VIDEO_MUX is not set
+# CONFIG_VIDEO_AGGREGATOR_STUB is not set
+# CONFIG_VIDEO_IRIS is not set
 CONFIG_SOC_CAMERA=m
 CONFIG_SOC_CAMERA_PLATFORM=m
 # CONFIG_VIDEO_XILINX is not set
+# CONFIG_INTEL_IPU4_AR023Z is not set
+# CONFIG_INTEL_IPU4_OV13860 is not set
+# CONFIG_INTEL_IPU4_OV9281 is not set
+# CONFIG_INTEL_IPU4_OV10635 is not set
+# CONFIG_INTEL_IPU4_AR0231AT is not set
+# CONFIG_INTEL_IPU4_OV10640 is not set
+# CONFIG_INTEL_IPU4_ADV7481 is not set
+CONFIG_INTEL_IPU4_ADV7481_I2C_ID=0
+# CONFIG_INTEL_IPU4_ADV7481_EVAL is not set
 # CONFIG_V4L_MEM2MEM_DRIVERS is not set
 CONFIG_V4L_TEST_DRIVERS=y
 # CONFIG_VIDEO_VIMC is not set
@@ -4141,6 +4163,9 @@ CONFIG_VIDEO_VIVID=m
 CONFIG_VIDEO_VIVID_MAX_DEVS=2
 # CONFIG_VIDEO_VIM2M is not set
 # CONFIG_DVB_PLATFORM_DRIVERS is not set
+# CONFIG_VIDEO_SENSOR_STUB is not set
+# CONFIG_I2C_ADAPTER_STUB is not set
+# CONFIG_VIDEO_SENSOR_STUB_PDATA is not set
 
 #
 # Supported MMC/SDIO adapters
@@ -4280,6 +4305,7 @@ CONFIG_VIDEO_APTINA_PLL=m
 CONFIG_VIDEO_OV7670=m
 # CONFIG_VIDEO_OV9650 is not set
 # CONFIG_VIDEO_OV13858 is not set
+# CONFIG_VIDEO_MAX9286 is not set
 CONFIG_VIDEO_VS6624=m
 CONFIG_VIDEO_MT9M032=m
 CONFIG_VIDEO_MT9M111=m
@@ -4296,6 +4322,8 @@ CONFIG_VIDEO_S5K4ECGX=m
 # CONFIG_VIDEO_S5K5BAF is not set
 # CONFIG_VIDEO_SMIAPP is not set
 # CONFIG_VIDEO_ET8EK8 is not set
+# CONFIG_VIDEO_CRLMODULE is not set
+# CONFIG_VIDEO_LC898122 is not set
 # CONFIG_VIDEO_S5C73M3 is not set
 
 #
@@ -4346,6 +4374,12 @@ CONFIG_SOC_CAMERA_OV9640=m
 CONFIG_SOC_CAMERA_OV9740=m
 CONFIG_SOC_CAMERA_RJ54N1=m
 CONFIG_SOC_CAMERA_TW9910=m
+# CONFIG_VIDEO_LM3643 is not set
+# CONFIG_VIDEO_BU64295 is not set
+# CONFIG_VIDEO_AD5816G is not set
+# CONFIG_VIDEO_VCM_STUB is not set
+# CONFIG_VIDEO_TI964 is not set
+# CONFIG_VIDEO_AS3638 is not set
 
 #
 # SPI helper chips
@@ -4604,6 +4638,7 @@ CONFIG_DRM_I915_CAPTURE_ERROR=y
 CONFIG_DRM_I915_COMPRESS_ERROR=y
 CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_I915_GVT is not set
+# CONFIG_DRM_I915_LOAD_ASYNC_SUPPORT is not set
 
 #
 # drm/i915 Debugging
@@ -4997,6 +5032,7 @@ CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 CONFIG_SND_SOC_COMPRESS=y
 CONFIG_SND_SOC_TOPOLOGY=y
+CONFIG_SND_SOC_ACPI=m
 # CONFIG_SND_SOC_AMD_ACP is not set
 CONFIG_SND_ATMEL_SOC=m
 CONFIG_SND_DESIGNWARE_I2S=m
@@ -5017,18 +5053,20 @@ CONFIG_SND_DESIGNWARE_I2S=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_I2S_HI6210_I2S is not set
 # CONFIG_SND_SOC_IMG is not set
-CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
+CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
 CONFIG_SND_SST_IPC=m
 CONFIG_SND_SST_IPC_ACPI=m
+CONFIG_SND_SOC_INTEL_SST_ACPI=m
 CONFIG_SND_SOC_INTEL_SST=m
 CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m
-CONFIG_SND_SOC_INTEL_SST_ACPI=m
-CONFIG_SND_SOC_INTEL_SST_MATCH=m
 CONFIG_SND_SOC_INTEL_HASWELL=m
+# CONFIG_SND_SOC_INTEL_BAYTRAIL is not set
+# CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI is not set
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
+CONFIG_SND_SOC_INTEL_SKYLAKE=m
+CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
+CONFIG_SND_SOC_INTEL_MACH=y
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
-# CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXT_TDF8532_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
@@ -5039,18 +5077,28 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 # CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH is not set
 # CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH is not set
 # CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set
-# CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH is not set
-# CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH is not set
-CONFIG_SND_SOC_INTEL_SKYLAKE=m
 CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
 # CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH is not set
 # CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH is not set
+# CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set
+# CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set
+# CONFIG_SND_SOC_INTEL_BXT_TDF8532_MACH is not set
+# CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH is not set
+# CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH is not set
 # CONFIG_SND_SOC_INTEL_CNL_FPGA is not set
 # CONFIG_SND_SOC_INTEL_CNL_CS42L42_MACH is not set
 # CONFIG_SND_SOC_INTEL_CNL_RT700_MACH is not set
 # CONFIG_SND_SOC_INTEL_CNL_SVFPGA_MACH is not set
 # CONFIG_SND_SOC_INTEL_CNL_RT274_MACH is not set
 # CONFIG_SND_SOC_SDW_AGGM1M2 is not set
+# CONFIG_SND_SOC_INTEL_BXT_ULL_MACH is not set
+# CONFIG_SND_SOC_INTEL_BXTP_IVI_RSE_MACH is not set
+# CONFIG_SND_SOC_INTEL_BXTP_IVI_HU_MACH is not set
+# CONFIG_SND_SOC_INTEL_BXTP_IVI_M3_MACH is not set
+# CONFIG_SND_SOC_INTEL_BXTP_IVI_GENERIC_MACH is not set
+CONFIG_SND_SOC_SOF=m
+# CONFIG_SND_SOC_SOF_NOCODEC is not set
+# CONFIG_SND_SOC_SOF_INTEL is not set
 
 #
 # STMicroelectronics STM32 SOC audio support
@@ -5317,6 +5365,7 @@ CONFIG_I2C_HID=m
 # Intel ISH HID support
 #
 # CONFIG_INTEL_ISH_HID is not set
+# CONFIG_INTEL_ISH_UART_INTERFACE is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
@@ -5626,6 +5675,7 @@ CONFIG_TYPEC_UCSI=y
 # CONFIG_UCSI_ACPI is not set
 # CONFIG_USB_LED_TRIG is not set
 # CONFIG_USB_ULPI_BUS is not set
+# CONFIG_USB_ROLE_SWITCH is not set
 # CONFIG_UWB is not set
 CONFIG_MMC=y
 CONFIG_PWRSEQ_EMMC=y
@@ -5637,7 +5687,6 @@ CONFIG_SDIO_UART=m
 # CONFIG_MMC_TEST is not set
 # CONFIG_MMC_EMBEDDED_SDIO is not set
 # CONFIG_MMC_PARANOID_SD_INIT is not set
-# CONFIG_MMC_SIMULATE_MAX_SPEED is not set
 
 #
 # MMC/SD/SDIO Host Controller Drivers
@@ -5910,6 +5959,13 @@ CONFIG_DMA_ENGINE_RAID=y
 #
 CONFIG_SYNC_FILE=y
 CONFIG_SW_SYNC=y
+
+#
+# hyper_dmabuf options
+#
+CONFIG_HYPER_DMABUF=y
+CONFIG_HYPER_DMABUF_SYSFS=y
+# CONFIG_HYPER_DMABUF_EVENT_GEN is not set
 CONFIG_DCA=m
 # CONFIG_AUXDISPLAY is not set
 CONFIG_CHARLCD=m
@@ -5940,6 +5996,7 @@ CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_MMIO=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+# CONFIG_ACRN_VIRTIO_DEVICES is not set
 
 #
 # Microsoft Hyper-V guest support
@@ -6072,11 +6129,15 @@ CONFIG_ASHMEM=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
 CONFIG_SYNC=y
+# CONFIG_ANDROID_FWDATA is not set
+# CONFIG_ANDROID_VSOC is not set
 CONFIG_ION=y
 # CONFIG_ION_SYSTEM_HEAP is not set
 # CONFIG_ION_CARVEOUT_HEAP is not set
 # CONFIG_ION_CHUNK_HEAP is not set
 # CONFIG_ABL_BOOTLOADER_CONTROL is not set
+# CONFIG_SBL_BOOTLOADER_CONTROL is not set
+# CONFIG_VSBL_BOOTLOADER_CONTROL is not set
 # CONFIG_FIQ_WATCHDOG is not set
 # CONFIG_STAGING_BOARD is not set
 # CONFIG_LTE_GDM724X is not set
@@ -6164,6 +6225,7 @@ CONFIG_INTEL_RST=m
 CONFIG_INTEL_SMARTCONNECT=m
 CONFIG_PVPANIC=m
 CONFIG_INTEL_PMC_IPC=y
+# CONFIG_INTEL_BXTWC_PMIC_TMU is not set
 CONFIG_SURFACE_PRO3_BUTTON=m
 # CONFIG_SURFACE_3_BUTTON is not set
 CONFIG_INTEL_PUNIT_IPC=y
@@ -6288,8 +6350,6 @@ CONFIG_EXTCON_RT8973A=m
 CONFIG_EXTCON_SM5502=m
 CONFIG_EXTCON_USB_GPIO=m
 # CONFIG_EXTCON_USBC_CROS_EC is not set
-# CONFIG_EXTCON_INTEL_USB is not set
-CONFIG_EXTCON_INTEL_USB=y
 # CONFIG_MEMORY is not set
 CONFIG_IIO=m
 CONFIG_IIO_BUFFER=y
@@ -6811,10 +6871,6 @@ CONFIG_BTRFS_FS=m
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_NILFS2_FS is not set
 # CONFIG_F2FS_FS is not set
-# CONFIG_F2FS_STAT_FS is not set
-# CONFIG_F2FS_FS_XATTR is not set
-# CONFIG_F2FS_FS_POSIX_ACL is not set
-# CONFIG_F2FS_FS_SECURITY is not set
 # CONFIG_FS_DAX is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=m
@@ -6873,6 +6929,7 @@ CONFIG_PROC_KCORE=y
 CONFIG_PROC_SYSCTL=y
 CONFIG_PROC_PAGE_MONITOR=y
 # CONFIG_PROC_CHILDREN is not set
+CONFIG_PROC_UID=y
 CONFIG_KERNFS=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
@@ -6897,8 +6954,6 @@ CONFIG_SDCARD_FS=y
 # CONFIG_UBIFS_FS is not set
 # CONFIG_CRAMFS is not set
 CONFIG_SQUASHFS=y
-# CONFIG_SQUASHFS_FILE_CACHE is not set
-CONFIG_SQUASHFS_FILE_DIRECT=y
 # CONFIG_SQUASHFS_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
@@ -6941,6 +6996,8 @@ CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_SUNRPC_DEBUG is not set
 # CONFIG_CEPH_FS is not set
 CONFIG_CIFS=m
@@ -7038,8 +7095,7 @@ CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_STACK_VALIDATION is not set
+CONFIG_STACK_VALIDATION=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
@@ -7069,7 +7125,6 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
 CONFIG_HAVE_ARCH_KASAN=y
 # CONFIG_KASAN is not set
 CONFIG_ARCH_HAS_KCOV=y
@@ -7095,7 +7150,6 @@ CONFIG_PANIC_ON_OOPS_VALUE=1
 CONFIG_PANIC_TIMEOUT=5
 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHED_INFO=y
-# CONFIG_PANIC_ON_RT_THROTTLING is not set
 CONFIG_SCHEDSTATS=y
 # CONFIG_SCHED_STACK_END_CHECK is not set
 # CONFIG_DEBUG_TIMEKEEPING is not set
@@ -7162,6 +7216,7 @@ CONFIG_TRACING_SUPPORT=y
 CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
 CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_PREEMPT_TRACER is not set
 # CONFIG_SCHED_TRACER is not set
@@ -7255,9 +7310,9 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DEBUG_NMI_SELFTEST is not set
 CONFIG_X86_DEBUG_FPU=y
 # CONFIG_PUNIT_ATOM_DEBUG is not set
-CONFIG_FRAME_POINTER_UNWINDER=y
-# CONFIG_ORC_UNWINDER is not set
-# CONFIG_GUESS_UNWINDER is not set
+CONFIG_UNWINDER_ORC=y
+# CONFIG_UNWINDER_FRAME_POINTER is not set
+# CONFIG_UNWINDER_GUESS is not set
 
 #
 # Security options
@@ -7274,6 +7329,7 @@ CONFIG_SECURITY=y
 CONFIG_SECURITY_WRITABLE_HOOKS=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
+CONFIG_PAGE_TABLE_ISOLATION=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
 CONFIG_SECURITY_PATH=y
 CONFIG_LSM_MMAP_MIN_ADDR=65536
@@ -7322,6 +7378,7 @@ CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_AKCIPHER2=y
 CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
+CONFIG_CRYPTO_KPP=m
 CONFIG_CRYPTO_ACOMP2=y
 CONFIG_CRYPTO_RSA=y
 # CONFIG_CRYPTO_DH is not set
@@ -7438,6 +7495,7 @@ CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
 CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
 CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
+# CONFIG_CRYPTO_SPECK is not set
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=y
 CONFIG_CRYPTO_TWOFISH_COMMON=y

From 722f319f7d453871fbe7d28f5ed39e0bbbd42d44 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Mon, 9 Jul 2018 14:09:24 +0530
Subject: [PATCH 275/427] [MIXINUP] Fix the bug about tos.img not found when
 build vbmeta.img

Jira: None
Test: None
---
 cel_apl/AndroidBoard.mk | 2 +-
 celadon/AndroidBoard.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cel_apl/AndroidBoard.mk b/cel_apl/AndroidBoard.mk
index 5344b7f27..b4fd9123d 100644
--- a/cel_apl/AndroidBoard.mk
+++ b/cel_apl/AndroidBoard.mk
@@ -472,7 +472,7 @@ $(INSTALLED_TOS_IMAGE_TARGET): $(TOS_IMAGE_TARGET) $(MKBOOTIMG) $(AVBTOOL)
 		--partition_size $(BOARD_TOSIMAGE_PARTITION_SIZE) \
 		--partition_name tos $(INTERNAL_AVB_SIGNING_ARGS)
 BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --include_descriptors_from_image $(INSTALLED_TOS_IMAGE_TARGET)
-$(INSTALLED_VBMETAIMAGE_TARGET): $(INSTALLED_TOS_IMAGE_TARGET)
+$(PRODUCT_OUT)/vbmeta.img: $(INSTALLED_TOS_IMAGE_TARGET)
 else
 $(INSTALLED_TOS_IMAGE_TARGET): $(TOS_IMAGE_TARGET) $(MKBOOTIMG) $(BOOT_SIGNER)
 	@echo "mkbootimg to create boot image for TOS file: $@"
diff --git a/celadon/AndroidBoard.mk b/celadon/AndroidBoard.mk
index 6b76acff2..c27957f48 100644
--- a/celadon/AndroidBoard.mk
+++ b/celadon/AndroidBoard.mk
@@ -466,7 +466,7 @@ $(INSTALLED_TOS_IMAGE_TARGET): $(TOS_IMAGE_TARGET) $(MKBOOTIMG) $(AVBTOOL)
 		--partition_size $(BOARD_TOSIMAGE_PARTITION_SIZE) \
 		--partition_name tos $(INTERNAL_AVB_SIGNING_ARGS)
 BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --include_descriptors_from_image $(INSTALLED_TOS_IMAGE_TARGET)
-$(INSTALLED_VBMETAIMAGE_TARGET): $(INSTALLED_TOS_IMAGE_TARGET)
+$(PRODUCT_OUT)/vbmeta.img: $(INSTALLED_TOS_IMAGE_TARGET)
 else
 $(INSTALLED_TOS_IMAGE_TARGET): $(TOS_IMAGE_TARGET) $(MKBOOTIMG) $(BOOT_SIGNER)
 	@echo "mkbootimg to create boot image for TOS file: $@"

From e43181fcd554656897b73379689a7a9023219806 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 12 Jul 2018 15:42:46 +0530
Subject: [PATCH 276/427] Mixinup changes for art-extension  and capstone

---
 cel_apl/device.mk | 11 +++++++++++
 celadon/device.mk | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index da0f115f3..36c31f144 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -638,6 +638,17 @@ PRODUCT_COPY_FILES += \
         frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:vendor/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml\
         device/intel/common/touch/Vendor_0eef_Product_7200.idc:system/usr/idc/Vendor_0eef_Product_7200.idc
 ##############################################################
+# Source: device/intel/mixins/groups/art-config/default/product.mk
+##############################################################
+# This is needed to enable silver art optimizer.
+VENDOR_ART_PATH ?= $(INTEL_PATH_VENDOR)/art-extension
+
+PRODUCT_PACKAGES_TESTS += \
+    art-run-tests \
+    libarttest \
+    libnativebridgetest \
+    libart-gtest
+##############################################################
 # Source: device/intel/mixins/groups/debug-kernel/default/product.mk
 ##############################################################
 ifneq ($(TARGET_BUILD_VARIANT),user)
diff --git a/celadon/device.mk b/celadon/device.mk
index 6a4b70177..cd157a5c5 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -620,6 +620,17 @@ PRODUCT_COPY_FILES += \
         frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:vendor/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml\
         device/intel/common/touch/Vendor_0eef_Product_7200.idc:system/usr/idc/Vendor_0eef_Product_7200.idc
 ##############################################################
+# Source: device/intel/mixins/groups/art-config/default/product.mk
+##############################################################
+# This is needed to enable silver art optimizer.
+VENDOR_ART_PATH ?= $(INTEL_PATH_VENDOR)/art-extension
+
+PRODUCT_PACKAGES_TESTS += \
+    art-run-tests \
+    libarttest \
+    libnativebridgetest \
+    libart-gtest
+##############################################################
 # Source: device/intel/mixins/groups/debug-kernel/default/product.mk
 ##############################################################
 ifneq ($(TARGET_BUILD_VARIANT),user)

From f15b66a5cbc30e388ba2843a1394c1fc68f966b2 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Mon, 9 Jul 2018 11:45:49 +0530
Subject: [PATCH 277/427] For improvement bug  OAM-66361

Jira: None
Test: None
Signed-off-by: lab_aqa <lab_aqa@intel.com>
---
 cel_apl/mixins.spec | 1 +
 celadon/mixins.spec | 1 +
 2 files changed, 2 insertions(+)

diff --git a/cel_apl/mixins.spec b/cel_apl/mixins.spec
index 22329c2d0..0c2491161 100644
--- a/cel_apl/mixins.spec
+++ b/cel_apl/mixins.spec
@@ -48,3 +48,4 @@ memtrack: true
 touch: galax7200
 avb: true
 slot-ab: true
+art-config: default
diff --git a/celadon/mixins.spec b/celadon/mixins.spec
index 21b0d27dc..fbf6a0741 100644
--- a/celadon/mixins.spec
+++ b/celadon/mixins.spec
@@ -48,3 +48,4 @@ memtrack: true
 touch: galax7200
 avb: true
 slot-ab: true
+art-config: default

From af57afe0669482bb6a548ec675d7b63b3061ac12 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Thu, 19 Jul 2018 09:37:22 +0530
Subject: [PATCH 278/427] [CELADON] Add the support of build USB live boot gpt
 image. #32

Jira: None
Test: None
---
 cel_apl/BoardConfig.mk | 1 +
 celadon/BoardConfig.mk | 1 +
 2 files changed, 2 insertions(+)

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index 4a59ba743..85a917cf0 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -300,6 +300,7 @@ AB_OTA_POSTINSTALL_CONFIG += \
     POSTINSTALL_PATH_vendor=bin/updater_ab_esp \
     FILESYSTEM_TYPE_vendor=ext4 \
     POSTINSTALL_OPTIONAL_vendor=true
+
 ##############################################################
 # Source: device/intel/mixins/groups/audio/project-celadon/BoardConfig.mk
 ##############################################################
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index 7d9a3cb23..709a0e51f 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -294,6 +294,7 @@ AB_OTA_POSTINSTALL_CONFIG += \
     POSTINSTALL_PATH_vendor=bin/updater_ab_esp \
     FILESYSTEM_TYPE_vendor=ext4 \
     POSTINSTALL_OPTIONAL_vendor=true
+
 ##############################################################
 # Source: device/intel/mixins/groups/audio/project-celadon/BoardConfig.mk
 ##############################################################

From 041b20e038603050b1800f855da330a0f16190df Mon Sep 17 00:00:00 2001
From: Ming Tan <ming.tan@intel.com>
Date: Thu, 21 Jun 2018 09:29:21 +0800
Subject: [PATCH 279/427] Enable the support of build the whole gpt image, used
 for USB live boot.

Use the command 'make SPARSE_IMG=true
KERNELFLINGER_SUPPORT_USB_STORAGE=true gptimage' to build a USB live boot
image.
The gernerated image is out/target/product/celadon/celadon.img.
Flash it to a USB disk, then can boot form this USB disk to Android
directly without install.

Jira: https://01.org/jira/projects/CEL/issues/CEL-13
Test: Test it in KBL NUC.
      Build a USB live boot image. And can use it to boot to Android.

Signed-off-by: Ming Tan <ming.tan@intel.com>
---
 cel_apl/mixins.spec | 1 +
 celadon/mixins.spec | 1 +
 2 files changed, 2 insertions(+)

diff --git a/cel_apl/mixins.spec b/cel_apl/mixins.spec
index 0c2491161..6404f7c01 100644
--- a/cel_apl/mixins.spec
+++ b/cel_apl/mixins.spec
@@ -49,3 +49,4 @@ touch: galax7200
 avb: true
 slot-ab: true
 art-config: default
+gptbuild: true(size=14G)
diff --git a/celadon/mixins.spec b/celadon/mixins.spec
index fbf6a0741..1c7b8a524 100644
--- a/celadon/mixins.spec
+++ b/celadon/mixins.spec
@@ -49,3 +49,4 @@ touch: galax7200
 avb: true
 slot-ab: true
 art-config: default
+gptbuild: true(size=14G)

From 15c2849d78db4b7d42abc731231c4de499cfd03b Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 19 Jul 2018 09:50:01 +0530
Subject: [PATCH 280/427] [CELADON] Mixinup  Add the setting for OEM unlocking

Jira: None
Test: None
---
 cel_apl/AndroidBoard.mk | 80 +++++++++++++++++++++++++++++++++++++++++
 cel_apl/BoardConfig.mk  | 53 ++++-----------------------
 cel_apl/device.mk       | 47 ++++++++++++++++++++++++
 celadon/AndroidBoard.mk | 80 +++++++++++++++++++++++++++++++++++++++++
 celadon/BoardConfig.mk  | 53 ++++-----------------------
 celadon/device.mk       | 47 ++++++++++++++++++++++++
 6 files changed, 266 insertions(+), 94 deletions(-)

diff --git a/cel_apl/AndroidBoard.mk b/cel_apl/AndroidBoard.mk
index b4fd9123d..cc4520d96 100644
--- a/cel_apl/AndroidBoard.mk
+++ b/cel_apl/AndroidBoard.mk
@@ -488,4 +488,84 @@ make_dir_ab_tos:
 	@mkdir -p $(PRODUCT_OUT)/root/tos
 
 $(PRODUCT_OUT)/ramdisk.img: make_dir_ab_tos
+##############################################################
+# Source: device/intel/mixins/groups/gptbuild/true/AndroidBoard.mk
+##############################################################
+gptimage_size ?= 14G
+
+raw_config := none
+raw_factory := none
+tos_bin := none
+multiboot_bin := none
+
+.PHONY: none
+none: ;
+
+.PHONY: $(INSTALLED_CONFIGIMAGE_TARGET).raw
+$(INSTALLED_CONFIGIMAGE_TARGET).raw: $(INSTALLED_CONFIGIMAGE_TARGET) $(SIMG2IMG)
+	$(SIMG2IMG) $< $@
+
+.PHONY: $(INSTALLED_FACTORYIMAGE_TARGET).raw
+$(INSTALLED_FACTORYIMAGE_TARGET).raw: $(INSTALLED_FACTORYIMAGE_TARGET) $(SIMG2IMG)
+	$(SIMG2IMG) $< $@
+
+ifdef INSTALLED_CONFIGIMAGE_TARGET
+raw_config := $(INSTALLED_CONFIGIMAGE_TARGET).raw
+endif
+
+ifdef INSTALLED_FACTORYIMAGE_TARGET
+raw_factory := $(INSTALLED_FACTORYIMAGE_TARGET).raw
+endif
+
+.PHONY: $(GPTIMAGE_BIN)
+ifeq ($(strip $(TARGET_USE_TRUSTY)),true)
+ifeq ($(strip $(TARGET_USE_MULTIBOOT)),true)
+$(GPTIMAGE_BIN): tosimage multiboot
+multiboot_bin = $(INSTALLED_MULTIBOOT_IMAGE_TARGET)
+else
+$(GPTIMAGE_BIN): tosimage
+endif
+tos_bin = $(INSTALLED_TOS_IMAGE_TARGET)
+endif
+
+$(GPTIMAGE_BIN): \
+	bootloader \
+	bootimage \
+	systemimage \
+	vbmetaimage \
+	vendorimage \
+	$(SIMG2IMG) \
+	$(raw_config) \
+	$(raw_factory)
+
+	$(hide) rm -f $(INSTALLED_SYSTEMIMAGE).raw
+	$(hide) rm -f $(INSTALLED_USERDATAIMAGE_TARGET).raw
+
+	$(MAKE_EXT4FS) \
+		-l $(BOARD_USERDATAIMAGE_PARTITION_SIZE) -L data \
+		$(PRODUCT_OUT)/userdata.dummy
+
+	$(SIMG2IMG) $(INSTALLED_SYSTEMIMAGE) $(INSTALLED_SYSTEMIMAGE).raw
+	$(SIMG2IMG) $(INSTALLED_VENDORIMAGE_TARGET) $(INSTALLED_VENDORIMAGE_TARGET).raw
+
+	$(INTEL_PATH_BUILD)/create_gpt_image.py \
+		--create $@ \
+		--block $(BOARD_FLASH_BLOCK_SIZE) \
+		--table $(TARGET_DEVICE_DIR)/gpt.ini \
+		--size $(gptimage_size) \
+		--bootloader $(bootloader_bin) \
+		--bootloader2 $(bootloader_bin) \
+		--tos $(tos_bin) \
+		--multiboot $(multiboot_bin) \
+		--boot $(INSTALLED_BOOTIMAGE_TARGET) \
+		--vbmeta $(INSTALLED_VBMETAIMAGE_TARGET) \
+		--system $(INSTALLED_SYSTEMIMAGE).raw \
+		--vendor $(INSTALLED_VENDORIMAGE_TARGET).raw \
+		--data $(PRODUCT_OUT)/userdata.dummy \
+		--config $(raw_config) \
+		--factory $(raw_factory)
+
+
+.PHONY: gptimage
+gptimage: $(GPTIMAGE_BIN)
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index 85a917cf0..17d4d69c9 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -241,53 +241,6 @@ TARGET_RELEASETOOLS_EXTENSIONS ?= device/intel/common/recovery
 # By default recovery minui expects RGBA framebuffer
 TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
 
-
-ifneq (0x0,static)
-BOOTLOADER_POLICY_OEMVARS = $(PRODUCT_OUT)/bootloader_policy-oemvars.txt
-BOARD_FLASHFILES += $(BOOTLOADER_POLICY_OEMVARS)
-BOARD_OEM_VARS += $(BOOTLOADER_POLICY_OEMVARS)
-endif
-
-# It activates the Bootloader policy and RMA refurbishing
-# features. TARGET_BOOTLOADER_POLICY is the desired bitmask for this
-# device.
-# * bit 0:
-#   - 0: GVB class B.
-#   - 1: GVB class A.  Device unlock is not permitted.  The only way
-#     to unlock is to use the secured force-unlock mechanism.
-# * bit 1 and 2 defines the minimal boot state required to boot the
-#   device:
-#   - 0x0: BOOT_STATE_RED (GVB default behavior)
-#   - 0x1: BOOT_STATE_ORANGE
-#   - 0x2: BOOT_STATE_YELLOW
-#   - 0x3: BOOT_STATE_GREEN
-# If TARGET_BOOTLOADER_POLICY is equal to 'static' the bootloader
-# policy is not built but is provided statically in the repository.
-# If TARGET_BOOTLOADER_POLICY is equal to 'external' the bootloader
-# policy OEMVARS should be installed manually in
-# $(BOOTLOADER_POLICY_OEMVARS).
-TARGET_BOOTLOADER_POLICY := 0x0
-# If the following variable is set to false, the bootloader policy and
-# RMA refurbishing features does not use time-based authenticated EFI
-# variables to store the BPM and OAK values.  The BPM value is defined
-# compilation time by the TARGET_BOOTLOADER_POLICY variable.
-TARGET_BOOTLOADER_POLICY_USE_EFI_VAR := true
-#ifeq ($(TARGET_BOOTLOADER_POLICY),$(filter $(TARGET_BOOTLOADER_POLICY),0x0 0x2 0x4 0x6))
-# OEM Unlock reporting 1
-#ADDITIONAL_DEFAULT_PROPERTIES += \
-#	ro.oem_unlock_supported=1
-#endif
-ifeq ($(TARGET_BOOTLOADER_POLICY),$(filter $(TARGET_BOOTLOADER_POLICY),static external))
-# The bootloader policy is not generated build time but is supplied
-# statically in the repository or in $(PRODUCT_OUT)/.  If your
-# bootloader policy allows the device to be unlocked, uncomment the
-# following lines:
-# ADDITIONAL_DEFAULT_PROPERTIES += \
-# 	ro.oem_unlock_supported=1
-endif
-
-
-
 # Kernelfligner will assume the BIOS support secure boot. Not check the EFI variable SecureBoot
 # It is useful when the BIOS does not support secure boot.
 KERNELFLINGER_ASSUME_BIOS_SECURE_BOOT := true
@@ -472,6 +425,12 @@ BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/camera/usbcamera
 # Source: device/intel/mixins/groups/memtrack/true/BoardConfig.mk
 ##############################################################
 BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/memtrack
+##############################################################
+# Source: device/intel/mixins/groups/gptbuild/true/BoardConfig.mk
+##############################################################
+# can't use := here, as PRODUCT_OUT is not defined yet
+GPTIMAGE_BIN = $(PRODUCT_OUT)/$(TARGET_PRODUCT).img
+CRAFFIMAGE_BIN = $(PRODUCT_OUT)/$(TARGET_PRODUCT).craff
 # ------------------ END MIX-IN DEFINITIONS ------------------
 
 # Install Native Bridge
diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 36c31f144..005d3d236 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -398,6 +398,53 @@ endif
 
 PRODUCT_PACKAGES += updater_ab_esp
 
+
+
+ifneq (0x0,static)
+BOOTLOADER_POLICY_OEMVARS = $(PRODUCT_OUT)/bootloader_policy-oemvars.txt
+BOARD_FLASHFILES += $(BOOTLOADER_POLICY_OEMVARS)
+BOARD_OEM_VARS += $(BOOTLOADER_POLICY_OEMVARS)
+endif
+
+# It activates the Bootloader policy and RMA refurbishing
+# features. TARGET_BOOTLOADER_POLICY is the desired bitmask for this
+# device.
+# * bit 0:
+#   - 0: GVB class B.
+#   - 1: GVB class A.  Device unlock is not permitted.  The only way
+#     to unlock is to use the secured force-unlock mechanism.
+# * bit 1 and 2 defines the minimal boot state required to boot the
+#   device:
+#   - 0x0: BOOT_STATE_RED (GVB default behavior)
+#   - 0x1: BOOT_STATE_ORANGE
+#   - 0x2: BOOT_STATE_YELLOW
+#   - 0x3: BOOT_STATE_GREEN
+# If TARGET_BOOTLOADER_POLICY is equal to 'static' the bootloader
+# policy is not built but is provided statically in the repository.
+# If TARGET_BOOTLOADER_POLICY is equal to 'external' the bootloader
+# policy OEMVARS should be installed manually in
+# $(BOOTLOADER_POLICY_OEMVARS).
+TARGET_BOOTLOADER_POLICY := 0x0
+# If the following variable is set to false, the bootloader policy and
+# RMA refurbishing features does not use time-based authenticated EFI
+# variables to store the BPM and OAK values.  The BPM value is defined
+# compilation time by the TARGET_BOOTLOADER_POLICY variable.
+TARGET_BOOTLOADER_POLICY_USE_EFI_VAR := true
+#ifeq ($(TARGET_BOOTLOADER_POLICY),$(filter $(TARGET_BOOTLOADER_POLICY),0x0 0x2 0x4 0x6))
+# OEM Unlock reporting 1
+PRODUCT_PROPERTY_OVERRIDES += \
+	ro.oem_unlock_supported=1
+#endif
+ifeq ($(TARGET_BOOTLOADER_POLICY),$(filter $(TARGET_BOOTLOADER_POLICY),static external))
+# The bootloader policy is not generated build time but is supplied
+# statically in the repository or in $(PRODUCT_OUT)/.  If your
+# bootloader policy allows the device to be unlocked, uncomment the
+# following lines:
+#PRODUCT_PROPERTY_OVERRIDES += \
+	ro.oem_unlock_supported=1
+endif
+
+
 ##############################################################
 # Source: device/intel/mixins/groups/audio/project-celadon/product.mk
 ##############################################################
diff --git a/celadon/AndroidBoard.mk b/celadon/AndroidBoard.mk
index c27957f48..59866dc5c 100644
--- a/celadon/AndroidBoard.mk
+++ b/celadon/AndroidBoard.mk
@@ -482,4 +482,84 @@ make_dir_ab_tos:
 	@mkdir -p $(PRODUCT_OUT)/root/tos
 
 $(PRODUCT_OUT)/ramdisk.img: make_dir_ab_tos
+##############################################################
+# Source: device/intel/mixins/groups/gptbuild/true/AndroidBoard.mk
+##############################################################
+gptimage_size ?= 14G
+
+raw_config := none
+raw_factory := none
+tos_bin := none
+multiboot_bin := none
+
+.PHONY: none
+none: ;
+
+.PHONY: $(INSTALLED_CONFIGIMAGE_TARGET).raw
+$(INSTALLED_CONFIGIMAGE_TARGET).raw: $(INSTALLED_CONFIGIMAGE_TARGET) $(SIMG2IMG)
+	$(SIMG2IMG) $< $@
+
+.PHONY: $(INSTALLED_FACTORYIMAGE_TARGET).raw
+$(INSTALLED_FACTORYIMAGE_TARGET).raw: $(INSTALLED_FACTORYIMAGE_TARGET) $(SIMG2IMG)
+	$(SIMG2IMG) $< $@
+
+ifdef INSTALLED_CONFIGIMAGE_TARGET
+raw_config := $(INSTALLED_CONFIGIMAGE_TARGET).raw
+endif
+
+ifdef INSTALLED_FACTORYIMAGE_TARGET
+raw_factory := $(INSTALLED_FACTORYIMAGE_TARGET).raw
+endif
+
+.PHONY: $(GPTIMAGE_BIN)
+ifeq ($(strip $(TARGET_USE_TRUSTY)),true)
+ifeq ($(strip $(TARGET_USE_MULTIBOOT)),true)
+$(GPTIMAGE_BIN): tosimage multiboot
+multiboot_bin = $(INSTALLED_MULTIBOOT_IMAGE_TARGET)
+else
+$(GPTIMAGE_BIN): tosimage
+endif
+tos_bin = $(INSTALLED_TOS_IMAGE_TARGET)
+endif
+
+$(GPTIMAGE_BIN): \
+	bootloader \
+	bootimage \
+	systemimage \
+	vbmetaimage \
+	vendorimage \
+	$(SIMG2IMG) \
+	$(raw_config) \
+	$(raw_factory)
+
+	$(hide) rm -f $(INSTALLED_SYSTEMIMAGE).raw
+	$(hide) rm -f $(INSTALLED_USERDATAIMAGE_TARGET).raw
+
+	$(MAKE_EXT4FS) \
+		-l $(BOARD_USERDATAIMAGE_PARTITION_SIZE) -L data \
+		$(PRODUCT_OUT)/userdata.dummy
+
+	$(SIMG2IMG) $(INSTALLED_SYSTEMIMAGE) $(INSTALLED_SYSTEMIMAGE).raw
+	$(SIMG2IMG) $(INSTALLED_VENDORIMAGE_TARGET) $(INSTALLED_VENDORIMAGE_TARGET).raw
+
+	$(INTEL_PATH_BUILD)/create_gpt_image.py \
+		--create $@ \
+		--block $(BOARD_FLASH_BLOCK_SIZE) \
+		--table $(TARGET_DEVICE_DIR)/gpt.ini \
+		--size $(gptimage_size) \
+		--bootloader $(bootloader_bin) \
+		--bootloader2 $(bootloader_bin) \
+		--tos $(tos_bin) \
+		--multiboot $(multiboot_bin) \
+		--boot $(INSTALLED_BOOTIMAGE_TARGET) \
+		--vbmeta $(INSTALLED_VBMETAIMAGE_TARGET) \
+		--system $(INSTALLED_SYSTEMIMAGE).raw \
+		--vendor $(INSTALLED_VENDORIMAGE_TARGET).raw \
+		--data $(PRODUCT_OUT)/userdata.dummy \
+		--config $(raw_config) \
+		--factory $(raw_factory)
+
+
+.PHONY: gptimage
+gptimage: $(GPTIMAGE_BIN)
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index 709a0e51f..ed9320d8f 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -235,53 +235,6 @@ TARGET_RELEASETOOLS_EXTENSIONS ?= device/intel/common/recovery
 # By default recovery minui expects RGBA framebuffer
 TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
 
-
-ifneq (0x0,static)
-BOOTLOADER_POLICY_OEMVARS = $(PRODUCT_OUT)/bootloader_policy-oemvars.txt
-BOARD_FLASHFILES += $(BOOTLOADER_POLICY_OEMVARS)
-BOARD_OEM_VARS += $(BOOTLOADER_POLICY_OEMVARS)
-endif
-
-# It activates the Bootloader policy and RMA refurbishing
-# features. TARGET_BOOTLOADER_POLICY is the desired bitmask for this
-# device.
-# * bit 0:
-#   - 0: GVB class B.
-#   - 1: GVB class A.  Device unlock is not permitted.  The only way
-#     to unlock is to use the secured force-unlock mechanism.
-# * bit 1 and 2 defines the minimal boot state required to boot the
-#   device:
-#   - 0x0: BOOT_STATE_RED (GVB default behavior)
-#   - 0x1: BOOT_STATE_ORANGE
-#   - 0x2: BOOT_STATE_YELLOW
-#   - 0x3: BOOT_STATE_GREEN
-# If TARGET_BOOTLOADER_POLICY is equal to 'static' the bootloader
-# policy is not built but is provided statically in the repository.
-# If TARGET_BOOTLOADER_POLICY is equal to 'external' the bootloader
-# policy OEMVARS should be installed manually in
-# $(BOOTLOADER_POLICY_OEMVARS).
-TARGET_BOOTLOADER_POLICY := 0x0
-# If the following variable is set to false, the bootloader policy and
-# RMA refurbishing features does not use time-based authenticated EFI
-# variables to store the BPM and OAK values.  The BPM value is defined
-# compilation time by the TARGET_BOOTLOADER_POLICY variable.
-TARGET_BOOTLOADER_POLICY_USE_EFI_VAR := true
-#ifeq ($(TARGET_BOOTLOADER_POLICY),$(filter $(TARGET_BOOTLOADER_POLICY),0x0 0x2 0x4 0x6))
-# OEM Unlock reporting 1
-#ADDITIONAL_DEFAULT_PROPERTIES += \
-#	ro.oem_unlock_supported=1
-#endif
-ifeq ($(TARGET_BOOTLOADER_POLICY),$(filter $(TARGET_BOOTLOADER_POLICY),static external))
-# The bootloader policy is not generated build time but is supplied
-# statically in the repository or in $(PRODUCT_OUT)/.  If your
-# bootloader policy allows the device to be unlocked, uncomment the
-# following lines:
-# ADDITIONAL_DEFAULT_PROPERTIES += \
-# 	ro.oem_unlock_supported=1
-endif
-
-
-
 # Kernelfligner will assume the BIOS support secure boot. Not check the EFI variable SecureBoot
 # It is useful when the BIOS does not support secure boot.
 KERNELFLINGER_ASSUME_BIOS_SECURE_BOOT := true
@@ -466,6 +419,12 @@ BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/camera/usbcamera
 # Source: device/intel/mixins/groups/memtrack/true/BoardConfig.mk
 ##############################################################
 BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/memtrack
+##############################################################
+# Source: device/intel/mixins/groups/gptbuild/true/BoardConfig.mk
+##############################################################
+# can't use := here, as PRODUCT_OUT is not defined yet
+GPTIMAGE_BIN = $(PRODUCT_OUT)/$(TARGET_PRODUCT).img
+CRAFFIMAGE_BIN = $(PRODUCT_OUT)/$(TARGET_PRODUCT).craff
 # ------------------ END MIX-IN DEFINITIONS ------------------
 
 # Install Native Bridge
diff --git a/celadon/device.mk b/celadon/device.mk
index cd157a5c5..4afb4abb2 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -380,6 +380,53 @@ endif
 
 PRODUCT_PACKAGES += updater_ab_esp
 
+
+
+ifneq (0x0,static)
+BOOTLOADER_POLICY_OEMVARS = $(PRODUCT_OUT)/bootloader_policy-oemvars.txt
+BOARD_FLASHFILES += $(BOOTLOADER_POLICY_OEMVARS)
+BOARD_OEM_VARS += $(BOOTLOADER_POLICY_OEMVARS)
+endif
+
+# It activates the Bootloader policy and RMA refurbishing
+# features. TARGET_BOOTLOADER_POLICY is the desired bitmask for this
+# device.
+# * bit 0:
+#   - 0: GVB class B.
+#   - 1: GVB class A.  Device unlock is not permitted.  The only way
+#     to unlock is to use the secured force-unlock mechanism.
+# * bit 1 and 2 defines the minimal boot state required to boot the
+#   device:
+#   - 0x0: BOOT_STATE_RED (GVB default behavior)
+#   - 0x1: BOOT_STATE_ORANGE
+#   - 0x2: BOOT_STATE_YELLOW
+#   - 0x3: BOOT_STATE_GREEN
+# If TARGET_BOOTLOADER_POLICY is equal to 'static' the bootloader
+# policy is not built but is provided statically in the repository.
+# If TARGET_BOOTLOADER_POLICY is equal to 'external' the bootloader
+# policy OEMVARS should be installed manually in
+# $(BOOTLOADER_POLICY_OEMVARS).
+TARGET_BOOTLOADER_POLICY := 0x0
+# If the following variable is set to false, the bootloader policy and
+# RMA refurbishing features does not use time-based authenticated EFI
+# variables to store the BPM and OAK values.  The BPM value is defined
+# compilation time by the TARGET_BOOTLOADER_POLICY variable.
+TARGET_BOOTLOADER_POLICY_USE_EFI_VAR := true
+#ifeq ($(TARGET_BOOTLOADER_POLICY),$(filter $(TARGET_BOOTLOADER_POLICY),0x0 0x2 0x4 0x6))
+# OEM Unlock reporting 1
+PRODUCT_PROPERTY_OVERRIDES += \
+	ro.oem_unlock_supported=1
+#endif
+ifeq ($(TARGET_BOOTLOADER_POLICY),$(filter $(TARGET_BOOTLOADER_POLICY),static external))
+# The bootloader policy is not generated build time but is supplied
+# statically in the repository or in $(PRODUCT_OUT)/.  If your
+# bootloader policy allows the device to be unlocked, uncomment the
+# following lines:
+#PRODUCT_PROPERTY_OVERRIDES += \
+	ro.oem_unlock_supported=1
+endif
+
+
 ##############################################################
 # Source: device/intel/mixins/groups/audio/project-celadon/product.mk
 ##############################################################

From 03b0a01c5683ba7a38e06a55afdb152852b9b295 Mon Sep 17 00:00:00 2001
From: "Duan, YayongX" <yayongx.duan@intel.com>
Date: Tue, 17 Jul 2018 13:40:50 +0000
Subject: [PATCH 281/427] Summary: - Enable pstore to save kernel panic log

Description:
- Specify ramoops.mem_address=0x50000000 and ramoops.mem_size
  =0x400000 to save kernel panic log.

Jira: https://jira01.devtools.intel.com/browse/OAM-66587

Test:
- use "echo c > /proc/sysrq-trigger" to trigger a kernel panic
- use "cat /data/logs/history_event" to check whether a IPANIC_FAKE
  event generated in hiatory_event file. console-ramoops-xxxxxxxxx
  involve kernel panic log and it is in the directory behind the
  IPANIC_FAKE event name.

Signed-off-by: Duan, YayongX <yayongx.duan@intel.com>
---
 celadon/mixins.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/celadon/mixins.spec b/celadon/mixins.spec
index 1c7b8a524..0b69fb210 100644
--- a/celadon/mixins.spec
+++ b/celadon/mixins.spec
@@ -33,6 +33,7 @@ thermal: dptf(intel_modem=true)
 config-partition: enabled
 vendor-partition: true
 factory-partition: true
+pstore: ram_dummy(address=0x50000000,size=0x400000,record_size=0x4000,console_size=0x200000,ftrace_size=0x2000,dump_oops=1)
 debug-crashlogd: true
 debug-logs: true
 debug-coredump: true

From 822e723fc5932bfb6bbf3808c0df7acba09dbf3b Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Thu, 19 Jul 2018 18:18:58 +0530
Subject: [PATCH 282/427] [MIXINUP] Add the setting for OEM unlocking. #30

Jira: None
Test: None
---
 celadon/BoardConfig.mk | 27 +++++++++++++++++++++++++++
 celadon/device.mk      |  5 +++++
 celadon/init.rc        | 19 +++++++++++++++++++
 3 files changed, 51 insertions(+)

diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index ed9320d8f..2e7a4a1b8 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -357,6 +357,33 @@ WITH_DEXPREOPT_PIC := true
 BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/thermal
 BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/thermal/dptf
 BOARD_KERNEL_CMDLINE += thermal.off=1
+##############################################################
+# Source: device/intel/mixins/groups/pstore/ram_dummy/BoardConfig.mk.1
+##############################################################
+BOARD_KERNEL_CMDLINE += pstore.backend=ramoops
+##############################################################
+# Source: device/intel/mixins/groups/pstore/ram_dummy/BoardConfig.mk.2
+##############################################################
+BOARD_SEPOLICY_DIRS += device/intel/sepolicy/pstore
+##############################################################
+# Source: device/intel/mixins/groups/pstore/ram_dummy/BoardConfig.mk
+##############################################################
+BOARD_KERNEL_CMDLINE += \
+	memmap=0x400000\$$0x50000000 \
+	ramoops.mem_address=0x50000000 \
+	ramoops.mem_size=0x400000
+BOARD_KERNEL_CMDLINE += \
+	ramoops.record_size=0x4000
+
+BOARD_KERNEL_CMDLINE += \
+	ramoops.console_size=0x200000
+
+BOARD_KERNEL_CMDLINE += \
+	ramoops.ftrace_size=0x2000
+
+BOARD_KERNEL_CMDLINE += \
+	ramoops.dump_oops=1
+
 ##############################################################
 # Source: device/intel/mixins/groups/debug-phonedoctor/true/BoardConfig.mk
 ##############################################################
diff --git a/celadon/device.mk b/celadon/device.mk
index 4afb4abb2..111dfcb6f 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -539,6 +539,11 @@ PRODUCT_PACKAGES += esif_ufd \
     jhs
 PRODUCT_COPY_FILES += $(LOCAL_PATH)/dptf.dv:/system/etc/dptf/dv/dptf.dv
 ##############################################################
+# Source: device/intel/mixins/groups/pstore/ram_dummy/product.mk
+##############################################################
+PRODUCT_PACKAGES += \
+    pstore-clean
+##############################################################
 # Source: device/intel/mixins/groups/debug-logs/true/product.mk
 ##############################################################
 ifneq ($(TARGET_BUILD_VARIANT),user)
diff --git a/celadon/init.rc b/celadon/init.rc
index 7bdeedbef..a993f610e 100644
--- a/celadon/init.rc
+++ b/celadon/init.rc
@@ -594,6 +594,25 @@ on boot
     chown system system /sys/class/powercap/intel-rapl:0/constraint_0_power_limit_uw
     restorecon_recursive /sys/class/powercap
 ##############################################################
+# Source: device/intel/mixins/groups/pstore/ram_dummy/init.rc
+##############################################################
+on fs
+    mkdir /dev/pstore 0700 5001 root
+    mount pstore pstore /dev/pstore
+
+on post-fs-data
+   mkdir /data/dontpanic 0770 root log
+
+service pstore-clean /system/vendor/bin/pstore-clean
+    user 5001
+    group root log
+    class late_start
+    oneshot
+
+on property:init.svc.pstore-clean=stopped
+    umount /dev/pstore
+    rmdir /dev/pstore
+##############################################################
 # Source: device/intel/mixins/groups/debug-logs/true/init.rc
 ##############################################################
 import /init.logs.rc

From 3218ce3cf99682ddfe215120ee49b376d646840b Mon Sep 17 00:00:00 2001
From: Yuanjun Huang <yuanjun.huang@intel.com>
Date: Fri, 8 Jun 2018 15:01:50 +0800
Subject: [PATCH 283/427] BoardCongfig: Add option to indicate video driver
 readiness.

HWComposer will check this flag to disable va renderer if
va driver is not ready.

Change-Id: Ice9e791cdc5a55f237a499639e1122a199517f96
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-64421
Signed-off-by: Yuanjun Huang <yuanjun.huang@intel.com>
---
 cel_apl/BoardConfig.mk | 1 +
 celadon/BoardConfig.mk | 1 +
 2 files changed, 2 insertions(+)

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index 17d4d69c9..dc940000d 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -25,6 +25,7 @@ USE_OPENGL_RENDERER := true
 NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
 USE_INTEL_UFO_DRIVER := false
 INTEL_VA := true
+HWC_DISABLE_VA_DRIVER := true
 BOARD_GRAPHIC_IS_GEN := true
 BOARD_GPU_DRIVERS := i965
 BOARD_USE_MESA := true
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index 2e7a4a1b8..4f90646c1 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -25,6 +25,7 @@ USE_OPENGL_RENDERER := true
 NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
 USE_INTEL_UFO_DRIVER := false
 INTEL_VA := true
+HWC_DISABLE_VA_DRIVER := true
 BOARD_GRAPHIC_IS_GEN := true
 BOARD_GPU_DRIVERS := i965
 BOARD_USE_MESA := true

From 85681e657a44553912e5fa07f62c248181c8adc7 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Thu, 26 Jul 2018 09:30:19 +0530
Subject: [PATCH 284/427] [MIXINUP] Adding code to load the modules for
 creating /dev/video0 #33

Jira: None
Test: None
---
 cel_apl/init.rc | 8 ++++++++
 celadon/init.rc | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/cel_apl/init.rc b/cel_apl/init.rc
index 7bdeedbef..f2a3516da 100644
--- a/cel_apl/init.rc
+++ b/cel_apl/init.rc
@@ -150,6 +150,14 @@ on post-fs-data
 
 on boot
     setprop persist.media.pfw.verbose true
+
+on post-fs
+    insmod /vendor/lib/modules/kernel/drivers/media/v4l2-core/videobuf2-core.ko
+    insmod /vendor/lib/modules/kernel/drivers/media/v4l2-core/videobuf2-v4l2.ko
+    insmod /vendor/lib/modules/kernel/drivers/media/v4l2-core/videobuf2-memops.ko
+    insmod /vendor/lib/modules/kernel/drivers/media/v4l2-core/videobuf2-dma-contig.ko
+    insmod /vendor/lib/modules/kernel/drivers/media/v4l2-core/videobuf2-vmalloc.ko
+    insmod /vendor/lib/modules/kernel/drivers/media/usb/uvc/uvcvideo.ko
 ##############################################################
 # Source: device/intel/mixins/groups/ethernet/dhcp/init.rc
 ##############################################################
diff --git a/celadon/init.rc b/celadon/init.rc
index a993f610e..e8b9a3036 100644
--- a/celadon/init.rc
+++ b/celadon/init.rc
@@ -150,6 +150,14 @@ on post-fs-data
 
 on boot
     setprop persist.media.pfw.verbose true
+
+on post-fs
+    insmod /vendor/lib/modules/kernel/drivers/media/v4l2-core/videobuf2-core.ko
+    insmod /vendor/lib/modules/kernel/drivers/media/v4l2-core/videobuf2-v4l2.ko
+    insmod /vendor/lib/modules/kernel/drivers/media/v4l2-core/videobuf2-memops.ko
+    insmod /vendor/lib/modules/kernel/drivers/media/v4l2-core/videobuf2-dma-contig.ko
+    insmod /vendor/lib/modules/kernel/drivers/media/v4l2-core/videobuf2-vmalloc.ko
+    insmod /vendor/lib/modules/kernel/drivers/media/usb/uvc/uvcvideo.ko
 ##############################################################
 # Source: device/intel/mixins/groups/ethernet/dhcp/init.rc
 ##############################################################

From 289689eb6279ad6f090f668408fa2627d4cb99c9 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Thu, 26 Jul 2018 13:51:44 +0530
Subject: [PATCH 285/427] [MIXINUP] Enable config for hw decoder #34

Jira: None
Test: None
---
 cel_apl/BoardConfig.mk |  9 ++++++++-
 cel_apl/device.mk      | 24 +++++++++++++++++-------
 celadon/BoardConfig.mk |  9 ++++++++-
 celadon/device.mk      | 24 +++++++++++++++++-------
 4 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index dc940000d..4a5cb1baf 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -24,7 +24,7 @@ BOARD_KERNEL_CMDLINE += vga=current i915.modeset=1 drm.atomic=1 i915.nuclear_pag
 USE_OPENGL_RENDERER := true
 NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
 USE_INTEL_UFO_DRIVER := false
-INTEL_VA := true
+INTEL_VA := false
 HWC_DISABLE_VA_DRIVER := true
 BOARD_GRAPHIC_IS_GEN := true
 BOARD_GPU_DRIVERS := i965
@@ -61,6 +61,13 @@ TARGET_USES_HWC2 := true
 ##############################################################
 # Source: device/intel/mixins/groups/media/project-celadon/BoardConfig.mk
 ##############################################################
+INTEL_STAGEFRIGHT := true
+
+# Settings for the Media SDK library and plug-ins:
+# - USE_MEDIASDK: use Media SDK support or not
+USE_MEDIASDK := true
+
+BOARD_HAVE_MEDIASDK_OPEN_SOURCE := true
 ##############################################################
 # Source: device/intel/mixins/groups/device-type/car/BoardConfig.mk
 ##############################################################
diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 005d3d236..8e509e98f 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -216,17 +216,17 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     libva \
     libva-android \
-    libva-egl \
-    libva-tpi \
     i965_drv_video
 
+PRODUCT_PACKAGES += libpciaccess
+
 # Audio/video codec support.
 PRODUCT_COPY_FILES += \
-    frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
-    frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
-    device/intel/project-celadon/common/media/media_profiles.xml:system/etc/media_profiles.xml \
-    device/intel/project-celadon/common/media/media_codecs.xml:system/etc/media_codecs.xml \
-    device/intel/project-celadon/common/media/media_codecs_performance.xml:system/etc/media_codecs_performance.xml
+    frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:vendor/etc/media_codecs_google_audio.xml \
+    frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:vendor/etc/media_codecs_google_video.xml \
+    device/intel/project-celadon/common/media/media_profiles.xml:vendor/etc/media_profiles.xml \
+    device/intel/project-celadon/common/media/media_codecs.xml:vendor/etc/media_codecs.xml \
+    device/intel/project-celadon/common/media/media_codecs_performance.xml:vendor/etc/media_codecs_performance.xml
 
 #Enable deep buffer for video playback
 PRODUCT_PROPERTY_OVERRIDES += media.stagefright.audio.deep=true
@@ -235,6 +235,16 @@ PRODUCT_PROPERTY_OVERRIDES += media.stagefright.audio.deep=true
 PRODUCT_PROPERTY_OVERRIDES += \
     media.aac_51_output_enabled=true
 
+# Enable Media Sdk
+PRODUCT_PACKAGES += \
+    libmfxhw32 \
+    libmfxhw64 \
+    libmfx_omx_core \
+    libmfx_omx_components_hw \
+    libstagefrighthw
+
+PRODUCT_COPY_FILES += \
+    device/intel/project-celadon/common/media/mfx_omxil_core.conf:vendor/etc/mfx_omxil_core.conf
 ##############################################################
 # Source: device/intel/mixins/groups/device-type/car/product.mk
 ##############################################################
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index 4f90646c1..0366de332 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -24,7 +24,7 @@ BOARD_KERNEL_CMDLINE += vga=current i915.modeset=1 drm.atomic=1 i915.nuclear_pag
 USE_OPENGL_RENDERER := true
 NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
 USE_INTEL_UFO_DRIVER := false
-INTEL_VA := true
+INTEL_VA := false
 HWC_DISABLE_VA_DRIVER := true
 BOARD_GRAPHIC_IS_GEN := true
 BOARD_GPU_DRIVERS := i965
@@ -61,6 +61,13 @@ TARGET_USES_HWC2 := true
 ##############################################################
 # Source: device/intel/mixins/groups/media/project-celadon/BoardConfig.mk
 ##############################################################
+INTEL_STAGEFRIGHT := true
+
+# Settings for the Media SDK library and plug-ins:
+# - USE_MEDIASDK: use Media SDK support or not
+USE_MEDIASDK := true
+
+BOARD_HAVE_MEDIASDK_OPEN_SOURCE := true
 ##############################################################
 # Source: device/intel/mixins/groups/device-type/tablet/BoardConfig.mk
 ##############################################################
diff --git a/celadon/device.mk b/celadon/device.mk
index 111dfcb6f..28822e718 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -216,17 +216,17 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     libva \
     libva-android \
-    libva-egl \
-    libva-tpi \
     i965_drv_video
 
+PRODUCT_PACKAGES += libpciaccess
+
 # Audio/video codec support.
 PRODUCT_COPY_FILES += \
-    frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
-    frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
-    device/intel/project-celadon/common/media/media_profiles.xml:system/etc/media_profiles.xml \
-    device/intel/project-celadon/common/media/media_codecs.xml:system/etc/media_codecs.xml \
-    device/intel/project-celadon/common/media/media_codecs_performance.xml:system/etc/media_codecs_performance.xml
+    frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:vendor/etc/media_codecs_google_audio.xml \
+    frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:vendor/etc/media_codecs_google_video.xml \
+    device/intel/project-celadon/common/media/media_profiles.xml:vendor/etc/media_profiles.xml \
+    device/intel/project-celadon/common/media/media_codecs.xml:vendor/etc/media_codecs.xml \
+    device/intel/project-celadon/common/media/media_codecs_performance.xml:vendor/etc/media_codecs_performance.xml
 
 #Enable deep buffer for video playback
 PRODUCT_PROPERTY_OVERRIDES += media.stagefright.audio.deep=true
@@ -235,6 +235,16 @@ PRODUCT_PROPERTY_OVERRIDES += media.stagefright.audio.deep=true
 PRODUCT_PROPERTY_OVERRIDES += \
     media.aac_51_output_enabled=true
 
+# Enable Media Sdk
+PRODUCT_PACKAGES += \
+    libmfxhw32 \
+    libmfxhw64 \
+    libmfx_omx_core \
+    libmfx_omx_components_hw \
+    libstagefrighthw
+
+PRODUCT_COPY_FILES += \
+    device/intel/project-celadon/common/media/mfx_omxil_core.conf:vendor/etc/mfx_omxil_core.conf
 ##############################################################
 # Source: device/intel/mixins/groups/device-type/tablet/product.mk
 ##############################################################

From 135305544d085e94c3364495d36d453374950d8b Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Tue, 31 Jul 2018 10:25:06 +0530
Subject: [PATCH 286/427] [CELADON] Fix the conflict of build USB live boot
 image and grub image. #35

Jira: None
Test: None
---
 cel_apl/BoardConfig.mk | 4 ++--
 celadon/BoardConfig.mk | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index 4a5cb1baf..dc8ae1021 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -437,8 +437,8 @@ BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/memtrack
 # Source: device/intel/mixins/groups/gptbuild/true/BoardConfig.mk
 ##############################################################
 # can't use := here, as PRODUCT_OUT is not defined yet
-GPTIMAGE_BIN = $(PRODUCT_OUT)/$(TARGET_PRODUCT).img
-CRAFFIMAGE_BIN = $(PRODUCT_OUT)/$(TARGET_PRODUCT).craff
+GPTIMAGE_BIN = $(PRODUCT_OUT)/$(TARGET_PRODUCT)_gptimage.img
+CRAFFIMAGE_BIN = $(PRODUCT_OUT)/$(TARGET_PRODUCT)_gptimage.craff
 # ------------------ END MIX-IN DEFINITIONS ------------------
 
 # Install Native Bridge
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index 0366de332..c85faccfd 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -458,8 +458,8 @@ BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/memtrack
 # Source: device/intel/mixins/groups/gptbuild/true/BoardConfig.mk
 ##############################################################
 # can't use := here, as PRODUCT_OUT is not defined yet
-GPTIMAGE_BIN = $(PRODUCT_OUT)/$(TARGET_PRODUCT).img
-CRAFFIMAGE_BIN = $(PRODUCT_OUT)/$(TARGET_PRODUCT).craff
+GPTIMAGE_BIN = $(PRODUCT_OUT)/$(TARGET_PRODUCT)_gptimage.img
+CRAFFIMAGE_BIN = $(PRODUCT_OUT)/$(TARGET_PRODUCT)_gptimage.craff
 # ------------------ END MIX-IN DEFINITIONS ------------------
 
 # Install Native Bridge

From a4b137cf7b9f19ee324a35b9158dfcaa08284e4e Mon Sep 17 00:00:00 2001
From: TianmiChen <tianmi.chen@intel.com>
Date: Fri, 27 Jul 2018 15:13:44 +0800
Subject: [PATCH 287/427] [celadon] Add vp8dec, vp9dec and h265enc for celadon

Jira: None
Test: None

Signed-off-by: TianmiChen <tianmi.chen@intel.com>
---
 common/media/media_codecs.xml             | 51 ++++++++++++-----------
 common/media/media_codecs_performance.xml | 32 +++++++-------
 common/media/mfx_omxil_core.conf          |  3 ++
 3 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/common/media/media_codecs.xml b/common/media/media_codecs.xml
index 874e7bcee..0d4397e39 100644
--- a/common/media/media_codecs.xml
+++ b/common/media/media_codecs.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright (C) 2012 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,12 +15,10 @@
 
 <!--
 <!DOCTYPE MediaCodecs [
-<!ELEMENT Include EMPTY>
-<!ATTLIST Include href CDATA #REQUIRED>
-<!ELEMENT MediaCodecs (Decoders|Encoders|Include)*>
-<!ELEMENT Decoders (MediaCodec|Include)*>
-<!ELEMENT Encoders (MediaCodec|Include)*>
-<!ELEMENT MediaCodec (Type|Quirk|Include)*>
+<!ELEMENT MediaCodecs (Decoders,Encoders)>
+<!ELEMENT Decoders (MediaCodec*)>
+<!ELEMENT Encoders (MediaCodec*)>
+<!ELEMENT MediaCodec (Type*,Quirk*)>
 <!ATTLIST MediaCodec name CDATA #REQUIRED>
 <!ATTLIST MediaCodec type CDATA>
 <!ELEMENT Type EMPTY>
@@ -78,19 +75,20 @@ Only the three quirks included above are recognized at this point:
 -->
 
 <MediaCodecs>
-    <Encoders>
-        <MediaCodec name="OMX.Intel.hw_ve.h264" type="video/avc" >
-            <Limit name="size" min="176x144" max="3840x2160" />
+    <Decoders>
+
+
+        <MediaCodec name="OMX.Intel.hw_vd.h264" type="video/avc" >
+            <!-- profiles and levels:  ProfileBaseline : Level51 -->
+            <Limit name="size" min="64x64" max="3840x2160" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" range="1-972000" />
             <Limit name="bitrate" range="1-40000000" />
+            <Feature name="adaptive-playback" />
         </MediaCodec>
-    </Encoders>
 
-    <Decoders>
-        <MediaCodec name="OMX.Intel.hw_vd.h264" type="video/avc" >
-            <!-- profiles and levels:  ProfileBaseline : Level51 -->
+        <MediaCodec name="OMX.Intel.hw_vd.vp8" type="video/x-vnd.on2.vp8" >
             <Limit name="size" min="64x64" max="3840x2160" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -98,17 +96,17 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-40000000" />
             <Feature name="adaptive-playback" />
         </MediaCodec>
-        <MediaCodec name="OMX.Intel.hw_vd.h264.secure" type="video/avc">
-            <!-- profiles and levels:  ProfileBaseline : Level51 -->
+
+        <MediaCodec name="OMX.Intel.hw_vd.vp9" type="video/x-vnd.on2.vp9" >
             <Limit name="size" min="64x64" max="3840x2160" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" range="1-972000" />
             <Limit name="bitrate" range="1-40000000" />
             <Feature name="adaptive-playback" />
-            <Feature name="secure-playback" required="true" />
         </MediaCodec>
-        <MediaCodec name="OMX.Intel.hw_vd.vp8" type="video/x-vnd.on2.vp8" >
+
+        <MediaCodec name="OMX.Intel.hw_vd.h265" type="video/hevc" >
             <Limit name="size" min="64x64" max="3840x2160" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -116,24 +114,27 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-40000000" />
             <Feature name="adaptive-playback" />
         </MediaCodec>
-        <MediaCodec name="OMX.Intel.hw_vd.vp9" type="video/x-vnd.on2.vp9" >
-            <Limit name="size" min="64x64" max="3840x2160" />
+
+
+    </Decoders>
+
+    <Encoders>
+        <MediaCodec name="OMX.Intel.hw_ve.h264" type="video/avc" >
+            <Limit name="size" min="176x144" max="3840x2160" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" range="1-972000" />
             <Limit name="bitrate" range="1-40000000" />
-            <Feature name="adaptive-playback" />
         </MediaCodec>
-        <MediaCodec name="OMX.Intel.hw_vd.h265" type="video/hevc" >
+
+        <MediaCodec name="OMX.Intel.hw_ve.h265" type="video/hevc" >
             <Limit name="size" min="64x64" max="3840x2160" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" range="1-972000" />
             <Limit name="bitrate" range="1-40000000" />
-            <Feature name="adaptive-playback" />
         </MediaCodec>
-    </Decoders>
-
+    </Encoders>
     <Include href="media_codecs_google_video.xml" />
     <Include href="media_codecs_google_audio.xml" />
     <Settings>
diff --git a/common/media/media_codecs_performance.xml b/common/media/media_codecs_performance.xml
index 848f6dc5c..d5e55c33b 100644
--- a/common/media/media_codecs_performance.xml
+++ b/common/media/media_codecs_performance.xml
@@ -17,13 +17,13 @@
 <MediaCodecs>
     <Decoders>
         <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="600-2500" />
+            <Limit name="measured-frame-rate-176x144" range="600-800" />
         </MediaCodec>
         <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
             <Limit name="measured-frame-rate-320x240" range="530-590" />
             <Limit name="measured-frame-rate-720x480" range="170-190" />
-            <Limit name="measured-frame-rate-1280x720" range="50-130" />
-            <Limit name="measured-frame-rate-1920x1080" range="20-60" />
+            <Limit name="measured-frame-rate-1280x720" range="50-55" />
+            <Limit name="measured-frame-rate-1920x1080" range="20-22" />
         </MediaCodec>
         <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
             <Limit name="measured-frame-rate-352x288" range="450-510" />
@@ -33,19 +33,19 @@
             <Limit name="measured-frame-rate-1920x1080" range="40-50" />
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="1200-3700" />
+            <Limit name="measured-frame-rate-176x144" range="600-800" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
             <Limit name="measured-frame-rate-320x180" range="860-930" />
             <Limit name="measured-frame-rate-640x360" range="290-320" />
-            <Limit name="measured-frame-rate-1280x720" range="65-180" />
+            <Limit name="measured-frame-rate-1280x720" range="65-70" />
             <Limit name="measured-frame-rate-1920x1080" range="25-30" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
-            <Limit name="measured-frame-rate-320x180" range="530-1600" />
-            <Limit name="measured-frame-rate-640x360" range="220-620" />
-            <Limit name="measured-frame-rate-1280x720" range="80-230" />
-            <Limit name="measured-frame-rate-1920x1080" range="45-150" />
+            <Limit name="measured-frame-rate-320x180" range="530-600" />
+            <Limit name="measured-frame-rate-640x360" range="220-240" />
+            <Limit name="measured-frame-rate-1280x720" range="80-100" />
+            <Limit name="measured-frame-rate-1920x1080" range="45-55" />
         </MediaCodec>
         <MediaCodec name="OMX.Intel.hw_vd.h264" type="video/avc" update="true">
             <Limit name="measured-frame-rate-320x240" range="740-980" />
@@ -83,21 +83,21 @@
             <Limit name="measured-frame-rate-1920x1080" range="30-35" />
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="710-1905" />
+            <Limit name="measured-frame-rate-176x144" range="710-790" />
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="750-2025" />
+            <Limit name="measured-frame-rate-176x144" range="750-830" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="120-680" />
-            <Limit name="measured-frame-rate-640x360" range="95-280" />
+            <Limit name="measured-frame-rate-320x180" range="120-150" />
+            <Limit name="measured-frame-rate-640x360" range="95-110" />
             <Limit name="measured-frame-rate-1280x720" range="32-38" />
             <Limit name="measured-frame-rate-1920x1080" range="22-25" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp9.encoder" type="video/x-vnd.on2.vp9" update="true">
-            <Limit name="measured-frame-rate-320x180" range="220-560" />
-            <Limit name="measured-frame-rate-640x360" range="180-195" />
-            <Limit name="measured-frame-rate-1280x720" range="40-50" />
+            <Limit name="measured-frame-rate-320x180" range="96-106" />
+            <Limit name="measured-frame-rate-640x360" range="39-39" />
+            <Limit name="measured-frame-rate-1280x720" range="7-9" />
         </MediaCodec>
         <MediaCodec name="OMX.Intel.hw_ve.h264" type="video/avc" update="true">
             <Limit name="measured-frame-rate-320x240" range="260-300" />
diff --git a/common/media/mfx_omxil_core.conf b/common/media/mfx_omxil_core.conf
index ae9a65a91..64c9d833e 100644
--- a/common/media/mfx_omxil_core.conf
+++ b/common/media/mfx_omxil_core.conf
@@ -1,3 +1,6 @@
 OMX.Intel.hw_vd.h264 : libmfx_omx_components_hw.so
 OMX.Intel.hw_ve.h264 : libmfx_omx_components_hw.so
 OMX.Intel.hw_vd.h265 : libmfx_omx_components_hw.so
+OMX.Intel.hw_ve.h265 : libmfx_omx_components_hw.so
+OMX.Intel.hw_vd.vp8 : libmfx_omx_components_hw.so
+OMX.Intel.hw_vd.vp9 : libmfx_omx_components_hw.so

From d97bd87cc7ac26baecd9702bec73f4b540d04bf9 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Thu, 2 Aug 2018 09:33:28 +0530
Subject: [PATCH 288/427] [MIXINUP] Revert BoardCongfig: Add option to indicate
 video driver #36

Tracked-On: None
Signed-off-by: Swaroop Balan <swaroop.balan@intel.com>
---
 cel_apl/BoardConfig.mk | 1 -
 celadon/BoardConfig.mk | 1 -
 2 files changed, 2 deletions(-)

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index dc8ae1021..40263f572 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -25,7 +25,6 @@ USE_OPENGL_RENDERER := true
 NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
 USE_INTEL_UFO_DRIVER := false
 INTEL_VA := false
-HWC_DISABLE_VA_DRIVER := true
 BOARD_GRAPHIC_IS_GEN := true
 BOARD_GPU_DRIVERS := i965
 BOARD_USE_MESA := true
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index c85faccfd..f39f398dc 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -25,7 +25,6 @@ USE_OPENGL_RENDERER := true
 NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
 USE_INTEL_UFO_DRIVER := false
 INTEL_VA := false
-HWC_DISABLE_VA_DRIVER := true
 BOARD_GRAPHIC_IS_GEN := true
 BOARD_GPU_DRIVERS := i965
 BOARD_USE_MESA := true

From ea745868a58cd48c9a86cf1dfda97f8e8e8094b4 Mon Sep 17 00:00:00 2001
From: Ming Tan <ming.tan@intel.com>
Date: Wed, 18 Jul 2018 21:13:48 +0800
Subject: [PATCH 289/427] Fix the error when use PFT in Joule.

Set the fastboot_min_battery_level = false in mixins.spec.
The old code set fastboot_min_battery_level=3500, but the Joule and NUC
do not support battery.

Jira: https://01.org/jira/browse/CEL-29
Test: Test it in Joule, can use PFT now.
      Since KBL NUC does not support PFT now, need not to test it.

Signed-off-by: Ming Tan <ming.tan@intel.com>
---
 cel_apl/mixins.spec | 2 +-
 celadon/mixins.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cel_apl/mixins.spec b/cel_apl/mixins.spec
index 6404f7c01..70f108c38 100644
--- a/cel_apl/mixins.spec
+++ b/cel_apl/mixins.spec
@@ -38,7 +38,7 @@ debug-logs: true
 debug-coredump: true
 debug-phonedoctor: true
 debug-tools: true
-flashfiles: ini(oemvars=false,version=3.0,fastboot_min_battery_level=3500,installer=true)
+flashfiles: ini(oemvars=false,version=3.0,fastboot_min_battery_level=false,installer=true)
 midi: true
 trusty: true(ref_target=project-celadon_64)
 slcan: default
diff --git a/celadon/mixins.spec b/celadon/mixins.spec
index 0b69fb210..ae83e8e63 100644
--- a/celadon/mixins.spec
+++ b/celadon/mixins.spec
@@ -39,7 +39,7 @@ debug-logs: true
 debug-coredump: true
 debug-phonedoctor: true
 debug-tools: true
-flashfiles: ini(oemvars=false,version=3.0,fastboot_min_battery_level=3500,installer=true)
+flashfiles: ini(oemvars=false,version=3.0,fastboot_min_battery_level=false,installer=true)
 midi: true
 trusty: true(ref_target=project-celadon_64)
 slcan: default

From 9a7682255f438a5ddbca413f650da0b6c2499764 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Thu, 2 Aug 2018 09:38:48 +0530
Subject: [PATCH 290/427] [MIXINUP] Fix the error when use PFT in Joule. #25

Tracked-On: None
Signed-off-by: Swaroop Balan <swaroop.balan@intel.com>
---
 cel_apl/flashfiles.ini | 35 -----------------------------------
 celadon/flashfiles.ini | 35 -----------------------------------
 2 files changed, 70 deletions(-)

diff --git a/cel_apl/flashfiles.ini b/cel_apl/flashfiles.ini
index 51076a5ef..af6f0e18e 100644
--- a/cel_apl/flashfiles.ini
+++ b/cel_apl/flashfiles.ini
@@ -59,41 +59,6 @@ name = Disable capsule update
 description = Disable capsule update by deleting the capsule file from the ESP partition
 default = false
 
-[output.flash.json]
-fastboot-command-preconditions += battery
-
-[parameter.battery]
-name = battery
-type = variable
-tool = fastboot
-arg = getvar battery-voltage
-description = Fetch battery
-computedValue = $1
-filter = battery-voltage:[\s]*([0-9]+)mV
-value = 3500
-
-# The command.battery will be called before each fastboot command to get the battery level
-[group.check-battery]
-name = Check battery level
-description = Check battery level before sending fastboot command
-default = true
-
-[command.battery]
-tool = setVariable
-variable = battery
-description = Get battery level
-group = check-battery
-mandatory = false
-defaultValue = 3500
-
-# The precondition.battery will be checked before each fastboot command to ensure that battery
-# level is above the specified threshold
-[precondition.battery]
-tool = fastboot
-exception = bootstrap
-description = Check battery level: ${battery}mV
-expression = ${battery} >= 3500
-skipOnFailure = false
 [command.unlock.unlock]
 tool = fastboot
 args = flashing unlock
diff --git a/celadon/flashfiles.ini b/celadon/flashfiles.ini
index 51076a5ef..af6f0e18e 100644
--- a/celadon/flashfiles.ini
+++ b/celadon/flashfiles.ini
@@ -59,41 +59,6 @@ name = Disable capsule update
 description = Disable capsule update by deleting the capsule file from the ESP partition
 default = false
 
-[output.flash.json]
-fastboot-command-preconditions += battery
-
-[parameter.battery]
-name = battery
-type = variable
-tool = fastboot
-arg = getvar battery-voltage
-description = Fetch battery
-computedValue = $1
-filter = battery-voltage:[\s]*([0-9]+)mV
-value = 3500
-
-# The command.battery will be called before each fastboot command to get the battery level
-[group.check-battery]
-name = Check battery level
-description = Check battery level before sending fastboot command
-default = true
-
-[command.battery]
-tool = setVariable
-variable = battery
-description = Get battery level
-group = check-battery
-mandatory = false
-defaultValue = 3500
-
-# The precondition.battery will be checked before each fastboot command to ensure that battery
-# level is above the specified threshold
-[precondition.battery]
-tool = fastboot
-exception = bootstrap
-description = Check battery level: ${battery}mV
-expression = ${battery} >= 3500
-skipOnFailure = false
 [command.unlock.unlock]
 tool = fastboot
 args = flashing unlock

From 17ce2ca9ee211ec841e826260fa7c62bf3aab9ee Mon Sep 17 00:00:00 2001
From: Rakesh Reddy <rakeshx.reddy@intel.com>
Date: Thu, 2 Aug 2018 12:12:21 +0530
Subject: [PATCH 291/427] [CELADON] Upgrading kernel defconfig to 4.14.59

Tracked-On: None
Signed-off-by: Rakesh Reddy <rakeshx.reddy@intel.com>
---
 kernel_config/kernel_64_defconfig | 44 +++++++++++++------------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 0c66ba1f7..a4899fdf7 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.14.52 Kernel Configuration
+# Linux/x86_64 4.14.59 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -147,6 +147,13 @@ CONFIG_LOG_BUF_SHIFT=17
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+
+#
+# FAIR Scheuler tunables
+#
+CONFIG_PELT_UTIL_HALFLIFE_32=y
+# CONFIG_PELT_UTIL_HALFLIFE_16 is not set
+# CONFIG_PELT_UTIL_HALFLIFE_8 is not set
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_ARCH_SUPPORTS_INT128=y
@@ -1605,7 +1612,6 @@ CONFIG_VIRTIO_BLK=y
 # CONFIG_BLK_DEV_RSXX is not set
 CONFIG_NVME_CORE=y
 CONFIG_BLK_DEV_NVME=y
-
 # CONFIG_NVME_FC is not set
 # CONFIG_NVME_TARGET is not set
 
@@ -1672,6 +1678,7 @@ CONFIG_ALTERA_STAPL=m
 # CONFIG_INTEL_MEI is not set
 # CONFIG_INTEL_MEI_ME is not set
 # CONFIG_INTEL_MEI_TXE is not set
+# CONFIG_INTEL_MEI_VIRTIO is not set
 CONFIG_VMWARE_VMCI=m
 
 #
@@ -3087,6 +3094,7 @@ CONFIG_HANGCHECK_TIMER=m
 CONFIG_RPMB=y
 # CONFIG_RPMB_INTF_DEV is not set
 # CONFIG_RPMB_SIM is not set
+# CONFIG_VIRTIO_RPMB is not set
 
 #
 # I2C support
@@ -3609,6 +3617,7 @@ CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 # CONFIG_I6300ESB_WDT is not set
 # CONFIG_IE6XX_WDT is not set
 CONFIG_ITCO_WDT=y
+# CONFIG_ITCO_NO_NMI_INTR is not set
 # CONFIG_ITCO_VENDOR_SUPPORT is not set
 # CONFIG_IT8712F_WDT is not set
 # CONFIG_IT87_WDT is not set
@@ -5032,7 +5041,7 @@ CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 CONFIG_SND_SOC_COMPRESS=y
 CONFIG_SND_SOC_TOPOLOGY=y
-CONFIG_SND_SOC_ACPI=m
+CONFIG_SND_SOC_ACPI=y
 # CONFIG_SND_SOC_AMD_ACP is not set
 CONFIG_SND_ATMEL_SOC=m
 CONFIG_SND_DESIGNWARE_I2S=m
@@ -5054,17 +5063,17 @@ CONFIG_SND_DESIGNWARE_I2S=m
 # CONFIG_SND_I2S_HI6210_I2S is not set
 # CONFIG_SND_SOC_IMG is not set
 CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
-CONFIG_SND_SST_IPC=m
-CONFIG_SND_SST_IPC_ACPI=m
+CONFIG_SND_SST_IPC=y
+CONFIG_SND_SST_IPC_ACPI=y
 CONFIG_SND_SOC_INTEL_SST_ACPI=m
 CONFIG_SND_SOC_INTEL_SST=m
 CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m
 CONFIG_SND_SOC_INTEL_HASWELL=m
-# CONFIG_SND_SOC_INTEL_BAYTRAIL is not set
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=y
 # CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI is not set
-CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=y
 CONFIG_SND_SOC_INTEL_SKYLAKE=m
-CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
+CONFIG_SND_SOC_ACPI_INTEL_MATCH=y
 CONFIG_SND_SOC_INTEL_MACH=y
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
@@ -5080,22 +5089,6 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
 # CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH is not set
 # CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXT_TDF8532_MACH is not set
-# CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH is not set
-# CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH is not set
-# CONFIG_SND_SOC_INTEL_CNL_FPGA is not set
-# CONFIG_SND_SOC_INTEL_CNL_CS42L42_MACH is not set
-# CONFIG_SND_SOC_INTEL_CNL_RT700_MACH is not set
-# CONFIG_SND_SOC_INTEL_CNL_SVFPGA_MACH is not set
-# CONFIG_SND_SOC_INTEL_CNL_RT274_MACH is not set
-# CONFIG_SND_SOC_SDW_AGGM1M2 is not set
-# CONFIG_SND_SOC_INTEL_BXT_ULL_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXTP_IVI_RSE_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXTP_IVI_HU_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXTP_IVI_M3_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXTP_IVI_GENERIC_MACH is not set
 CONFIG_SND_SOC_SOF=m
 # CONFIG_SND_SOC_SOF_NOCODEC is not set
 # CONFIG_SND_SOC_SOF_INTEL is not set
@@ -5968,11 +5961,11 @@ CONFIG_HYPER_DMABUF_SYSFS=y
 # CONFIG_HYPER_DMABUF_EVENT_GEN is not set
 CONFIG_DCA=m
 # CONFIG_AUXDISPLAY is not set
-CONFIG_CHARLCD=m
 CONFIG_PANEL=m
 CONFIG_PANEL_PARPORT=0
 CONFIG_PANEL_PROFILE=5
 # CONFIG_PANEL_CHANGE_MESSAGE is not set
+CONFIG_CHARLCD=m
 CONFIG_UIO=m
 # CONFIG_UIO_CIF is not set
 # CONFIG_UIO_PDRV_GENIRQ is not set
@@ -7487,7 +7480,6 @@ CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_KHAZAD=m
 # CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SALSA20_X86_64 is not set
 # CONFIG_CRYPTO_CHACHA20 is not set
 # CONFIG_CRYPTO_CHACHA20_X86_64 is not set
 # CONFIG_CRYPTO_SEED is not set

From 50ccc2045ff6ce0c6413621b9f15f8619976005a Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Wed, 8 Aug 2018 12:21:21 +0530
Subject: [PATCH 292/427] [CELADON] Mixins changes for trusty and sepolicy 
 made permissive

Tracked-On: None
---
 cel_apl/mixins.spec | 7 ++++---
 celadon/mixins.spec | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/cel_apl/mixins.spec b/cel_apl/mixins.spec
index 70f108c38..d2a50aeb7 100644
--- a/cel_apl/mixins.spec
+++ b/cel_apl/mixins.spec
@@ -7,7 +7,7 @@ product.mk: device.mk
 [groups]
 2ndstage: oemvars
 project-celadon: default
-sepolicy: enforcing
+sepolicy: permissive
 graphics: project-celadon(gen9+=true,hwc2=true,vulkan=false,drmhwc=false,minigbm=true,gralloc1=true)
 media: project-celadon(mediasdk=false,media_sdk_source=false)
 device-type: car
@@ -19,7 +19,7 @@ usb-gadget: g_ffs
 adb_net: true
 kernel: project-celadon(loglevel=3, disable_cpuidle_on_boot=true)
 bluetooth: btusb (ivi=true)
-boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true)
+boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true)
 audio: project-celadon
 wlan: iwlwifi
 cpu-arch: skl
@@ -33,6 +33,7 @@ thermal: dptf(intel_modem=true)
 config-partition: enabled
 vendor-partition: true
 factory-partition: true
+pstore: ram_dummy(address=0x50000000,size=0x400000,record_size=0x4000,console_size=0x200000,ftrace_size=0x2000,dump_oops=1)
 debug-crashlogd: true
 debug-logs: true
 debug-coredump: true
@@ -40,7 +41,7 @@ debug-phonedoctor: true
 debug-tools: true
 flashfiles: ini(oemvars=false,version=3.0,fastboot_min_battery_level=false,installer=true)
 midi: true
-trusty: true(ref_target=project-celadon_64)
+trusty: false
 slcan: default
 ioc-slcan-reboot: false
 camera: usbcamera
diff --git a/celadon/mixins.spec b/celadon/mixins.spec
index ae83e8e63..b57e5b6bc 100644
--- a/celadon/mixins.spec
+++ b/celadon/mixins.spec
@@ -7,7 +7,7 @@ product.mk: device.mk
 [groups]
 2ndstage: oemvars
 project-celadon: default
-sepolicy: enforcing
+sepolicy: permissive
 graphics: project-celadon(gen9+=true,hwc2=true,vulkan=false,drmhwc=false,minigbm=true,gralloc1=true)
 media: project-celadon(mediasdk=false,media_sdk_source=false)
 device-type: tablet
@@ -19,7 +19,7 @@ usb-gadget: g_ffs
 adb_net: true
 kernel: project-celadon(loglevel=3, disable_cpuidle_on_boot=true)
 bluetooth: btusb
-boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true)
+boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true)
 audio: project-celadon
 wlan: iwlwifi
 cpu-arch: skl
@@ -41,7 +41,7 @@ debug-phonedoctor: true
 debug-tools: true
 flashfiles: ini(oemvars=false,version=3.0,fastboot_min_battery_level=false,installer=true)
 midi: true
-trusty: true(ref_target=project-celadon_64)
+trusty: false
 slcan: default
 ioc-slcan-reboot: false
 camera: usbcamera

From 4d7f19d981cd69e61026d75f394233d0d8e26f06 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Wed, 8 Aug 2018 12:23:53 +0530
Subject: [PATCH 293/427] [MIXINS_P] Mixins changes for trusty and sepolicy  
 made permissive

Tracked-On : None
---
 cel_apl/AndroidBoard.mk | 49 --------------------------
 cel_apl/BoardConfig.mk  | 78 ++++++++++++++++++-----------------------
 cel_apl/device.mk       | 35 +++---------------
 cel_apl/flashfiles.ini  |  5 ---
 cel_apl/fstab           |  3 +-
 cel_apl/gpt.ini         |  8 +----
 cel_apl/init.rc         | 36 ++++++++++---------
 cel_apl/ueventd.rc      |  4 ---
 celadon/AndroidBoard.mk | 49 --------------------------
 celadon/BoardConfig.mk  | 51 ++++-----------------------
 celadon/device.mk       | 30 ----------------
 celadon/flashfiles.ini  |  5 ---
 celadon/fstab           |  3 +-
 celadon/gpt.ini         |  8 +----
 celadon/init.rc         | 17 ---------
 celadon/ueventd.rc      |  4 ---
 16 files changed, 69 insertions(+), 316 deletions(-)

diff --git a/cel_apl/AndroidBoard.mk b/cel_apl/AndroidBoard.mk
index cc4520d96..e71065e49 100644
--- a/cel_apl/AndroidBoard.mk
+++ b/cel_apl/AndroidBoard.mk
@@ -439,55 +439,6 @@ $(provdata_zip): $(provdata_zip_deps) | $(ACP)
 
 INSTALLED_RADIOIMAGE_TARGET += $(provdata_zip)
 
-##############################################################
-# Source: device/intel/mixins/groups/trusty/true/AndroidBoard.mk
-##############################################################
-TOS_IMAGE_TARGET := $(TRUSTY_BUILDROOT)/evmm_lk_pkg.bin
-
-INTERNAL_PLATFORM := ikgt
-LOCAL_MAKE := make
-
-# Build the evmm_pkg.bin and lk.bin
-.PHONY: $(TOS_IMAGE_TARGET)
-$(TOS_IMAGE_TARGET):
-	@echo "making lk.bin.."
-	$(hide) (cd $(TOPDIR)trusty && $(TRUSTY_ENV_VAR) $(LOCAL_MAKE) sand-x86-64)
-	@echo "making tos image.."
-	$(hide) (cd $(TOPDIR)vendor/intel/fw/evmm/$(INTERNAL_PLATFORM) && $(TRUSTY_ENV_VAR) $(LOCAL_MAKE))
-
-#tos partition is assigned for trusty
-INSTALLED_TOS_IMAGE_TARGET := $(PRODUCT_OUT)/tos.img
-TOS_SIGNING_KEY := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8
-TOS_SIGNING_CERT := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem
-
-.PHONY: tosimage
-tosimage: $(INSTALLED_TOS_IMAGE_TARGET)
-
-ifeq (true,$(BOARD_AVB_ENABLE)) # BOARD_AVB_ENABLE == true
-$(INSTALLED_TOS_IMAGE_TARGET): $(TOS_IMAGE_TARGET) $(MKBOOTIMG) $(AVBTOOL)
-	@echo "mkbootimg to create boot image for TOS file: $@"
-	$(hide) $(MKBOOTIMG) --kernel $(TOS_IMAGE_TARGET) --output $@
-	$(hide) $(AVBTOOL) add_hash_footer \
-		--image $@ \
-		--partition_size $(BOARD_TOSIMAGE_PARTITION_SIZE) \
-		--partition_name tos $(INTERNAL_AVB_SIGNING_ARGS)
-BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --include_descriptors_from_image $(INSTALLED_TOS_IMAGE_TARGET)
-$(PRODUCT_OUT)/vbmeta.img: $(INSTALLED_TOS_IMAGE_TARGET)
-else
-$(INSTALLED_TOS_IMAGE_TARGET): $(TOS_IMAGE_TARGET) $(MKBOOTIMG) $(BOOT_SIGNER)
-	@echo "mkbootimg to create boot image for TOS file: $@"
-	$(hide) $(MKBOOTIMG) --kernel $(TOS_IMAGE_TARGET) --output $@
-	$(if $(filter true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_BOOT_SIGNER)),\
-		@echo "sign prebuilt TOS file: $@" &&\
-		$(BOOT_SIGNER) /tos $@ $(TOS_SIGNING_KEY) $(TOS_SIGNING_CERT) $@)
-endif
-
-INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_TOS_IMAGE_TARGET)
-
-make_dir_ab_tos:
-	@mkdir -p $(PRODUCT_OUT)/root/tos
-
-$(PRODUCT_OUT)/ramdisk.img: make_dir_ab_tos
 ##############################################################
 # Source: device/intel/mixins/groups/gptbuild/true/AndroidBoard.mk
 ##############################################################
diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index 40263f572..ef5c7370e 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -10,7 +10,13 @@ BOARD_OEM_VARS += $(TARGET_DEVICE_DIR)/oemvars.txt
 ##############################################################
 KERNEL_CROSS_COMPILE_WRAPPER := x86_64-linux-android-
 ##############################################################
-# Source: device/intel/mixins/groups/sepolicy/enforcing/BoardConfig.mk
+# Source: device/intel/mixins/groups/sepolicy/permissive/BoardConfig.mk.1
+##############################################################
+# start kernel in permissive mode, this way we don't
+# need 'setenforce 0' from init.rc files
+BOARD_KERNEL_CMDLINE += enforcing=0 androidboot.selinux=permissive
+##############################################################
+# Source: device/intel/mixins/groups/sepolicy/permissive/BoardConfig.mk
 ##############################################################
 # SELinux Policy
 BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy
@@ -236,8 +242,6 @@ BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/unlock_device.nsh
 BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/efivar_oemlock
 BOARD_FLASHFILES += $(PRODUCT_OUT)/bootloader
 BOARD_FLASHFILES += $(PRODUCT_OUT)/fastboot-usb.img
-BOARD_FLASHFILES += $(PRODUCT_OUT)/tos.img
-AB_OTA_PARTITIONS += tos
 
 # -- OTA RELATED DEFINES --
 # tell build system where to get the recovery.fstab.
@@ -370,6 +374,33 @@ WITH_DEXPREOPT_PIC := true
 BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/thermal
 BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/thermal/dptf
 BOARD_KERNEL_CMDLINE += thermal.off=1
+##############################################################
+# Source: device/intel/mixins/groups/pstore/ram_dummy/BoardConfig.mk.1
+##############################################################
+BOARD_KERNEL_CMDLINE += pstore.backend=ramoops
+##############################################################
+# Source: device/intel/mixins/groups/pstore/ram_dummy/BoardConfig.mk.2
+##############################################################
+BOARD_SEPOLICY_DIRS += device/intel/sepolicy/pstore
+##############################################################
+# Source: device/intel/mixins/groups/pstore/ram_dummy/BoardConfig.mk
+##############################################################
+BOARD_KERNEL_CMDLINE += \
+	memmap=0x400000\$$0x50000000 \
+	ramoops.mem_address=0x50000000 \
+	ramoops.mem_size=0x400000
+BOARD_KERNEL_CMDLINE += \
+	ramoops.record_size=0x4000
+
+BOARD_KERNEL_CMDLINE += \
+	ramoops.console_size=0x200000
+
+BOARD_KERNEL_CMDLINE += \
+	ramoops.ftrace_size=0x2000
+
+BOARD_KERNEL_CMDLINE += \
+	ramoops.dump_oops=1
+
 ##############################################################
 # Source: device/intel/mixins/groups/debug-phonedoctor/true/BoardConfig.mk
 ##############################################################
@@ -383,47 +414,6 @@ USE_INTEL_FLASHFILES := true
 VARIANT_SPECIFIC_FLASHFILES ?= false
 FAST_FLASHFILES := true
 
-##############################################################
-# Source: device/intel/mixins/groups/trusty/true/BoardConfig.mk
-##############################################################
-TARGET_USE_TRUSTY := true
-
-KM_VERSION := 2
-ifeq ($(KM_VERSION),1)
-BOARD_USES_TRUSTY := true
-BOARD_USES_KEYMASTER1 := true
-endif
-
-BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/trusty
-BOARD_SEPOLICY_M4DEFS += module_trusty=true
-
-LK_PRODUCT := project-celadon_64
-
-LKBUILD_TOOLCHAIN_ROOT = $(PWD)/vendor/intel/external/prebuilts/elf/
-LKBUILD_X86_TOOLCHAIN =
-LKBUILD_X64_TOOLCHAIN = $(LKBUILD_TOOLCHAIN_ROOT)x86_64-elf-4.9.1-Linux-x86_64/bin
-EVMMBUILD_TOOLCHAIN ?= x86_64-linux-android-
-TRUSTY_BUILDROOT = $(PWD)/$(PRODUCT_OUT)/obj/trusty/
-
-TRUSTY_ENV_VAR += LK_CORE_NUM=1
-TRUSTY_ENV_VAR += TRUSTY_REF_TARGET=project-celadon_64
-
-#for trusty lk
-TRUSTY_ENV_VAR += BUILDROOT=$(TRUSTY_BUILDROOT)
-TRUSTY_ENV_VAR += PATH=$(PATH):$(LKBUILD_X86_TOOLCHAIN):$(LKBUILD_X64_TOOLCHAIN)
-
-#for trusty vmm
-# use same toolchain as android kernel
-TRUSTY_ENV_VAR += COMPILE_TOOLCHAIN=$(EVMMBUILD_TOOLCHAIN)
-
-# output build dir to android out folder
-TRUSTY_ENV_VAR += BUILD_DIR=$(TRUSTY_BUILDROOT)
-TRUSTY_ENV_VAR += LKBIN_DIR=$(TRUSTY_BUILDROOT)/build-sand-x86-64/
-
-#Workaround CPU lost issue on SIMICS, will remove this line below after PO.
-BOARD_KERNEL_CMDLINE += cpu_init_udelay=500000
-
-BOARD_TOSIMAGE_PARTITION_SIZE := 10485760
 ##############################################################
 # Source: device/intel/mixins/groups/camera/usbcamera/BoardConfig.mk
 ##############################################################
diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 8e509e98f..88315b77e 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -567,6 +567,11 @@ PRODUCT_PACKAGES += esif_ufd \
     jhs
 PRODUCT_COPY_FILES += $(LOCAL_PATH)/dptf.dv:/system/etc/dptf/dv/dptf.dv
 ##############################################################
+# Source: device/intel/mixins/groups/pstore/ram_dummy/product.mk
+##############################################################
+PRODUCT_PACKAGES += \
+    pstore-clean
+##############################################################
 # Source: device/intel/mixins/groups/debug-logs/true/product.mk
 ##############################################################
 ifneq ($(TARGET_BUILD_VARIANT),user)
@@ -651,36 +656,6 @@ PRODUCT_PACKAGES_DEBUG += \
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.midi.xml:system/etc/permissions/android.software.midi.xml
 ##############################################################
-# Source: device/intel/mixins/groups/trusty/true/product.mk
-##############################################################
-
-KM_VERSION := 2
-
-ifeq ($(KM_VERSION),2)
-PRODUCT_PACKAGES += \
-	keystore.trusty
-PRODUCT_PROPERTY_OVERRIDES += \
-	ro.hardware.keystore=trusty
-endif
-
-ifeq ($(KM_VERSION),1)
-PRODUCT_PACKAGES += \
-	keystore.project-celadon
-endif
-
-PRODUCT_PACKAGES += \
-	libtrusty \
-	storageproxyd \
-	libtrustystorage \
-	libtrustystorageinterface \
-	gatekeeper.trusty \
-	android.hardware.gatekeeper@1.0-impl \
-	android.hardware.gatekeeper@1.0-service
-
-PRODUCT_PROPERTY_OVERRIDES += \
-	ro.hardware.gatekeeper=trusty
-
-##############################################################
 # Source: device/intel/mixins/groups/memtrack/true/product.mk
 ##############################################################
 # memtrack HAL
diff --git a/cel_apl/flashfiles.ini b/cel_apl/flashfiles.ini
index af6f0e18e..ab26dba9a 100644
--- a/cel_apl/flashfiles.ini
+++ b/cel_apl/flashfiles.ini
@@ -111,11 +111,6 @@ file = images:vbmeta.img
 description = Flash vbmeta_a partition
 
 
-[command.flash.tos_a]
-tool = fastboot
-args = flash tos_a $file
-file = radio:tos.img
-description = Flash tos_a partition
 
 
 [command.flash.boot_a]
diff --git a/cel_apl/fstab b/cel_apl/fstab
index 842315754..0779c05ca 100644
--- a/cel_apl/fstab
+++ b/cel_apl/fstab
@@ -38,12 +38,11 @@
 
 # If enable AVB and A/B slot, then will mount system partition as / through /dev/dm-0
 /dev/block/by-name/system       /               ext4    ro                                                          wait,slotselect,avb
-/dev/block/by-name/data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts,quota
+/dev/block/by-name/data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,quota
 /dev/block/by-name/boot         /boot           emmc    defaults                                                    defaults,slotselect,avb
 /dev/block/by-name/misc         /misc           emmc    defaults                                                    defaults
 /dev/block/by-name/bootloader   /bootloader     emmc    defaults                                                    recoveryonly
 /dev/block/by-name/bootloader2  /bootloader2    emmc    defaults                                                    recoveryonly
 /dev/block/by-name/persistent   /persistent     emmc    defaults                                                    defaults
 /dev/block/by-name/metadata     /metadata       emmc    defaults                                                    defaults
-/dev/block/by-name/tos          /tos            emmc    defaults                                                    defaults,slotselect,avb
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/cel_apl/gpt.ini b/cel_apl/gpt.ini
index 10f6ab812..04c6c0025 100644
--- a/cel_apl/gpt.ini
+++ b/cel_apl/gpt.ini
@@ -4,7 +4,7 @@
 # Source: device/intel/mixins/groups/boot-arch/project-celadon/gpt.ini
 ##############################################################
 [base]
-partitions = bootloader bootloader2 boot  misc metadata system persistent vendor config factory tos vbmeta teedata data
+partitions = bootloader bootloader2 boot  misc metadata system persistent vendor config factory  vbmeta teedata data
 device = auto
 nb_slot = 2
 
@@ -82,12 +82,6 @@ len = 10
 type = linux
 guid = 8f68cc74-c5e5-48da-be91-a0c8c15e9c80
 
-[partition.tos]
-label = tos
-len = 10
-type = boot
-has_slot = true
-guid = 52cd00fd-f5b0-4061-b3a5-65b07f2179f0
 
 [partition.vbmeta]
 label = vbmeta
diff --git a/cel_apl/init.rc b/cel_apl/init.rc
index f2a3516da..217a41db3 100644
--- a/cel_apl/init.rc
+++ b/cel_apl/init.rc
@@ -602,6 +602,25 @@ on boot
     chown system system /sys/class/powercap/intel-rapl:0/constraint_0_power_limit_uw
     restorecon_recursive /sys/class/powercap
 ##############################################################
+# Source: device/intel/mixins/groups/pstore/ram_dummy/init.rc
+##############################################################
+on fs
+    mkdir /dev/pstore 0700 5001 root
+    mount pstore pstore /dev/pstore
+
+on post-fs-data
+   mkdir /data/dontpanic 0770 root log
+
+service pstore-clean /system/vendor/bin/pstore-clean
+    user 5001
+    group root log
+    class late_start
+    oneshot
+
+on property:init.svc.pstore-clean=stopped
+    umount /dev/pstore
+    rmdir /dev/pstore
+##############################################################
 # Source: device/intel/mixins/groups/debug-logs/true/init.rc
 ##############################################################
 import /init.logs.rc
@@ -633,23 +652,6 @@ on property:sys.usb.config=midi,adb
     start adbd
     setprop sys.usb.state ${sys.usb.config}
 ##############################################################
-# Source: device/intel/mixins/groups/trusty/true/init.rc
-##############################################################
-on fs
-    # Update device node r/w attribute
-    chown system system /dev/trusty-ipc-dev0
-    chmod 666 /dev/trusty-ipc-dev0
-
-on post-fs-data
-    mkdir /data/misc/securestorage 0700 system system
-    chmod 666 /dev/rpmb0
-
-service storageproxyd /vendor/bin/storageproxyd -d /dev/trusty-ipc-dev0 -p /data/misc/securestorage -r /dev/rpmb0
-    class late_start
-    user system
-    group system
-
-##############################################################
 # Source: device/intel/mixins/groups/debug-kernel/default/init.rc
 ##############################################################
 import /init.kernel.rc
diff --git a/cel_apl/ueventd.rc b/cel_apl/ueventd.rc
index b8c000a5f..09f232903 100644
--- a/cel_apl/ueventd.rc
+++ b/cel_apl/ueventd.rc
@@ -73,10 +73,6 @@
 # i915 backlight driver
 /sys/devices/pci0000:00/0000:00:02.0/drm/card*/card*/intel_backlight brightness 0644 system system
 ##############################################################
-# Source: device/intel/mixins/groups/trusty/true/ueventd.rc
-##############################################################
-/dev/block/pci/pci0000:00/0000:00:*.0/by-name/teedata      0660 system system
-##############################################################
 # Source: device/intel/mixins/groups/camera/usbcamera/ueventd.rc
 ##############################################################
 # Camera
diff --git a/celadon/AndroidBoard.mk b/celadon/AndroidBoard.mk
index 59866dc5c..a41d8bd40 100644
--- a/celadon/AndroidBoard.mk
+++ b/celadon/AndroidBoard.mk
@@ -433,55 +433,6 @@ $(provdata_zip): $(provdata_zip_deps) | $(ACP)
 
 INSTALLED_RADIOIMAGE_TARGET += $(provdata_zip)
 
-##############################################################
-# Source: device/intel/mixins/groups/trusty/true/AndroidBoard.mk
-##############################################################
-TOS_IMAGE_TARGET := $(TRUSTY_BUILDROOT)/evmm_lk_pkg.bin
-
-INTERNAL_PLATFORM := ikgt
-LOCAL_MAKE := make
-
-# Build the evmm_pkg.bin and lk.bin
-.PHONY: $(TOS_IMAGE_TARGET)
-$(TOS_IMAGE_TARGET):
-	@echo "making lk.bin.."
-	$(hide) (cd $(TOPDIR)trusty && $(TRUSTY_ENV_VAR) $(LOCAL_MAKE) sand-x86-64)
-	@echo "making tos image.."
-	$(hide) (cd $(TOPDIR)vendor/intel/fw/evmm/$(INTERNAL_PLATFORM) && $(TRUSTY_ENV_VAR) $(LOCAL_MAKE))
-
-#tos partition is assigned for trusty
-INSTALLED_TOS_IMAGE_TARGET := $(PRODUCT_OUT)/tos.img
-TOS_SIGNING_KEY := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8
-TOS_SIGNING_CERT := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem
-
-.PHONY: tosimage
-tosimage: $(INSTALLED_TOS_IMAGE_TARGET)
-
-ifeq (true,$(BOARD_AVB_ENABLE)) # BOARD_AVB_ENABLE == true
-$(INSTALLED_TOS_IMAGE_TARGET): $(TOS_IMAGE_TARGET) $(MKBOOTIMG) $(AVBTOOL)
-	@echo "mkbootimg to create boot image for TOS file: $@"
-	$(hide) $(MKBOOTIMG) --kernel $(TOS_IMAGE_TARGET) --output $@
-	$(hide) $(AVBTOOL) add_hash_footer \
-		--image $@ \
-		--partition_size $(BOARD_TOSIMAGE_PARTITION_SIZE) \
-		--partition_name tos $(INTERNAL_AVB_SIGNING_ARGS)
-BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --include_descriptors_from_image $(INSTALLED_TOS_IMAGE_TARGET)
-$(PRODUCT_OUT)/vbmeta.img: $(INSTALLED_TOS_IMAGE_TARGET)
-else
-$(INSTALLED_TOS_IMAGE_TARGET): $(TOS_IMAGE_TARGET) $(MKBOOTIMG) $(BOOT_SIGNER)
-	@echo "mkbootimg to create boot image for TOS file: $@"
-	$(hide) $(MKBOOTIMG) --kernel $(TOS_IMAGE_TARGET) --output $@
-	$(if $(filter true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_BOOT_SIGNER)),\
-		@echo "sign prebuilt TOS file: $@" &&\
-		$(BOOT_SIGNER) /tos $@ $(TOS_SIGNING_KEY) $(TOS_SIGNING_CERT) $@)
-endif
-
-INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_TOS_IMAGE_TARGET)
-
-make_dir_ab_tos:
-	@mkdir -p $(PRODUCT_OUT)/root/tos
-
-$(PRODUCT_OUT)/ramdisk.img: make_dir_ab_tos
 ##############################################################
 # Source: device/intel/mixins/groups/gptbuild/true/AndroidBoard.mk
 ##############################################################
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index f39f398dc..8265192e2 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -10,7 +10,13 @@ BOARD_OEM_VARS += $(TARGET_DEVICE_DIR)/oemvars.txt
 ##############################################################
 KERNEL_CROSS_COMPILE_WRAPPER := x86_64-linux-android-
 ##############################################################
-# Source: device/intel/mixins/groups/sepolicy/enforcing/BoardConfig.mk
+# Source: device/intel/mixins/groups/sepolicy/permissive/BoardConfig.mk.1
+##############################################################
+# start kernel in permissive mode, this way we don't
+# need 'setenforce 0' from init.rc files
+BOARD_KERNEL_CMDLINE += enforcing=0 androidboot.selinux=permissive
+##############################################################
+# Source: device/intel/mixins/groups/sepolicy/permissive/BoardConfig.mk
 ##############################################################
 # SELinux Policy
 BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy
@@ -230,8 +236,6 @@ BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/unlock_device.nsh
 BOARD_FLASHFILES += $(PRODUCT_OUT)/efi/efivar_oemlock
 BOARD_FLASHFILES += $(PRODUCT_OUT)/bootloader
 BOARD_FLASHFILES += $(PRODUCT_OUT)/fastboot-usb.img
-BOARD_FLASHFILES += $(PRODUCT_OUT)/tos.img
-AB_OTA_PARTITIONS += tos
 
 # -- OTA RELATED DEFINES --
 # tell build system where to get the recovery.fstab.
@@ -404,47 +408,6 @@ USE_INTEL_FLASHFILES := true
 VARIANT_SPECIFIC_FLASHFILES ?= false
 FAST_FLASHFILES := true
 
-##############################################################
-# Source: device/intel/mixins/groups/trusty/true/BoardConfig.mk
-##############################################################
-TARGET_USE_TRUSTY := true
-
-KM_VERSION := 2
-ifeq ($(KM_VERSION),1)
-BOARD_USES_TRUSTY := true
-BOARD_USES_KEYMASTER1 := true
-endif
-
-BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/trusty
-BOARD_SEPOLICY_M4DEFS += module_trusty=true
-
-LK_PRODUCT := project-celadon_64
-
-LKBUILD_TOOLCHAIN_ROOT = $(PWD)/vendor/intel/external/prebuilts/elf/
-LKBUILD_X86_TOOLCHAIN =
-LKBUILD_X64_TOOLCHAIN = $(LKBUILD_TOOLCHAIN_ROOT)x86_64-elf-4.9.1-Linux-x86_64/bin
-EVMMBUILD_TOOLCHAIN ?= x86_64-linux-android-
-TRUSTY_BUILDROOT = $(PWD)/$(PRODUCT_OUT)/obj/trusty/
-
-TRUSTY_ENV_VAR += LK_CORE_NUM=1
-TRUSTY_ENV_VAR += TRUSTY_REF_TARGET=project-celadon_64
-
-#for trusty lk
-TRUSTY_ENV_VAR += BUILDROOT=$(TRUSTY_BUILDROOT)
-TRUSTY_ENV_VAR += PATH=$(PATH):$(LKBUILD_X86_TOOLCHAIN):$(LKBUILD_X64_TOOLCHAIN)
-
-#for trusty vmm
-# use same toolchain as android kernel
-TRUSTY_ENV_VAR += COMPILE_TOOLCHAIN=$(EVMMBUILD_TOOLCHAIN)
-
-# output build dir to android out folder
-TRUSTY_ENV_VAR += BUILD_DIR=$(TRUSTY_BUILDROOT)
-TRUSTY_ENV_VAR += LKBIN_DIR=$(TRUSTY_BUILDROOT)/build-sand-x86-64/
-
-#Workaround CPU lost issue on SIMICS, will remove this line below after PO.
-BOARD_KERNEL_CMDLINE += cpu_init_udelay=500000
-
-BOARD_TOSIMAGE_PARTITION_SIZE := 10485760
 ##############################################################
 # Source: device/intel/mixins/groups/camera/usbcamera/BoardConfig.mk
 ##############################################################
diff --git a/celadon/device.mk b/celadon/device.mk
index 28822e718..5a1e9c20c 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -638,36 +638,6 @@ PRODUCT_PACKAGES_DEBUG += \
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.midi.xml:system/etc/permissions/android.software.midi.xml
 ##############################################################
-# Source: device/intel/mixins/groups/trusty/true/product.mk
-##############################################################
-
-KM_VERSION := 2
-
-ifeq ($(KM_VERSION),2)
-PRODUCT_PACKAGES += \
-	keystore.trusty
-PRODUCT_PROPERTY_OVERRIDES += \
-	ro.hardware.keystore=trusty
-endif
-
-ifeq ($(KM_VERSION),1)
-PRODUCT_PACKAGES += \
-	keystore.project-celadon
-endif
-
-PRODUCT_PACKAGES += \
-	libtrusty \
-	storageproxyd \
-	libtrustystorage \
-	libtrustystorageinterface \
-	gatekeeper.trusty \
-	android.hardware.gatekeeper@1.0-impl \
-	android.hardware.gatekeeper@1.0-service
-
-PRODUCT_PROPERTY_OVERRIDES += \
-	ro.hardware.gatekeeper=trusty
-
-##############################################################
 # Source: device/intel/mixins/groups/memtrack/true/product.mk
 ##############################################################
 # memtrack HAL
diff --git a/celadon/flashfiles.ini b/celadon/flashfiles.ini
index af6f0e18e..ab26dba9a 100644
--- a/celadon/flashfiles.ini
+++ b/celadon/flashfiles.ini
@@ -111,11 +111,6 @@ file = images:vbmeta.img
 description = Flash vbmeta_a partition
 
 
-[command.flash.tos_a]
-tool = fastboot
-args = flash tos_a $file
-file = radio:tos.img
-description = Flash tos_a partition
 
 
 [command.flash.boot_a]
diff --git a/celadon/fstab b/celadon/fstab
index 842315754..0779c05ca 100644
--- a/celadon/fstab
+++ b/celadon/fstab
@@ -38,12 +38,11 @@
 
 # If enable AVB and A/B slot, then will mount system partition as / through /dev/dm-0
 /dev/block/by-name/system       /               ext4    ro                                                          wait,slotselect,avb
-/dev/block/by-name/data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts,quota
+/dev/block/by-name/data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,quota
 /dev/block/by-name/boot         /boot           emmc    defaults                                                    defaults,slotselect,avb
 /dev/block/by-name/misc         /misc           emmc    defaults                                                    defaults
 /dev/block/by-name/bootloader   /bootloader     emmc    defaults                                                    recoveryonly
 /dev/block/by-name/bootloader2  /bootloader2    emmc    defaults                                                    recoveryonly
 /dev/block/by-name/persistent   /persistent     emmc    defaults                                                    defaults
 /dev/block/by-name/metadata     /metadata       emmc    defaults                                                    defaults
-/dev/block/by-name/tos          /tos            emmc    defaults                                                    defaults,slotselect,avb
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/celadon/gpt.ini b/celadon/gpt.ini
index 10f6ab812..04c6c0025 100644
--- a/celadon/gpt.ini
+++ b/celadon/gpt.ini
@@ -4,7 +4,7 @@
 # Source: device/intel/mixins/groups/boot-arch/project-celadon/gpt.ini
 ##############################################################
 [base]
-partitions = bootloader bootloader2 boot  misc metadata system persistent vendor config factory tos vbmeta teedata data
+partitions = bootloader bootloader2 boot  misc metadata system persistent vendor config factory  vbmeta teedata data
 device = auto
 nb_slot = 2
 
@@ -82,12 +82,6 @@ len = 10
 type = linux
 guid = 8f68cc74-c5e5-48da-be91-a0c8c15e9c80
 
-[partition.tos]
-label = tos
-len = 10
-type = boot
-has_slot = true
-guid = 52cd00fd-f5b0-4061-b3a5-65b07f2179f0
 
 [partition.vbmeta]
 label = vbmeta
diff --git a/celadon/init.rc b/celadon/init.rc
index e8b9a3036..217a41db3 100644
--- a/celadon/init.rc
+++ b/celadon/init.rc
@@ -652,23 +652,6 @@ on property:sys.usb.config=midi,adb
     start adbd
     setprop sys.usb.state ${sys.usb.config}
 ##############################################################
-# Source: device/intel/mixins/groups/trusty/true/init.rc
-##############################################################
-on fs
-    # Update device node r/w attribute
-    chown system system /dev/trusty-ipc-dev0
-    chmod 666 /dev/trusty-ipc-dev0
-
-on post-fs-data
-    mkdir /data/misc/securestorage 0700 system system
-    chmod 666 /dev/rpmb0
-
-service storageproxyd /vendor/bin/storageproxyd -d /dev/trusty-ipc-dev0 -p /data/misc/securestorage -r /dev/rpmb0
-    class late_start
-    user system
-    group system
-
-##############################################################
 # Source: device/intel/mixins/groups/debug-kernel/default/init.rc
 ##############################################################
 import /init.kernel.rc
diff --git a/celadon/ueventd.rc b/celadon/ueventd.rc
index b8c000a5f..09f232903 100644
--- a/celadon/ueventd.rc
+++ b/celadon/ueventd.rc
@@ -73,10 +73,6 @@
 # i915 backlight driver
 /sys/devices/pci0000:00/0000:00:02.0/drm/card*/card*/intel_backlight brightness 0644 system system
 ##############################################################
-# Source: device/intel/mixins/groups/trusty/true/ueventd.rc
-##############################################################
-/dev/block/pci/pci0000:00/0000:00:*.0/by-name/teedata      0660 system system
-##############################################################
 # Source: device/intel/mixins/groups/camera/usbcamera/ueventd.rc
 ##############################################################
 # Camera

From ced1b9fee324d19733747c124dc6563beb97f8ae Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Wed, 8 Aug 2018 12:34:40 +0530
Subject: [PATCH 294/427] [MIXINUP_P] fix PATH error and enable wifi

Tracked-On : None
---
 cel_apl/init.rc | 24 ++++++++++++++++++++++--
 celadon/init.rc | 24 ++++++++++++++++++++++--
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/cel_apl/init.rc b/cel_apl/init.rc
index 217a41db3..2e3e383b3 100644
--- a/cel_apl/init.rc
+++ b/cel_apl/init.rc
@@ -500,13 +500,33 @@ on post-fs-data
     mkdir /oem_config/wlan 0770 wifi system
 
 
-service wpa_supplicant /vendor/bin/hw/wpa_supplicant -Dnl80211 -iwlan0 -g@android:wpa_wlan0 -c/data/misc/wifi/wpa_supplicant.conf -dt \
-    -e /data/misc/wifi/entropy.bin
+
+
+on zygote-start
+    # Create the directories used by the Wireless subsystem
+    mkdir /data/misc/wifi 0770 wifi wifi
+    mkdir /data/misc/wifi/wpa_supplicant 0770 wifi wifi
+    mkdir /data/vendor/wifi 0771 wifi wifi
+    mkdir /data/vendor/wifi/wpa 0770 wifi wifi
+    mkdir /data/vendor/wifi/wpa/sockets 0770 wifi wifi
+    mkdir /data/misc/dhcp 0770 dhcp dhcp
+    chown dhcp dhcp /data/misc/dhcp
+
+service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
+    -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1 \
+    -g@android:wpa_wlan0
+#   we will start as root and wpa_supplicant will switch to user wifi
+#   after setting up the capabilities required for WEXT
+#   user wifi
+#   group wifi inet keystore
+    interface android.hardware.wifi.supplicant@1.0::ISupplicant default
+    interface android.hardware.wifi.supplicant@1.1::ISupplicant default
     class main
     socket wpa_wlan0 dgram 660 wifi wifi
     disabled
     oneshot
 
+
 service dhcpcd_wlan0 /system/bin/dhcpcd -ABDKL
     class main
     disabled
diff --git a/celadon/init.rc b/celadon/init.rc
index 217a41db3..2e3e383b3 100644
--- a/celadon/init.rc
+++ b/celadon/init.rc
@@ -500,13 +500,33 @@ on post-fs-data
     mkdir /oem_config/wlan 0770 wifi system
 
 
-service wpa_supplicant /vendor/bin/hw/wpa_supplicant -Dnl80211 -iwlan0 -g@android:wpa_wlan0 -c/data/misc/wifi/wpa_supplicant.conf -dt \
-    -e /data/misc/wifi/entropy.bin
+
+
+on zygote-start
+    # Create the directories used by the Wireless subsystem
+    mkdir /data/misc/wifi 0770 wifi wifi
+    mkdir /data/misc/wifi/wpa_supplicant 0770 wifi wifi
+    mkdir /data/vendor/wifi 0771 wifi wifi
+    mkdir /data/vendor/wifi/wpa 0770 wifi wifi
+    mkdir /data/vendor/wifi/wpa/sockets 0770 wifi wifi
+    mkdir /data/misc/dhcp 0770 dhcp dhcp
+    chown dhcp dhcp /data/misc/dhcp
+
+service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
+    -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1 \
+    -g@android:wpa_wlan0
+#   we will start as root and wpa_supplicant will switch to user wifi
+#   after setting up the capabilities required for WEXT
+#   user wifi
+#   group wifi inet keystore
+    interface android.hardware.wifi.supplicant@1.0::ISupplicant default
+    interface android.hardware.wifi.supplicant@1.1::ISupplicant default
     class main
     socket wpa_wlan0 dgram 660 wifi wifi
     disabled
     oneshot
 
+
 service dhcpcd_wlan0 /system/bin/dhcpcd -ABDKL
     class main
     disabled

From c9cb1148ad7ab782b5f91dcd8c22e2514de2ff77 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Wed, 8 Aug 2018 12:47:26 +0530
Subject: [PATCH 295/427] [MIXINUP] Change locales_full.mk to languages_full.mk

Tracked-On : None
---
 cel_apl/device.mk | 3 ++-
 celadon/device.mk | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 88315b77e..feed347b2 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -32,7 +32,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.config.ringtone=Sceptrum.ogg \
 
 # Get a list of languages.
-$(call inherit-product,$(SRC_TARGET_DIR)/product/locales_full.mk)
+#$(call inherit-product,$(SRC_TARGET_DIR)/product/locales_full.mk)
+$(call inherit-product,$(SRC_TARGET_DIR)/product/languages_full.mk)
 
 # Get everything else from the parent package
 $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_no_telephony.mk)
diff --git a/celadon/device.mk b/celadon/device.mk
index 5a1e9c20c..7ec0676eb 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -32,7 +32,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.config.ringtone=Sceptrum.ogg \
 
 # Get a list of languages.
-$(call inherit-product,$(SRC_TARGET_DIR)/product/locales_full.mk)
+#$(call inherit-product,$(SRC_TARGET_DIR)/product/locales_full.mk)
+$(call inherit-product,$(SRC_TARGET_DIR)/product/languages_full.mk)
 
 # Get everything else from the parent package
 $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_no_telephony.mk)

From 9c80228a0e534d06fe63b1192bce7fdb7c3b02f4 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Wed, 8 Aug 2018 12:56:36 +0530
Subject: [PATCH 296/427] [CELADON_P] Added LOCAL_ADDITIONAL_DEPENDENCIES for
 Audio Policy config

Tracked-On : None
---
 .../AndroidBoard.mk                            | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/audio/reference_configurable_audio_policy/AndroidBoard.mk b/common/audio/reference_configurable_audio_policy/AndroidBoard.mk
index 4d598b9f9..cdf478c8b 100644
--- a/common/audio/reference_configurable_audio_policy/AndroidBoard.mk
+++ b/common/audio/reference_configurable_audio_policy/AndroidBoard.mk
@@ -79,9 +79,9 @@ LOCAL_MODULE_STEM := PolicyConfigurableDomains.xml
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy
 LOCAL_ADDITIONAL_DEPENDENCIES := \
-        PolicyClass.xml \
-        PolicySubsystem.xml \
-        ParameterFrameworkConfigurationPolicy.xml
+        $(TARGET_OUT_ETC)/parameter-framework/Structure/Policy/PolicyClass.xml \
+        $(TARGET_OUT_ETC)/parameter-framework/Structure/Policy/PolicySubsystem.xml \
+        $(TARGET_OUT_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml
 
 ifeq ($(pfw_rebuild_settings),true)
 PFW_TOPLEVEL_FILE := $(TARGET_OUT_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml
@@ -119,9 +119,9 @@ LOCAL_MODULE_STEM := PolicyConfigurableDomains-NoOutputDevice.xml
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy
 LOCAL_ADDITIONAL_DEPENDENCIES := \
-        PolicyClass.xml \
-        PolicySubsystem.xml \
-        ParameterFrameworkConfigurationPolicy.xml
+        $(TARGET_OUT_ETC)/parameter-framework/Structure/Policy/PolicyClass.xml \
+        $(TARGET_OUT_ETC)/parameter-framework/Structure/Policy/PolicySubsystem.xml \
+        $(TARGET_OUT_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml
 
 PFW_TOPLEVEL_FILE := $(TARGET_OUT_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml
 PFW_CRITERIA_FILE := $(LOCAL_PATH)/policy_criteria.txt
@@ -143,9 +143,9 @@ LOCAL_MODULE_STEM := PolicyConfigurableDomains-NoInputDevice.xml
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Settings/Policy
 LOCAL_ADDITIONAL_DEPENDENCIES := \
-        PolicyClass.xml \
-        PolicySubsystem.xml \
-        ParameterFrameworkConfigurationPolicy.xml
+        $(TARGET_OUT_ETC)/parameter-framework/Structure/Policy/PolicyClass.xml \
+        $(TARGET_OUT_ETC)/parameter-framework/Structure/Policy/PolicySubsystem.xml \
+        $(TARGET_OUT_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml
 
 PFW_TOPLEVEL_FILE := $(TARGET_OUT_ETC)/parameter-framework/ParameterFrameworkConfigurationPolicy.xml
 PFW_CRITERIA_FILE := $(LOCAL_PATH)/policy_criteria.txt

From 9730ee526fadee1533c831102257a0c1254faa48 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Wed, 8 Aug 2018 13:45:50 +0530
Subject: [PATCH 297/427] [CELADON_P] Modified sepolicy File.te for kernel

Tracked-On: None
---
 sepolicy/crashlogd/dumpstate.te        | 1 -
 sepolicy/kernel/file.te                | 1 -
 sepolicy/kernel/genfs_contexts         | 2 --
 sepolicy/thermal/dptf/system_server.te | 2 --
 4 files changed, 6 deletions(-)

diff --git a/sepolicy/crashlogd/dumpstate.te b/sepolicy/crashlogd/dumpstate.te
index 0797460ab..2d708ee95 100644
--- a/sepolicy/crashlogd/dumpstate.te
+++ b/sepolicy/crashlogd/dumpstate.te
@@ -1,6 +1,5 @@
 allow dumpstate block_device:blk_file getattr;
 allow dumpstate config_file:dir r_dir_perms;
-allow dumpstate crashlogd:process signal;
 allow dumpstate debugfs_graphics_sync:dir r_dir_perms;
 allow dumpstate kernel:system module_request;
 allow dumpstate self:netlink_xfrm_socket create;
diff --git a/sepolicy/kernel/file.te b/sepolicy/kernel/file.te
index b4d7b9015..e69de29bb 100644
--- a/sepolicy/kernel/file.te
+++ b/sepolicy/kernel/file.te
@@ -1 +0,0 @@
-type proc_version, fs_type, sysfs_type;
diff --git a/sepolicy/kernel/genfs_contexts b/sepolicy/kernel/genfs_contexts
index 7024d8bb7..e69de29bb 100644
--- a/sepolicy/kernel/genfs_contexts
+++ b/sepolicy/kernel/genfs_contexts
@@ -1,2 +0,0 @@
-genfscon proc /version u:object_r:proc_version:s0
-genfscon proc /sys/kernel/osrelease u:object_r:proc_version:s0
diff --git a/sepolicy/thermal/dptf/system_server.te b/sepolicy/thermal/dptf/system_server.te
index c41f88a66..6a7492c67 100644
--- a/sepolicy/thermal/dptf/system_server.te
+++ b/sepolicy/thermal/dptf/system_server.te
@@ -2,5 +2,3 @@
 allow system_server sysfs_thermal_management:dir rw_dir_perms;
 allow system_server sysfs_thermal_management:file rw_file_perms;
 #for last_reboot_reason
-allow system_server reboot_data_file:dir rw_dir_perms;
-allow system_server reboot_data_file:file rw_file_perms;

From a39733038c396b2cd1f8ab0f88cbc2ad26205a28 Mon Sep 17 00:00:00 2001
From: "Raveendra, Babu Chennakesavulu"
 <raveendra.babu.chennakesavulu@intel.com>
Date: Sun, 12 Aug 2018 03:06:53 +0530
Subject: [PATCH 298/427] Enable Wi-Fi Hostapd hal

Hostapd is a vendor interface on Android P, hence Hostapd
hal entry should be added into manifests

Tracked-On: None
Signed-off-by: Raveendra, Babu Chennakesavulu <raveendra.babu.chennakesavulu@intel.com>
Signed-off-by: Jeevaka Prabu Badrappan <jeevaka.badrappan@intel.com>
---
 manifest.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/manifest.xml b/manifest.xml
index 174a4dc14..b0a6f5a1c 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -98,6 +98,15 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.wifi.hostapd</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IHostapd</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>android.hardware.media.omx</name>
         <transport>hwbinder</transport>

From 33c28968bbcf97a86ed5641bfa2e0c1d3e84dc7b Mon Sep 17 00:00:00 2001
From: "Raveendra, Babu Chennakesavulu"
 <raveendra.babu.chennakesavulu@intel.com>
Date: Sun, 12 Aug 2018 04:05:27 +0530
Subject: [PATCH 299/427] Update ISupplicant version to 1.1

Tracked-On: None

Signed-off-by: Raveendra, Babu Chennakesavulu <raveendra.babu.chennakesavulu@intel.com>
Signed-off-by: Jeevaka Prabu Badrappan <jeevaka.badrappan@intel.com>
---
 manifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.xml b/manifest.xml
index b0a6f5a1c..dce7d2486 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -92,7 +92,7 @@
     <hal format="hidl">
         <name>android.hardware.wifi.supplicant</name>
         <transport>hwbinder</transport>
-        <version>1.0</version>
+        <version>1.1</version>
         <interface>
             <name>ISupplicant</name>
             <instance>default</instance>

From 38bc840e8566fe5c1a2665cd70d7783890ea1dc7 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Tue, 14 Aug 2018 13:22:19 +0530
Subject: [PATCH 300/427] [MIXINUP] Patches for enabling bluetooth and ethernet
 #40

Tracked-On: None
Signed-off-by: Swaroop Balan <swaroop.balan@intel.com>
---
 cel_apl/device.mk | 5 ++---
 cel_apl/init.rc   | 2 ++
 celadon/device.mk | 2 ++
 celadon/init.rc   | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index feed347b2..da792724e 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -257,9 +257,6 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.broadcastradio.xml:vendor/etc/permissions/android.hardware.broadcastradio.xml \
     frameworks/native/data/etc/android.software.activities_on_secondary_displays.xml:vendor/etc/permissions/android.software.activities_on_secondary_displays.xml
 
-# Make sure vendor car product overlays take precedence than google definition
-# under packages/services/Car/car_product/overlay/
-PRODUCT_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/device-type/overlay-car
 $(call inherit-product, packages/services/Car/car_product/build/car.mk)
 
 $(call inherit-product,frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-heap.mk)
@@ -378,6 +375,8 @@ PRODUCT_PACKAGES += \
   android.hardware.bluetooth@1.0-impl \
   android.hardware.bluetooth@1.0-service \
   libbt-vendor
+
+PRODUCT_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/bluetooth/overlay-car-disablehfp
 ##############################################################
 # Source: device/intel/mixins/groups/disk-bus/auto/product.mk
 ##############################################################
diff --git a/cel_apl/init.rc b/cel_apl/init.rc
index 2e3e383b3..165e19c82 100644
--- a/cel_apl/init.rc
+++ b/cel_apl/init.rc
@@ -183,6 +183,7 @@ on post-fs
     insmod /vendor/lib/modules/kernel/drivers/net/usb/usbnet.ko
     insmod /vendor/lib/modules/kernel/drivers/net/usb/asix.ko
     insmod /vendor/lib/modules/kernel/drivers/net/usb/r8152.ko
+    insmod /vendor/lib/modules/kernel/drivers/net/ethernet/realtek/r8169.ko
 ##############################################################
 # Source: device/intel/mixins/groups/debugfs/default/init.rc
 ##############################################################
@@ -447,6 +448,7 @@ on property:sys.boot_completed=1
 on post-fs-data
     # To store BT paired info
     mkdir /data/misc/hcid 0770 bluetooth bluetooth
+    setprop persist.bluetooth.enablenewavrcp false
 
 on boot
     chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_max_credits
diff --git a/celadon/device.mk b/celadon/device.mk
index 7ec0676eb..69ecf750d 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -360,6 +360,8 @@ PRODUCT_PACKAGES += \
   android.hardware.bluetooth@1.0-impl \
   android.hardware.bluetooth@1.0-service \
   libbt-vendor
+
+PRODUCT_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/bluetooth/overlay-car-disablehfp
 ##############################################################
 # Source: device/intel/mixins/groups/disk-bus/auto/product.mk
 ##############################################################
diff --git a/celadon/init.rc b/celadon/init.rc
index 2e3e383b3..165e19c82 100644
--- a/celadon/init.rc
+++ b/celadon/init.rc
@@ -183,6 +183,7 @@ on post-fs
     insmod /vendor/lib/modules/kernel/drivers/net/usb/usbnet.ko
     insmod /vendor/lib/modules/kernel/drivers/net/usb/asix.ko
     insmod /vendor/lib/modules/kernel/drivers/net/usb/r8152.ko
+    insmod /vendor/lib/modules/kernel/drivers/net/ethernet/realtek/r8169.ko
 ##############################################################
 # Source: device/intel/mixins/groups/debugfs/default/init.rc
 ##############################################################
@@ -447,6 +448,7 @@ on property:sys.boot_completed=1
 on post-fs-data
     # To store BT paired info
     mkdir /data/misc/hcid 0770 bluetooth bluetooth
+    setprop persist.bluetooth.enablenewavrcp false
 
 on boot
     chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_max_credits

From 8fa772539c34ee3a8876a4b1ac686a47d28fb332 Mon Sep 17 00:00:00 2001
From: ops <ramya.v.naidu@intel.com>
Date: Thu, 16 Aug 2018 05:22:23 -0400
Subject: [PATCH 301/427] Upgrading kernel_defconfig to 4.14.61

Tracked-On: None
Signed-off-by: rnaidu <ramya.v.naidu@intel.com>
---
 kernel_config/kernel_64_defconfig | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index a4899fdf7..355938f45 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.14.59 Kernel Configuration
+# Linux/x86_64 4.14.61 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -1191,6 +1191,7 @@ CONFIG_NET_SCH_HTB=y
 # CONFIG_NET_SCH_TEQL is not set
 # CONFIG_NET_SCH_TBF is not set
 # CONFIG_NET_SCH_CBS is not set
+# CONFIG_NET_SCH_ETF is not set
 # CONFIG_NET_SCH_GRED is not set
 # CONFIG_NET_SCH_DSMARK is not set
 # CONFIG_NET_SCH_NETEM is not set
@@ -2002,6 +2003,7 @@ CONFIG_DM_VERITY_FEC=y
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
 # CONFIG_DM_INTEGRITY is not set
+# CONFIG_DM_ANDROID_VERITY is not set
 # CONFIG_DM_ANDROID_VERITY_AT_MOST_ONCE_DEFAULT_ENABLED is not set
 # CONFIG_TARGET_CORE is not set
 CONFIG_FUSION=y
@@ -5089,8 +5091,26 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
 # CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH is not set
 # CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH is not set
+# CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set
+# CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set
+# CONFIG_SND_SOC_INTEL_BXT_PCM512x_MACH is not set
+# CONFIG_SND_SOC_INTEL_BXT_TDF8532_MACH is not set
+# CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH is not set
+# CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH is not set
+# CONFIG_SND_SOC_INTEL_CNL_FPGA is not set
+# CONFIG_SND_SOC_INTEL_CNL_CS42L42_MACH is not set
+# CONFIG_SND_SOC_INTEL_CNL_RT700_MACH is not set
+# CONFIG_SND_SOC_INTEL_CNL_SVFPGA_MACH is not set
+# CONFIG_SND_SOC_INTEL_CNL_RT274_MACH is not set
+# CONFIG_SND_SOC_SDW_AGGM1M2 is not set
+# CONFIG_SND_SOC_INTEL_BXT_ULL_MACH is not set
+# CONFIG_SND_SOC_INTEL_BXTP_IVI_RSE_MACH is not set
+# CONFIG_SND_SOC_INTEL_BXTP_IVI_HU_MACH is not set
+# CONFIG_SND_SOC_INTEL_BXTP_IVI_M3_MACH is not set
+# CONFIG_SND_SOC_INTEL_BXTP_IVI_GENERIC_MACH is not set
 CONFIG_SND_SOC_SOF=m
 # CONFIG_SND_SOC_SOF_NOCODEC is not set
+# CONFIG_SND_SOC_SOF_DEBUG is not set
 # CONFIG_SND_SOC_SOF_INTEL is not set
 
 #

From e40c2814449dcb8faf91a50124c826200f557120 Mon Sep 17 00:00:00 2001
From: swei22 <w.sheng@intel.com>
Date: Fri, 17 Aug 2018 10:32:39 +0800
Subject: [PATCH 302/427] fix ss boot failure due to lack of sepolicy

Jira: None
Test: None
Signed-off-by: Huang, Yang <yang.huang@intel.com>
---
 sepolicy/trusty/file_contexts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sepolicy/trusty/file_contexts b/sepolicy/trusty/file_contexts
index 9ffa80720..0823d60db 100644
--- a/sepolicy/trusty/file_contexts
+++ b/sepolicy/trusty/file_contexts
@@ -5,4 +5,4 @@
 
 /vendor/bin/storageproxyd    u:object_r:tee_exec:s0
 
-/data/misc/securestorage(/.*)?    u:object_r:tee_data_file:s0
+/data/vendor/securestorage(/.*)?    u:object_r:tee_data_file:s0

From 3108efdfc92f96a141bceec1109b9c743439cf2f Mon Sep 17 00:00:00 2001
From: swei22 <w.sheng@intel.com>
Date: Fri, 17 Aug 2018 10:38:19 +0800
Subject: [PATCH 303/427] Enable trusty

Jira: None
Test: Device can boot to home screen.
Signed-off-by: swei22 <w.sheng@intel.com>
---
 cel_apl/mixins.spec | 4 ++--
 celadon/mixins.spec | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cel_apl/mixins.spec b/cel_apl/mixins.spec
index d2a50aeb7..4cd641fb0 100644
--- a/cel_apl/mixins.spec
+++ b/cel_apl/mixins.spec
@@ -19,7 +19,7 @@ usb-gadget: g_ffs
 adb_net: true
 kernel: project-celadon(loglevel=3, disable_cpuidle_on_boot=true)
 bluetooth: btusb (ivi=true)
-boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true)
+boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true)
 audio: project-celadon
 wlan: iwlwifi
 cpu-arch: skl
@@ -41,7 +41,7 @@ debug-phonedoctor: true
 debug-tools: true
 flashfiles: ini(oemvars=false,version=3.0,fastboot_min_battery_level=false,installer=true)
 midi: true
-trusty: false
+trusty: true(enable_hw_sec=true,enable_storage_proxyd=true,ref_target=project-celadon_64)
 slcan: default
 ioc-slcan-reboot: false
 camera: usbcamera
diff --git a/celadon/mixins.spec b/celadon/mixins.spec
index b57e5b6bc..24e6b090c 100644
--- a/celadon/mixins.spec
+++ b/celadon/mixins.spec
@@ -19,7 +19,7 @@ usb-gadget: g_ffs
 adb_net: true
 kernel: project-celadon(loglevel=3, disable_cpuidle_on_boot=true)
 bluetooth: btusb
-boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true)
+boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true)
 audio: project-celadon
 wlan: iwlwifi
 cpu-arch: skl
@@ -41,7 +41,7 @@ debug-phonedoctor: true
 debug-tools: true
 flashfiles: ini(oemvars=false,version=3.0,fastboot_min_battery_level=false,installer=true)
 midi: true
-trusty: false
+trusty: true(enable_hw_sec=true,enable_storage_proxyd=true,ref_target=project-celadon_64)
 slcan: default
 ioc-slcan-reboot: false
 camera: usbcamera

From b69f802f3b1a8f1e09e4e94141715a067c8cc72a Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Tue, 21 Aug 2018 09:43:33 +0530
Subject: [PATCH 304/427] [MIXINUP] enable trusty

Tracked-On: None
Signed-off-by: Swaroop Balan <swaroop.balan@intel.com>
---
 cel_apl/AndroidBoard.mk | 49 +++++++++++++++++++++++++++++++++++++++++
 cel_apl/BoardConfig.mk  | 43 ++++++++++++++++++++++++++++++++++++
 cel_apl/device.mk       | 30 +++++++++++++++++++++++++
 cel_apl/flashfiles.ini  |  5 +++++
 cel_apl/fstab           |  3 ++-
 cel_apl/gpt.ini         |  8 ++++++-
 cel_apl/init.rc         | 17 ++++++++++++++
 cel_apl/ueventd.rc      |  4 ++++
 celadon/AndroidBoard.mk | 49 +++++++++++++++++++++++++++++++++++++++++
 celadon/BoardConfig.mk  | 43 ++++++++++++++++++++++++++++++++++++
 celadon/device.mk       | 30 +++++++++++++++++++++++++
 celadon/flashfiles.ini  |  5 +++++
 celadon/fstab           |  3 ++-
 celadon/gpt.ini         |  8 ++++++-
 celadon/init.rc         | 17 ++++++++++++++
 celadon/ueventd.rc      |  4 ++++
 16 files changed, 314 insertions(+), 4 deletions(-)

diff --git a/cel_apl/AndroidBoard.mk b/cel_apl/AndroidBoard.mk
index e71065e49..cc4520d96 100644
--- a/cel_apl/AndroidBoard.mk
+++ b/cel_apl/AndroidBoard.mk
@@ -439,6 +439,55 @@ $(provdata_zip): $(provdata_zip_deps) | $(ACP)
 
 INSTALLED_RADIOIMAGE_TARGET += $(provdata_zip)
 
+##############################################################
+# Source: device/intel/mixins/groups/trusty/true/AndroidBoard.mk
+##############################################################
+TOS_IMAGE_TARGET := $(TRUSTY_BUILDROOT)/evmm_lk_pkg.bin
+
+INTERNAL_PLATFORM := ikgt
+LOCAL_MAKE := make
+
+# Build the evmm_pkg.bin and lk.bin
+.PHONY: $(TOS_IMAGE_TARGET)
+$(TOS_IMAGE_TARGET):
+	@echo "making lk.bin.."
+	$(hide) (cd $(TOPDIR)trusty && $(TRUSTY_ENV_VAR) $(LOCAL_MAKE) sand-x86-64)
+	@echo "making tos image.."
+	$(hide) (cd $(TOPDIR)vendor/intel/fw/evmm/$(INTERNAL_PLATFORM) && $(TRUSTY_ENV_VAR) $(LOCAL_MAKE))
+
+#tos partition is assigned for trusty
+INSTALLED_TOS_IMAGE_TARGET := $(PRODUCT_OUT)/tos.img
+TOS_SIGNING_KEY := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8
+TOS_SIGNING_CERT := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem
+
+.PHONY: tosimage
+tosimage: $(INSTALLED_TOS_IMAGE_TARGET)
+
+ifeq (true,$(BOARD_AVB_ENABLE)) # BOARD_AVB_ENABLE == true
+$(INSTALLED_TOS_IMAGE_TARGET): $(TOS_IMAGE_TARGET) $(MKBOOTIMG) $(AVBTOOL)
+	@echo "mkbootimg to create boot image for TOS file: $@"
+	$(hide) $(MKBOOTIMG) --kernel $(TOS_IMAGE_TARGET) --output $@
+	$(hide) $(AVBTOOL) add_hash_footer \
+		--image $@ \
+		--partition_size $(BOARD_TOSIMAGE_PARTITION_SIZE) \
+		--partition_name tos $(INTERNAL_AVB_SIGNING_ARGS)
+BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --include_descriptors_from_image $(INSTALLED_TOS_IMAGE_TARGET)
+$(PRODUCT_OUT)/vbmeta.img: $(INSTALLED_TOS_IMAGE_TARGET)
+else
+$(INSTALLED_TOS_IMAGE_TARGET): $(TOS_IMAGE_TARGET) $(MKBOOTIMG) $(BOOT_SIGNER)
+	@echo "mkbootimg to create boot image for TOS file: $@"
+	$(hide) $(MKBOOTIMG) --kernel $(TOS_IMAGE_TARGET) --output $@
+	$(if $(filter true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_BOOT_SIGNER)),\
+		@echo "sign prebuilt TOS file: $@" &&\
+		$(BOOT_SIGNER) /tos $@ $(TOS_SIGNING_KEY) $(TOS_SIGNING_CERT) $@)
+endif
+
+INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_TOS_IMAGE_TARGET)
+
+make_dir_ab_tos:
+	@mkdir -p $(PRODUCT_OUT)/root/tos
+
+$(PRODUCT_OUT)/ramdisk.img: make_dir_ab_tos
 ##############################################################
 # Source: device/intel/mixins/groups/gptbuild/true/AndroidBoard.mk
 ##############################################################
diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index ef5c7370e..ab94144a5 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -414,6 +414,49 @@ USE_INTEL_FLASHFILES := true
 VARIANT_SPECIFIC_FLASHFILES ?= false
 FAST_FLASHFILES := true
 
+##############################################################
+# Source: device/intel/mixins/groups/trusty/true/BoardConfig.mk
+##############################################################
+TARGET_USE_TRUSTY := true
+
+KM_VERSION := 2
+ifeq ($(KM_VERSION),1)
+BOARD_USES_TRUSTY := true
+BOARD_USES_KEYMASTER1 := true
+endif
+
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/trusty
+BOARD_SEPOLICY_M4DEFS += module_trusty=true
+
+LK_PRODUCT := project-celadon_64
+
+LKBUILD_TOOLCHAIN_ROOT = $(PWD)/vendor/intel/external/prebuilts/elf/
+LKBUILD_X86_TOOLCHAIN =
+LKBUILD_X64_TOOLCHAIN = $(LKBUILD_TOOLCHAIN_ROOT)x86_64-elf-4.9.1-Linux-x86_64/bin
+EVMMBUILD_TOOLCHAIN ?= x86_64-linux-android-
+TRUSTY_BUILDROOT = $(PWD)/$(PRODUCT_OUT)/obj/trusty/
+
+TRUSTY_ENV_VAR += LK_CORE_NUM=1
+TRUSTY_ENV_VAR += TRUSTY_REF_TARGET=project-celadon_64
+
+#for trusty lk
+TRUSTY_ENV_VAR += BUILDROOT=$(TRUSTY_BUILDROOT)
+TRUSTY_ENV_VAR += PATH=$$PATH:$(LKBUILD_X86_TOOLCHAIN):$(LKBUILD_X64_TOOLCHAIN)
+TRUSTY_ENV_VAR += CLANG_BINDIR=$(PWD)/$(LLVM_PREBUILTS_PATH)
+TRUSTY_ENV_VAR += ARCH_x86_64_TOOLCHAIN_PREFIX=${PWD}/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-${TARGET_GCC_VERSION}/bin/x86_64-linux-android-
+
+#for trusty vmm
+# use same toolchain as android kernel
+TRUSTY_ENV_VAR += COMPILE_TOOLCHAIN=$(EVMMBUILD_TOOLCHAIN)
+
+# output build dir to android out folder
+TRUSTY_ENV_VAR += BUILD_DIR=$(TRUSTY_BUILDROOT)
+TRUSTY_ENV_VAR += LKBIN_DIR=$(TRUSTY_BUILDROOT)/build-sand-x86-64/
+
+#Workaround CPU lost issue on SIMICS, will remove this line below after PO.
+BOARD_KERNEL_CMDLINE += cpu_init_udelay=500000
+
+BOARD_TOSIMAGE_PARTITION_SIZE := 10485760
 ##############################################################
 # Source: device/intel/mixins/groups/camera/usbcamera/BoardConfig.mk
 ##############################################################
diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index da792724e..9bb97e484 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -656,6 +656,36 @@ PRODUCT_PACKAGES_DEBUG += \
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.midi.xml:system/etc/permissions/android.software.midi.xml
 ##############################################################
+# Source: device/intel/mixins/groups/trusty/true/product.mk
+##############################################################
+
+KM_VERSION := 2
+
+ifeq ($(KM_VERSION),2)
+PRODUCT_PACKAGES += \
+	keystore.trusty
+PRODUCT_PROPERTY_OVERRIDES += \
+	ro.hardware.keystore=trusty
+endif
+
+ifeq ($(KM_VERSION),1)
+PRODUCT_PACKAGES += \
+	keystore.project-celadon
+endif
+
+PRODUCT_PACKAGES += \
+	libtrusty \
+	storageproxyd \
+	libtrustystorage \
+	libtrustystorageinterface \
+	gatekeeper.trusty \
+	android.hardware.gatekeeper@1.0-impl \
+	android.hardware.gatekeeper@1.0-service
+
+PRODUCT_PROPERTY_OVERRIDES += \
+	ro.hardware.gatekeeper=trusty
+
+##############################################################
 # Source: device/intel/mixins/groups/memtrack/true/product.mk
 ##############################################################
 # memtrack HAL
diff --git a/cel_apl/flashfiles.ini b/cel_apl/flashfiles.ini
index ab26dba9a..af6f0e18e 100644
--- a/cel_apl/flashfiles.ini
+++ b/cel_apl/flashfiles.ini
@@ -111,6 +111,11 @@ file = images:vbmeta.img
 description = Flash vbmeta_a partition
 
 
+[command.flash.tos_a]
+tool = fastboot
+args = flash tos_a $file
+file = radio:tos.img
+description = Flash tos_a partition
 
 
 [command.flash.boot_a]
diff --git a/cel_apl/fstab b/cel_apl/fstab
index 0779c05ca..842315754 100644
--- a/cel_apl/fstab
+++ b/cel_apl/fstab
@@ -38,11 +38,12 @@
 
 # If enable AVB and A/B slot, then will mount system partition as / through /dev/dm-0
 /dev/block/by-name/system       /               ext4    ro                                                          wait,slotselect,avb
-/dev/block/by-name/data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,quota
+/dev/block/by-name/data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts,quota
 /dev/block/by-name/boot         /boot           emmc    defaults                                                    defaults,slotselect,avb
 /dev/block/by-name/misc         /misc           emmc    defaults                                                    defaults
 /dev/block/by-name/bootloader   /bootloader     emmc    defaults                                                    recoveryonly
 /dev/block/by-name/bootloader2  /bootloader2    emmc    defaults                                                    recoveryonly
 /dev/block/by-name/persistent   /persistent     emmc    defaults                                                    defaults
 /dev/block/by-name/metadata     /metadata       emmc    defaults                                                    defaults
+/dev/block/by-name/tos          /tos            emmc    defaults                                                    defaults,slotselect,avb
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/cel_apl/gpt.ini b/cel_apl/gpt.ini
index 04c6c0025..10f6ab812 100644
--- a/cel_apl/gpt.ini
+++ b/cel_apl/gpt.ini
@@ -4,7 +4,7 @@
 # Source: device/intel/mixins/groups/boot-arch/project-celadon/gpt.ini
 ##############################################################
 [base]
-partitions = bootloader bootloader2 boot  misc metadata system persistent vendor config factory  vbmeta teedata data
+partitions = bootloader bootloader2 boot  misc metadata system persistent vendor config factory tos vbmeta teedata data
 device = auto
 nb_slot = 2
 
@@ -82,6 +82,12 @@ len = 10
 type = linux
 guid = 8f68cc74-c5e5-48da-be91-a0c8c15e9c80
 
+[partition.tos]
+label = tos
+len = 10
+type = boot
+has_slot = true
+guid = 52cd00fd-f5b0-4061-b3a5-65b07f2179f0
 
 [partition.vbmeta]
 label = vbmeta
diff --git a/cel_apl/init.rc b/cel_apl/init.rc
index 165e19c82..0325c83df 100644
--- a/cel_apl/init.rc
+++ b/cel_apl/init.rc
@@ -674,6 +674,23 @@ on property:sys.usb.config=midi,adb
     start adbd
     setprop sys.usb.state ${sys.usb.config}
 ##############################################################
+# Source: device/intel/mixins/groups/trusty/true/init.rc
+##############################################################
+on fs
+    # Update device node r/w attribute
+    chown system system /dev/trusty-ipc-dev0
+    chmod 666 /dev/trusty-ipc-dev0
+
+on post-fs-data
+    mkdir /data/vendor/securestorage 0700 system system
+    chmod 666 /dev/rpmb0
+
+service storageproxyd /vendor/bin/storageproxyd -d /dev/trusty-ipc-dev0 -p /data/vendor/securestorage -r /dev/rpmb0
+    class late_start
+    user system
+    group system
+
+##############################################################
 # Source: device/intel/mixins/groups/debug-kernel/default/init.rc
 ##############################################################
 import /init.kernel.rc
diff --git a/cel_apl/ueventd.rc b/cel_apl/ueventd.rc
index 09f232903..b8c000a5f 100644
--- a/cel_apl/ueventd.rc
+++ b/cel_apl/ueventd.rc
@@ -73,6 +73,10 @@
 # i915 backlight driver
 /sys/devices/pci0000:00/0000:00:02.0/drm/card*/card*/intel_backlight brightness 0644 system system
 ##############################################################
+# Source: device/intel/mixins/groups/trusty/true/ueventd.rc
+##############################################################
+/dev/block/pci/pci0000:00/0000:00:*.0/by-name/teedata      0660 system system
+##############################################################
 # Source: device/intel/mixins/groups/camera/usbcamera/ueventd.rc
 ##############################################################
 # Camera
diff --git a/celadon/AndroidBoard.mk b/celadon/AndroidBoard.mk
index a41d8bd40..59866dc5c 100644
--- a/celadon/AndroidBoard.mk
+++ b/celadon/AndroidBoard.mk
@@ -433,6 +433,55 @@ $(provdata_zip): $(provdata_zip_deps) | $(ACP)
 
 INSTALLED_RADIOIMAGE_TARGET += $(provdata_zip)
 
+##############################################################
+# Source: device/intel/mixins/groups/trusty/true/AndroidBoard.mk
+##############################################################
+TOS_IMAGE_TARGET := $(TRUSTY_BUILDROOT)/evmm_lk_pkg.bin
+
+INTERNAL_PLATFORM := ikgt
+LOCAL_MAKE := make
+
+# Build the evmm_pkg.bin and lk.bin
+.PHONY: $(TOS_IMAGE_TARGET)
+$(TOS_IMAGE_TARGET):
+	@echo "making lk.bin.."
+	$(hide) (cd $(TOPDIR)trusty && $(TRUSTY_ENV_VAR) $(LOCAL_MAKE) sand-x86-64)
+	@echo "making tos image.."
+	$(hide) (cd $(TOPDIR)vendor/intel/fw/evmm/$(INTERNAL_PLATFORM) && $(TRUSTY_ENV_VAR) $(LOCAL_MAKE))
+
+#tos partition is assigned for trusty
+INSTALLED_TOS_IMAGE_TARGET := $(PRODUCT_OUT)/tos.img
+TOS_SIGNING_KEY := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8
+TOS_SIGNING_CERT := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem
+
+.PHONY: tosimage
+tosimage: $(INSTALLED_TOS_IMAGE_TARGET)
+
+ifeq (true,$(BOARD_AVB_ENABLE)) # BOARD_AVB_ENABLE == true
+$(INSTALLED_TOS_IMAGE_TARGET): $(TOS_IMAGE_TARGET) $(MKBOOTIMG) $(AVBTOOL)
+	@echo "mkbootimg to create boot image for TOS file: $@"
+	$(hide) $(MKBOOTIMG) --kernel $(TOS_IMAGE_TARGET) --output $@
+	$(hide) $(AVBTOOL) add_hash_footer \
+		--image $@ \
+		--partition_size $(BOARD_TOSIMAGE_PARTITION_SIZE) \
+		--partition_name tos $(INTERNAL_AVB_SIGNING_ARGS)
+BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --include_descriptors_from_image $(INSTALLED_TOS_IMAGE_TARGET)
+$(PRODUCT_OUT)/vbmeta.img: $(INSTALLED_TOS_IMAGE_TARGET)
+else
+$(INSTALLED_TOS_IMAGE_TARGET): $(TOS_IMAGE_TARGET) $(MKBOOTIMG) $(BOOT_SIGNER)
+	@echo "mkbootimg to create boot image for TOS file: $@"
+	$(hide) $(MKBOOTIMG) --kernel $(TOS_IMAGE_TARGET) --output $@
+	$(if $(filter true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_BOOT_SIGNER)),\
+		@echo "sign prebuilt TOS file: $@" &&\
+		$(BOOT_SIGNER) /tos $@ $(TOS_SIGNING_KEY) $(TOS_SIGNING_CERT) $@)
+endif
+
+INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_TOS_IMAGE_TARGET)
+
+make_dir_ab_tos:
+	@mkdir -p $(PRODUCT_OUT)/root/tos
+
+$(PRODUCT_OUT)/ramdisk.img: make_dir_ab_tos
 ##############################################################
 # Source: device/intel/mixins/groups/gptbuild/true/AndroidBoard.mk
 ##############################################################
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index 8265192e2..fff7b1a5d 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -408,6 +408,49 @@ USE_INTEL_FLASHFILES := true
 VARIANT_SPECIFIC_FLASHFILES ?= false
 FAST_FLASHFILES := true
 
+##############################################################
+# Source: device/intel/mixins/groups/trusty/true/BoardConfig.mk
+##############################################################
+TARGET_USE_TRUSTY := true
+
+KM_VERSION := 2
+ifeq ($(KM_VERSION),1)
+BOARD_USES_TRUSTY := true
+BOARD_USES_KEYMASTER1 := true
+endif
+
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/trusty
+BOARD_SEPOLICY_M4DEFS += module_trusty=true
+
+LK_PRODUCT := project-celadon_64
+
+LKBUILD_TOOLCHAIN_ROOT = $(PWD)/vendor/intel/external/prebuilts/elf/
+LKBUILD_X86_TOOLCHAIN =
+LKBUILD_X64_TOOLCHAIN = $(LKBUILD_TOOLCHAIN_ROOT)x86_64-elf-4.9.1-Linux-x86_64/bin
+EVMMBUILD_TOOLCHAIN ?= x86_64-linux-android-
+TRUSTY_BUILDROOT = $(PWD)/$(PRODUCT_OUT)/obj/trusty/
+
+TRUSTY_ENV_VAR += LK_CORE_NUM=1
+TRUSTY_ENV_VAR += TRUSTY_REF_TARGET=project-celadon_64
+
+#for trusty lk
+TRUSTY_ENV_VAR += BUILDROOT=$(TRUSTY_BUILDROOT)
+TRUSTY_ENV_VAR += PATH=$$PATH:$(LKBUILD_X86_TOOLCHAIN):$(LKBUILD_X64_TOOLCHAIN)
+TRUSTY_ENV_VAR += CLANG_BINDIR=$(PWD)/$(LLVM_PREBUILTS_PATH)
+TRUSTY_ENV_VAR += ARCH_x86_64_TOOLCHAIN_PREFIX=${PWD}/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-${TARGET_GCC_VERSION}/bin/x86_64-linux-android-
+
+#for trusty vmm
+# use same toolchain as android kernel
+TRUSTY_ENV_VAR += COMPILE_TOOLCHAIN=$(EVMMBUILD_TOOLCHAIN)
+
+# output build dir to android out folder
+TRUSTY_ENV_VAR += BUILD_DIR=$(TRUSTY_BUILDROOT)
+TRUSTY_ENV_VAR += LKBIN_DIR=$(TRUSTY_BUILDROOT)/build-sand-x86-64/
+
+#Workaround CPU lost issue on SIMICS, will remove this line below after PO.
+BOARD_KERNEL_CMDLINE += cpu_init_udelay=500000
+
+BOARD_TOSIMAGE_PARTITION_SIZE := 10485760
 ##############################################################
 # Source: device/intel/mixins/groups/camera/usbcamera/BoardConfig.mk
 ##############################################################
diff --git a/celadon/device.mk b/celadon/device.mk
index 69ecf750d..4d270923c 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -641,6 +641,36 @@ PRODUCT_PACKAGES_DEBUG += \
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.midi.xml:system/etc/permissions/android.software.midi.xml
 ##############################################################
+# Source: device/intel/mixins/groups/trusty/true/product.mk
+##############################################################
+
+KM_VERSION := 2
+
+ifeq ($(KM_VERSION),2)
+PRODUCT_PACKAGES += \
+	keystore.trusty
+PRODUCT_PROPERTY_OVERRIDES += \
+	ro.hardware.keystore=trusty
+endif
+
+ifeq ($(KM_VERSION),1)
+PRODUCT_PACKAGES += \
+	keystore.project-celadon
+endif
+
+PRODUCT_PACKAGES += \
+	libtrusty \
+	storageproxyd \
+	libtrustystorage \
+	libtrustystorageinterface \
+	gatekeeper.trusty \
+	android.hardware.gatekeeper@1.0-impl \
+	android.hardware.gatekeeper@1.0-service
+
+PRODUCT_PROPERTY_OVERRIDES += \
+	ro.hardware.gatekeeper=trusty
+
+##############################################################
 # Source: device/intel/mixins/groups/memtrack/true/product.mk
 ##############################################################
 # memtrack HAL
diff --git a/celadon/flashfiles.ini b/celadon/flashfiles.ini
index ab26dba9a..af6f0e18e 100644
--- a/celadon/flashfiles.ini
+++ b/celadon/flashfiles.ini
@@ -111,6 +111,11 @@ file = images:vbmeta.img
 description = Flash vbmeta_a partition
 
 
+[command.flash.tos_a]
+tool = fastboot
+args = flash tos_a $file
+file = radio:tos.img
+description = Flash tos_a partition
 
 
 [command.flash.boot_a]
diff --git a/celadon/fstab b/celadon/fstab
index 0779c05ca..842315754 100644
--- a/celadon/fstab
+++ b/celadon/fstab
@@ -38,11 +38,12 @@
 
 # If enable AVB and A/B slot, then will mount system partition as / through /dev/dm-0
 /dev/block/by-name/system       /               ext4    ro                                                          wait,slotselect,avb
-/dev/block/by-name/data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,quota
+/dev/block/by-name/data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts,quota
 /dev/block/by-name/boot         /boot           emmc    defaults                                                    defaults,slotselect,avb
 /dev/block/by-name/misc         /misc           emmc    defaults                                                    defaults
 /dev/block/by-name/bootloader   /bootloader     emmc    defaults                                                    recoveryonly
 /dev/block/by-name/bootloader2  /bootloader2    emmc    defaults                                                    recoveryonly
 /dev/block/by-name/persistent   /persistent     emmc    defaults                                                    defaults
 /dev/block/by-name/metadata     /metadata       emmc    defaults                                                    defaults
+/dev/block/by-name/tos          /tos            emmc    defaults                                                    defaults,slotselect,avb
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/celadon/gpt.ini b/celadon/gpt.ini
index 04c6c0025..10f6ab812 100644
--- a/celadon/gpt.ini
+++ b/celadon/gpt.ini
@@ -4,7 +4,7 @@
 # Source: device/intel/mixins/groups/boot-arch/project-celadon/gpt.ini
 ##############################################################
 [base]
-partitions = bootloader bootloader2 boot  misc metadata system persistent vendor config factory  vbmeta teedata data
+partitions = bootloader bootloader2 boot  misc metadata system persistent vendor config factory tos vbmeta teedata data
 device = auto
 nb_slot = 2
 
@@ -82,6 +82,12 @@ len = 10
 type = linux
 guid = 8f68cc74-c5e5-48da-be91-a0c8c15e9c80
 
+[partition.tos]
+label = tos
+len = 10
+type = boot
+has_slot = true
+guid = 52cd00fd-f5b0-4061-b3a5-65b07f2179f0
 
 [partition.vbmeta]
 label = vbmeta
diff --git a/celadon/init.rc b/celadon/init.rc
index 165e19c82..0325c83df 100644
--- a/celadon/init.rc
+++ b/celadon/init.rc
@@ -674,6 +674,23 @@ on property:sys.usb.config=midi,adb
     start adbd
     setprop sys.usb.state ${sys.usb.config}
 ##############################################################
+# Source: device/intel/mixins/groups/trusty/true/init.rc
+##############################################################
+on fs
+    # Update device node r/w attribute
+    chown system system /dev/trusty-ipc-dev0
+    chmod 666 /dev/trusty-ipc-dev0
+
+on post-fs-data
+    mkdir /data/vendor/securestorage 0700 system system
+    chmod 666 /dev/rpmb0
+
+service storageproxyd /vendor/bin/storageproxyd -d /dev/trusty-ipc-dev0 -p /data/vendor/securestorage -r /dev/rpmb0
+    class late_start
+    user system
+    group system
+
+##############################################################
 # Source: device/intel/mixins/groups/debug-kernel/default/init.rc
 ##############################################################
 import /init.kernel.rc
diff --git a/celadon/ueventd.rc b/celadon/ueventd.rc
index 09f232903..b8c000a5f 100644
--- a/celadon/ueventd.rc
+++ b/celadon/ueventd.rc
@@ -73,6 +73,10 @@
 # i915 backlight driver
 /sys/devices/pci0000:00/0000:00:02.0/drm/card*/card*/intel_backlight brightness 0644 system system
 ##############################################################
+# Source: device/intel/mixins/groups/trusty/true/ueventd.rc
+##############################################################
+/dev/block/pci/pci0000:00/0000:00:*.0/by-name/teedata      0660 system system
+##############################################################
 # Source: device/intel/mixins/groups/camera/usbcamera/ueventd.rc
 ##############################################################
 # Camera

From b325f52d7f4e0444db8f1ac5841ca5d560f92dfe Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Tue, 21 Aug 2018 09:50:50 +0530
Subject: [PATCH 305/427] [MIXINUP] [Celadon] Add hevc encoder support on
 celadon #41

Tracked-On :None
Signed-off-by: Swaroop Balan <swaroop.balan@intel.com>
---
 cel_apl/device.mk | 2 ++
 celadon/device.mk | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 9bb97e484..5467f0b88 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -240,6 +240,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PACKAGES += \
     libmfxhw32 \
     libmfxhw64 \
+    libmfx_hevce_hw32 \
+    libmfx_hevce_hw64 \
     libmfx_omx_core \
     libmfx_omx_components_hw \
     libstagefrighthw
diff --git a/celadon/device.mk b/celadon/device.mk
index 4d270923c..1c5452ef9 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -240,6 +240,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PACKAGES += \
     libmfxhw32 \
     libmfxhw64 \
+    libmfx_hevce_hw32 \
+    libmfx_hevce_hw64 \
     libmfx_omx_core \
     libmfx_omx_components_hw \
     libstagefrighthw

From a6638779325cdae91a0de6e70199026cd8f3f064 Mon Sep 17 00:00:00 2001
From: "tianmi.chen" <tianmi.chen@intel.com>
Date: Wed, 22 Aug 2018 11:12:22 +0800
Subject: [PATCH 306/427] Modify codec performance data

Jira: OAM-65293
Test: Done.

Signed-off-by: tianmi.chen <tianmi.chen@intel.com>
---
 common/media/media_codecs_performance.xml | 48 +++++++++++------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/common/media/media_codecs_performance.xml b/common/media/media_codecs_performance.xml
index d5e55c33b..470742422 100644
--- a/common/media/media_codecs_performance.xml
+++ b/common/media/media_codecs_performance.xml
@@ -17,44 +17,44 @@
 <MediaCodecs>
     <Decoders>
         <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="600-800" />
+            <Limit name="measured-frame-rate-176x144" range="2500-3200" />
         </MediaCodec>
         <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
             <Limit name="measured-frame-rate-320x240" range="530-590" />
-            <Limit name="measured-frame-rate-720x480" range="170-190" />
-            <Limit name="measured-frame-rate-1280x720" range="50-55" />
-            <Limit name="measured-frame-rate-1920x1080" range="20-22" />
+            <Limit name="measured-frame-rate-720x480" range="300-480" />
+            <Limit name="measured-frame-rate-1280x720" range="100-150" />
+            <Limit name="measured-frame-rate-1920x1080" range="40-60" />
         </MediaCodec>
         <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
             <Limit name="measured-frame-rate-352x288" range="450-510" />
             <Limit name="measured-frame-rate-640x360" range="200-220" />
-            <Limit name="measured-frame-rate-720x480" range="170-190" />
-            <Limit name="measured-frame-rate-1280x720" range="70-80" />
-            <Limit name="measured-frame-rate-1920x1080" range="40-50" />
+            <Limit name="measured-frame-rate-720x480" range="360-480" />
+            <Limit name="measured-frame-rate-1280x720" range="180-220" />
+            <Limit name="measured-frame-rate-1920x1080" range="100-150" />
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="600-800" />
+            <Limit name="measured-frame-rate-176x144" range="3200-4200" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
             <Limit name="measured-frame-rate-320x180" range="860-930" />
-            <Limit name="measured-frame-rate-640x360" range="290-320" />
-            <Limit name="measured-frame-rate-1280x720" range="65-70" />
+            <Limit name="measured-frame-rate-640x360" range="600-800" />
+            <Limit name="measured-frame-rate-1280x720" range="100-200" />
             <Limit name="measured-frame-rate-1920x1080" range="25-30" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
-            <Limit name="measured-frame-rate-320x180" range="530-600" />
-            <Limit name="measured-frame-rate-640x360" range="220-240" />
-            <Limit name="measured-frame-rate-1280x720" range="80-100" />
-            <Limit name="measured-frame-rate-1920x1080" range="45-55" />
+            <Limit name="measured-frame-rate-320x180" range="1200-1900" />
+            <Limit name="measured-frame-rate-640x360" range="700-900" />
+            <Limit name="measured-frame-rate-1280x720" range="200-300" />
+            <Limit name="measured-frame-rate-1920x1080" range="120-200" />
         </MediaCodec>
         <MediaCodec name="OMX.Intel.hw_vd.h264" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="740-980" />
-            <Limit name="measured-frame-rate-720x480" range="830-1020" />
-            <Limit name="measured-frame-rate-1280x720" range="460-590" />
+            <Limit name="measured-frame-rate-320x240" range="5000-7200" />
+            <Limit name="measured-frame-rate-720x480" range="2500-4200" />
+            <Limit name="measured-frame-rate-1280x720" range="800-1700" />
             <Limit name="measured-frame-rate-1920x1088" range="320-360" />
         </MediaCodec>
         <MediaCodec name="OMX.Intel.hw_vd.h265" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="1200-1250" />
+            <Limit name="measured-frame-rate-352x288" range="3000-4300" />
             <Limit name="measured-frame-rate-640x360" range="1000-1400" />
             <Limit name="measured-frame-rate-720x480" range="820-1020" />
             <Limit name="measured-frame-rate-1280x720" range="540-580" />
@@ -62,15 +62,15 @@
             <Limit name="measured-frame-rate-3840x2160" range="120-130" />
         </MediaCodec>
         <MediaCodec name="OMX.Intel.hw_vd.vp8" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="1230-1340" />
-            <Limit name="measured-frame-rate-640x360" range="600-620" />
-            <Limit name="measured-frame-rate-1280x720" range="560-600" />
+            <Limit name="measured-frame-rate-320x180" range="5800-6800" />
+            <Limit name="measured-frame-rate-640x360" range="4000-5000" />
+            <Limit name="measured-frame-rate-1280x720" range="1000-1600" />
             <Limit name="measured-frame-rate-1920x1080" range="270-330" />
         </MediaCodec>
         <MediaCodec name="OMX.Intel.hw_vd.vp9" type="video/x-vnd.on2.vp9" update="true">
-            <Limit name="measured-frame-rate-320x180" range="1300-1800" />
-            <Limit name="measured-frame-rate-640x360" range="500-540" />
-            <Limit name="measured-frame-rate-1280x720" range="560-590" />
+            <Limit name="measured-frame-rate-320x180" range="6000-7000" />
+            <Limit name="measured-frame-rate-640x360" range="3800-4700" />
+            <Limit name="measured-frame-rate-1280x720" range="1000-1500" />
             <Limit name="measured-frame-rate-1920x1080" range="350-420" />
             <Limit name="measured-frame-rate-3840x2160" range="100-130" />
         </MediaCodec>

From 9675b1deb8543ab271221d1d0c3603e57c8b623c Mon Sep 17 00:00:00 2001
From: "ji, zhenlong z" <zhenlong.z.ji@intel.com>
Date: Mon, 20 Aug 2018 14:47:35 +0800
Subject: [PATCH 307/427] Enable selinux on celadon P

Jira: None
Test: Device can boot to UI and no obvious regressions were found.

Tracked-On: None
Signed-off-by: ji, zhenlong z <zhenlong.z.ji@intel.com>
---
 cel_apl/mixins.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cel_apl/mixins.spec b/cel_apl/mixins.spec
index 4cd641fb0..95fd4996e 100644
--- a/cel_apl/mixins.spec
+++ b/cel_apl/mixins.spec
@@ -7,7 +7,7 @@ product.mk: device.mk
 [groups]
 2ndstage: oemvars
 project-celadon: default
-sepolicy: permissive
+sepolicy: enforcing
 graphics: project-celadon(gen9+=true,hwc2=true,vulkan=false,drmhwc=false,minigbm=true,gralloc1=true)
 media: project-celadon(mediasdk=false,media_sdk_source=false)
 device-type: car

From c63613fd541f145548bb80f8a23a37d42b723dc9 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Thu, 23 Aug 2018 14:02:27 +0530
Subject: [PATCH 308/427] [MIXINUP] Enable selinux on celadon P #37

Tracked-On: None
Signed-off-by: Swaroop Balan <swaroop.balan@intel.com>
---
 cel_apl/BoardConfig.mk | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index ab94144a5..5fa9c1e0a 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -10,13 +10,7 @@ BOARD_OEM_VARS += $(TARGET_DEVICE_DIR)/oemvars.txt
 ##############################################################
 KERNEL_CROSS_COMPILE_WRAPPER := x86_64-linux-android-
 ##############################################################
-# Source: device/intel/mixins/groups/sepolicy/permissive/BoardConfig.mk.1
-##############################################################
-# start kernel in permissive mode, this way we don't
-# need 'setenforce 0' from init.rc files
-BOARD_KERNEL_CMDLINE += enforcing=0 androidboot.selinux=permissive
-##############################################################
-# Source: device/intel/mixins/groups/sepolicy/permissive/BoardConfig.mk
+# Source: device/intel/mixins/groups/sepolicy/enforcing/BoardConfig.mk
 ##############################################################
 # SELinux Policy
 BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy

From e65a940eed57c45451b5f7d98156d5cceeb9181d Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Tue, 28 Aug 2018 10:40:11 +0530
Subject: [PATCH 309/427] [MIXINUP] gptbuild does not include the userdata, and
 delete the dependence of efitools. #48

Tracked-On: None
Signed-off-by: Swaroop Balan <swaroop.balan@intel.com>
---
 cel_apl/AndroidBoard.mk | 7 +------
 celadon/AndroidBoard.mk | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/cel_apl/AndroidBoard.mk b/cel_apl/AndroidBoard.mk
index cc4520d96..9b395e44d 100644
--- a/cel_apl/AndroidBoard.mk
+++ b/cel_apl/AndroidBoard.mk
@@ -352,7 +352,7 @@ GEN_BLPOLICY_OEMVARS := device/intel/build/generate_blpolicy_oemvars
 TARGET_ODM_KEY_PAIR := device/intel/build/testkeys/odm
 TARGET_OAK_KEY_PAIR := device/intel/build/testkeys/OAK
 
-$(BOOTLOADER_POLICY_OEMVARS): sign-efi-sig-list
+$(BOOTLOADER_POLICY_OEMVARS):
 	$(GEN_BLPOLICY_OEMVARS) -K $(TARGET_ODM_KEY_PAIR) \
 		-O $(TARGET_OAK_KEY_PAIR).x509.pem -B $(TARGET_BOOTLOADER_POLICY) \
 		$(BOOTLOADER_POLICY_OEMVARS)
@@ -541,10 +541,6 @@ $(GPTIMAGE_BIN): \
 	$(hide) rm -f $(INSTALLED_SYSTEMIMAGE).raw
 	$(hide) rm -f $(INSTALLED_USERDATAIMAGE_TARGET).raw
 
-	$(MAKE_EXT4FS) \
-		-l $(BOARD_USERDATAIMAGE_PARTITION_SIZE) -L data \
-		$(PRODUCT_OUT)/userdata.dummy
-
 	$(SIMG2IMG) $(INSTALLED_SYSTEMIMAGE) $(INSTALLED_SYSTEMIMAGE).raw
 	$(SIMG2IMG) $(INSTALLED_VENDORIMAGE_TARGET) $(INSTALLED_VENDORIMAGE_TARGET).raw
 
@@ -561,7 +557,6 @@ $(GPTIMAGE_BIN): \
 		--vbmeta $(INSTALLED_VBMETAIMAGE_TARGET) \
 		--system $(INSTALLED_SYSTEMIMAGE).raw \
 		--vendor $(INSTALLED_VENDORIMAGE_TARGET).raw \
-		--data $(PRODUCT_OUT)/userdata.dummy \
 		--config $(raw_config) \
 		--factory $(raw_factory)
 
diff --git a/celadon/AndroidBoard.mk b/celadon/AndroidBoard.mk
index 59866dc5c..5d53b12e1 100644
--- a/celadon/AndroidBoard.mk
+++ b/celadon/AndroidBoard.mk
@@ -346,7 +346,7 @@ GEN_BLPOLICY_OEMVARS := device/intel/build/generate_blpolicy_oemvars
 TARGET_ODM_KEY_PAIR := device/intel/build/testkeys/odm
 TARGET_OAK_KEY_PAIR := device/intel/build/testkeys/OAK
 
-$(BOOTLOADER_POLICY_OEMVARS): sign-efi-sig-list
+$(BOOTLOADER_POLICY_OEMVARS):
 	$(GEN_BLPOLICY_OEMVARS) -K $(TARGET_ODM_KEY_PAIR) \
 		-O $(TARGET_OAK_KEY_PAIR).x509.pem -B $(TARGET_BOOTLOADER_POLICY) \
 		$(BOOTLOADER_POLICY_OEMVARS)
@@ -535,10 +535,6 @@ $(GPTIMAGE_BIN): \
 	$(hide) rm -f $(INSTALLED_SYSTEMIMAGE).raw
 	$(hide) rm -f $(INSTALLED_USERDATAIMAGE_TARGET).raw
 
-	$(MAKE_EXT4FS) \
-		-l $(BOARD_USERDATAIMAGE_PARTITION_SIZE) -L data \
-		$(PRODUCT_OUT)/userdata.dummy
-
 	$(SIMG2IMG) $(INSTALLED_SYSTEMIMAGE) $(INSTALLED_SYSTEMIMAGE).raw
 	$(SIMG2IMG) $(INSTALLED_VENDORIMAGE_TARGET) $(INSTALLED_VENDORIMAGE_TARGET).raw
 
@@ -555,7 +551,6 @@ $(GPTIMAGE_BIN): \
 		--vbmeta $(INSTALLED_VBMETAIMAGE_TARGET) \
 		--system $(INSTALLED_SYSTEMIMAGE).raw \
 		--vendor $(INSTALLED_VENDORIMAGE_TARGET).raw \
-		--data $(PRODUCT_OUT)/userdata.dummy \
 		--config $(raw_config) \
 		--factory $(raw_factory)
 

From 6c2e9b715f4347eaa869111ffd390d340bee271b Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Wed, 29 Aug 2018 11:53:10 +0530
Subject: [PATCH 310/427] [MIXINUP] audio: Add sepolicy directory #49

Tracked-On: OAM-67968
Signed-off-by: Swaroop Balan <swaroop.balan@intel.com>
---
 cel_apl/BoardConfig.mk | 2 ++
 celadon/BoardConfig.mk | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index 5fa9c1e0a..d48564d88 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -278,6 +278,8 @@ endif
 USE_XML_AUDIO_POLICY_CONF ?= 1
 # Use configurable audio policy
 USE_CONFIGURABLE_AUDIO_POLICY ?= 1
+
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/audio/project-celadon
 ##############################################################
 # Source: device/intel/mixins/groups/wlan/iwlwifi/BoardConfig.mk
 ##############################################################
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index fff7b1a5d..36bc34c6b 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -278,6 +278,8 @@ endif
 USE_XML_AUDIO_POLICY_CONF ?= 1
 # Use configurable audio policy
 USE_CONFIGURABLE_AUDIO_POLICY ?= 1
+
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/audio/project-celadon
 ##############################################################
 # Source: device/intel/mixins/groups/wlan/iwlwifi/BoardConfig.mk
 ##############################################################

From 907d80193d5fdd82844dbec3207eb3969d66da00 Mon Sep 17 00:00:00 2001
From: Jeevaka Prabu Badrappan <jeevaka.badrappan@intel.com>
Date: Mon, 27 Aug 2018 15:45:21 +0530
Subject: [PATCH 311/427] Audio: Add sepolicy files

Due to missing sepolicies for audio, audio server is getting
restarted and as a result bluetooth service also gets restarted.

Add sepolicies for audio to get audio and bluetooth working.

Tracked-On: OAM-67968

Signed-off-by: Jeevaka Prabu Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: ji, zhenlong z <zhenlong.z.ji@intel.com>
Signed-off-by: Ding XinX <xinx.ding@intel.com>
Signed-off-by: Qiming Shi <qiming.shi@intel.com>
---
 sepolicy/audio/project-celadon/audioserver.te | 25 +++++++++++++++++++
 sepolicy/audio/project-celadon/file_contexts  |  1 +
 .../project-celadon/hal_audio_default.te      | 12 +++++++++
 sepolicy/audio/project-celadon/netd.te        |  7 ++++++
 sepolicy/audio/project-celadon/property.te    |  1 +
 .../audio/project-celadon/property_contexts   |  2 ++
 .../audio/project-celadon/system_server.te    |  6 +++++
 .../project-celadon/violators_blacklist.te    |  1 +
 8 files changed, 55 insertions(+)
 create mode 100644 sepolicy/audio/project-celadon/file_contexts
 create mode 100644 sepolicy/audio/project-celadon/netd.te
 create mode 100644 sepolicy/audio/project-celadon/property.te
 create mode 100644 sepolicy/audio/project-celadon/property_contexts
 create mode 100644 sepolicy/audio/project-celadon/system_server.te
 create mode 100644 sepolicy/audio/project-celadon/violators_blacklist.te

diff --git a/sepolicy/audio/project-celadon/audioserver.te b/sepolicy/audio/project-celadon/audioserver.te
index 52cb04a2e..963506a43 100644
--- a/sepolicy/audio/project-celadon/audioserver.te
+++ b/sepolicy/audio/project-celadon/audioserver.te
@@ -1 +1,26 @@
 ignore_adb_debug(audioserver)
+
+set_prop(audioserver, audio_prop)
+
+userdebug_or_eng(`
+  # audioserver exposes a remote debugging port
+
+  # used for parameter framework (PFW) tuning and debug
+  dontaudit audioserver fwmarkd_socket:sock_file write;
+  dontaudit audioserver netd:unix_stream_socket connectto;
+  dontaudit audioserver node:tcp_socket node_bind;
+  dontaudit audioserver port:tcp_socket name_bind;
+  dontaudit audioserver self:tcp_socket { accept bind create getopt listen read setopt write };
+')
+
+# audioserver recovery mechanism through uevent
+allow audioserver self:netlink_kobject_uevent_socket { create bind setopt read };
+allowxperm audioserver self:netlink_kobject_uevent_socket ioctl SIOCETHTOOL;
+
+# Ringbuffer data files & Runtime Communication with SmartXBar data files
+allow audioserver audioserver_data_file:dir rw_dir_perms;
+allow audioserver audioserver_data_file:{ file fifo_file } create_file_perms;
+
+# allow audioserver to set SCHED_FIFO for SmartXBar worker threads
+allow audioserver self:capability sys_nice;
+allow audioserver self:process { setsched };
diff --git a/sepolicy/audio/project-celadon/file_contexts b/sepolicy/audio/project-celadon/file_contexts
new file mode 100644
index 000000000..b197163fd
--- /dev/null
+++ b/sepolicy/audio/project-celadon/file_contexts
@@ -0,0 +1 @@
+/dev/snd/.*                 u:object_r:audio_device:s0
diff --git a/sepolicy/audio/project-celadon/hal_audio_default.te b/sepolicy/audio/project-celadon/hal_audio_default.te
index bfd25f255..cac593851 100644
--- a/sepolicy/audio/project-celadon/hal_audio_default.te
+++ b/sepolicy/audio/project-celadon/hal_audio_default.te
@@ -1,3 +1,15 @@
+#
+# hal_audio_default is provided by the base policy and mixin
+# project-celadon defines the hal services.
+#
+# Audio uses the default implementations as defined in the product.mk:
+# audio/project-celadon/product.mk:    android.hardware.audio@2.0-impl \
+# audio/project-celadon/product.mk:    android.hardware.audio@2.0-service \
+# audio/project-celadon/product.mk:    android.hardware.audio.effect@2.0-impl \
+#
+# Which can be found digging around: hardware/interfaces/audio/2.0
+#
+
 ignore_adb_debug(hal_audio_default)
 
 allow hal_audio_default self:capability sys_nice;
diff --git a/sepolicy/audio/project-celadon/netd.te b/sepolicy/audio/project-celadon/netd.te
new file mode 100644
index 000000000..463f31b58
--- /dev/null
+++ b/sepolicy/audio/project-celadon/netd.te
@@ -0,0 +1,7 @@
+userdebug_or_eng(`
+  # used for parameter framework (PFW) tuning and debug
+  allow netd hal_audio_default:fd use;
+  allow netd hal_audio_default:tcp_socket { getopt read setopt write };
+  allow netd audioserver:fd use;
+  allow netd audioserver:tcp_socket { getopt read setopt write };
+')
diff --git a/sepolicy/audio/project-celadon/property.te b/sepolicy/audio/project-celadon/property.te
new file mode 100644
index 000000000..4d79beac7
--- /dev/null
+++ b/sepolicy/audio/project-celadon/property.te
@@ -0,0 +1 @@
+type audiohal_prop, property_type;
diff --git a/sepolicy/audio/project-celadon/property_contexts b/sepolicy/audio/project-celadon/property_contexts
new file mode 100644
index 000000000..7696111a9
--- /dev/null
+++ b/sepolicy/audio/project-celadon/property_contexts
@@ -0,0 +1,2 @@
+audiohal.            u:object_r:audiohal_prop:s0
+persist.audiohal.    u:object_r:audiohal_prop:s0
diff --git a/sepolicy/audio/project-celadon/system_server.te b/sepolicy/audio/project-celadon/system_server.te
new file mode 100644
index 000000000..8fcc53062
--- /dev/null
+++ b/sepolicy/audio/project-celadon/system_server.te
@@ -0,0 +1,6 @@
+#
+# system_server
+#
+
+allow system_server hal_audio_default:file write;
+allow system_server audioserver:file w_file_perms;
diff --git a/sepolicy/audio/project-celadon/violators_blacklist.te b/sepolicy/audio/project-celadon/violators_blacklist.te
new file mode 100644
index 000000000..f22304986
--- /dev/null
+++ b/sepolicy/audio/project-celadon/violators_blacklist.te
@@ -0,0 +1 @@
+typeattribute hal_audio_default data_between_core_and_vendor_violators;

From e643728eea6dcbab2ddb73e373e07526537facba Mon Sep 17 00:00:00 2001
From: Raveendra Babu Chennakesavulu <raveendra.babu.chennakesavulu@intel.com>
Date: Mon, 27 Aug 2018 15:49:13 +0530
Subject: [PATCH 312/427] Adding stable firmware for 8265 & 3168 modules.

Hidden SSID in 5Ghz fails with the latest upstreamed firmware,
hence modified to pick stable firmware instead upstreamed one.

Changes
- Modified firmware.mk to pick the stable firmware.
- Removed FIRMWARE_PATTERN macro, which adds non device specific
  firmwares as well.

Tracked-On: OAM-66721
Signed-off-by: Babu Chennakesavulu, Raveendra
			<raveendra.babu.chennakesavulu@intel.com>
---
 common/firmware.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/common/firmware.mk b/common/firmware.mk
index 36ce2129e..0105e0402 100644
--- a/common/firmware.mk
+++ b/common/firmware.mk
@@ -19,7 +19,9 @@
 LOCAL_FIRMWARE_SRC := \
     i6050-fw-usb-1.5.sbcf \
     i2400m-fw-usb-1.4.sbcf \
-    i2400m-fw-usb-1.5.sbcf
+    i2400m-fw-usb-1.5.sbcf \
+    iwlwifi-3168-29.ucode \
+    iwlwifi-8265-31.ucode
 
 ## List of complete Firmware folders to be copied
 
@@ -29,8 +31,8 @@ LOCAL_FIRMWARE_DIR := \
 
 ## List of matching patterns of Firmware bins to be copied
 
-LOCAL_FIRMWARE_PATTERN := \
-    iwlwifi
+#LOCAL_FIRMWARE_PATTERN := \
+#    iwlwifi
 
 LOCAL_FIRMWARE_SRC += $(foreach f,$(LOCAL_FIRMWARE_PATTERN),$(shell cd $(FIRMWARES_DIR) && find . -iname "*$(f)*" -type f ))
 LOCAL_FIRMWARE_SRC += $(foreach f,$(LOCAL_FIRMWARE_DIR),$(shell cd $(FIRMWARES_DIR) && find $(f) -type f) )

From 2234fef5cd1490ae3ea0f8071f5d565d1d6c29df Mon Sep 17 00:00:00 2001
From: renchenglei <chenglei.ren@intel.com>
Date: Tue, 28 Aug 2018 10:07:02 +0800
Subject: [PATCH 313/427] [MIXINUP] Enable vulkan on Apollo Lake IVI

Tracked-On: OAM-67941
---
 cel_apl/mixins.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cel_apl/mixins.spec b/cel_apl/mixins.spec
index 95fd4996e..daaca192a 100644
--- a/cel_apl/mixins.spec
+++ b/cel_apl/mixins.spec
@@ -8,7 +8,7 @@ product.mk: device.mk
 2ndstage: oemvars
 project-celadon: default
 sepolicy: enforcing
-graphics: project-celadon(gen9+=true,hwc2=true,vulkan=false,drmhwc=false,minigbm=true,gralloc1=true)
+graphics: project-celadon(gen9+=true,hwc2=true,vulkan=true,drmhwc=false,minigbm=true,gralloc1=true)
 media: project-celadon(mediasdk=false,media_sdk_source=false)
 device-type: car
 ethernet: dhcp

From ebdeac3b7052bf7ad9bec402b2c1f2294ce4eaf9 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Thu, 30 Aug 2018 10:16:20 +0530
Subject: [PATCH 314/427] [MIXINUP] [MIXINUP] Enable vulkan on Apollo Lake IVI
 #44

Tracked-On: OAM-67941
Signed-off-by: Swaroop Balan <swaroop.balan@intel.com>
---
 cel_apl/device.mk | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 5467f0b88..67f22d0c4 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -197,8 +197,19 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PROPERTY_OVERRIDES += \
    ro.opengles.version=196610
 
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:system/etc/permissions/android.hardware.vulkan.level.xml
+
+
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:system/etc/permissions/android.hardware.vulkan.version.xml
 
+PRODUCT_PACKAGES += \
+    vulkan.project-celadon \
+    libvulkan_intel
 
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.hardware.vulkan=project-celadon
 
 # Graphics HAL
 PRODUCT_PACKAGES += \

From 42a4d7c134bd9f2d93162688857b2187b0f1b0cd Mon Sep 17 00:00:00 2001
From: Ming Tan <ming.tan@intel.com>
Date: Tue, 7 Aug 2018 09:35:19 +0800
Subject: [PATCH 315/427] Set the CONFIG_EFI_BOOTLOADER_CONTROL to y instead of
 m.

This module is used to record the reboot reason.

Jira: https://01.org/jira/browse/CEL-46
Test: Test it in KBL NUC with BIOS support EFI variable runtime service.
      Use command 'adb reboot', after device reboot, check the kernel
      command line option, androidboot.bootreason=reboot

Signed-off-by: Ming Tan <ming.tan@intel.com>
---
 kernel_config/kernel_64_defconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 355938f45..ecb9c7f85 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -6816,13 +6816,13 @@ CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
 #
 # EFI (Extensible Firmware Interface) Support
 #
-CONFIG_EFI_VARS=m
+CONFIG_EFI_VARS=y
 CONFIG_EFI_ESRT=y
 CONFIG_EFI_VARS_PSTORE=m
 # CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_RUNTIME_WRAPPERS=y
-CONFIG_EFI_BOOTLOADER_CONTROL=m
+CONFIG_EFI_BOOTLOADER_CONTROL=y
 # CONFIG_EFI_CAPSULE_LOADER is not set
 # CONFIG_EFI_TEST is not set
 CONFIG_APPLE_PROPERTIES=y

From 8f5694587035ca47e5d7394110dadcee01e967a1 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Thu, 30 Aug 2018 10:20:36 +0530
Subject: [PATCH 316/427] [MIXINUP] Add the fstab.recovery. #51

Tracked-On: OAM-67712
Signed-off-by: Swaroop Balan <swaroop.balan@intel.com>
---
 cel_apl/BoardConfig.mk |  2 +-
 cel_apl/fstab.recovery | 44 ++++++++++++++++++++++++++++++++++++++++++
 celadon/BoardConfig.mk |  2 +-
 celadon/fstab.recovery | 44 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 90 insertions(+), 2 deletions(-)
 create mode 100644 cel_apl/fstab.recovery
 create mode 100644 celadon/fstab.recovery

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index d48564d88..fb4be30fd 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -239,7 +239,7 @@ BOARD_FLASHFILES += $(PRODUCT_OUT)/fastboot-usb.img
 
 # -- OTA RELATED DEFINES --
 # tell build system where to get the recovery.fstab.
-TARGET_RECOVERY_FSTAB ?= $(TARGET_DEVICE_DIR)/fstab
+TARGET_RECOVERY_FSTAB ?= $(TARGET_DEVICE_DIR)/fstab.recovery
 # Used by ota_from_target_files to add platform-specific directives
 # to the OTA updater scripts
 TARGET_RELEASETOOLS_EXTENSIONS ?= device/intel/common/recovery
diff --git a/cel_apl/fstab.recovery b/cel_apl/fstab.recovery
new file mode 100644
index 000000000..6ea51e384
--- /dev/null
+++ b/cel_apl/fstab.recovery
@@ -0,0 +1,44 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/factory-partition/true/fstab.recovery
+##############################################################
+/dev/block/by-name/factory      /factory        ext4    rw,noatime                                                  wait
+##############################################################
+# Source: device/intel/mixins/groups/config-partition/enabled/fstab.recovery
+##############################################################
+/dev/block/by-name/config	    /oem_config     ext4    noatime,nosuid,nodev,errors=panic                           wait,check
+##############################################################
+# Source: device/intel/mixins/groups/avb/true/fstab.recovery
+##############################################################
+/dev/block/by-name/vbmeta       /vbmeta         emmc    defaults                                                    defaults,slotselect
+##############################################################
+# Source: device/intel/mixins/groups/vendor-partition/true/fstab.recovery
+##############################################################
+# Following line is required if you use a vendor image.
+# If the vendor image is not used,
+# following line should be commented with the related ones in BoardConfig.mk
+/dev/block/by-name/vendor	    /vendor         ext4    ro                                                          wait,slotselect
+##############################################################
+# Source: device/intel/mixins/groups/boot-arch/project-celadon/fstab.recovery
+##############################################################
+# Android fstab file.
+# <src>                   <mnt_point> <type>  <mnt_flags and options>  <fs_mgr_flags>
+# The filesystem that contains the filesystem checker binary (typically /system) cannot
+# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
+
+/devices/*/usb*/*               auto            auto    defaults                                                    voldmanaged=usb:auto
+/devices/*/*sdmmc*/*            auto            auto    defaults                                                    voldmanaged=sdcard1:auto
+/devices/*/80860F14:01/mmc_*    auto            auto    defaults                                                    voldmanaged=sdcard1:auto
+
+# If enable AVB and A/B slot, then will mount system partition as / through /dev/dm-0
+/dev/block/by-name/system       /               ext4    ro                                                          wait,slotselect,avb
+/dev/block/by-name/data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts,quota
+/dev/block/by-name/boot         /boot           emmc    defaults                                                    defaults,slotselect
+/dev/block/by-name/misc         /misc           emmc    defaults                                                    defaults
+/dev/block/by-name/bootloader   /bootloader     emmc    defaults                                                    recoveryonly
+/dev/block/by-name/bootloader2  /bootloader2    emmc    defaults                                                    recoveryonly
+/dev/block/by-name/persistent   /persistent     emmc    defaults                                                    defaults
+/dev/block/by-name/metadata     /metadata       ext4    noatime,nosuid,nodev,errors=panic                           wait,check
+/dev/block/by-name/tos          /tos            emmc    defaults                                                    defaults,slotselect
+# ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index 36bc34c6b..77cd6bf15 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -239,7 +239,7 @@ BOARD_FLASHFILES += $(PRODUCT_OUT)/fastboot-usb.img
 
 # -- OTA RELATED DEFINES --
 # tell build system where to get the recovery.fstab.
-TARGET_RECOVERY_FSTAB ?= $(TARGET_DEVICE_DIR)/fstab
+TARGET_RECOVERY_FSTAB ?= $(TARGET_DEVICE_DIR)/fstab.recovery
 # Used by ota_from_target_files to add platform-specific directives
 # to the OTA updater scripts
 TARGET_RELEASETOOLS_EXTENSIONS ?= device/intel/common/recovery
diff --git a/celadon/fstab.recovery b/celadon/fstab.recovery
new file mode 100644
index 000000000..6ea51e384
--- /dev/null
+++ b/celadon/fstab.recovery
@@ -0,0 +1,44 @@
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/factory-partition/true/fstab.recovery
+##############################################################
+/dev/block/by-name/factory      /factory        ext4    rw,noatime                                                  wait
+##############################################################
+# Source: device/intel/mixins/groups/config-partition/enabled/fstab.recovery
+##############################################################
+/dev/block/by-name/config	    /oem_config     ext4    noatime,nosuid,nodev,errors=panic                           wait,check
+##############################################################
+# Source: device/intel/mixins/groups/avb/true/fstab.recovery
+##############################################################
+/dev/block/by-name/vbmeta       /vbmeta         emmc    defaults                                                    defaults,slotselect
+##############################################################
+# Source: device/intel/mixins/groups/vendor-partition/true/fstab.recovery
+##############################################################
+# Following line is required if you use a vendor image.
+# If the vendor image is not used,
+# following line should be commented with the related ones in BoardConfig.mk
+/dev/block/by-name/vendor	    /vendor         ext4    ro                                                          wait,slotselect
+##############################################################
+# Source: device/intel/mixins/groups/boot-arch/project-celadon/fstab.recovery
+##############################################################
+# Android fstab file.
+# <src>                   <mnt_point> <type>  <mnt_flags and options>  <fs_mgr_flags>
+# The filesystem that contains the filesystem checker binary (typically /system) cannot
+# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
+
+/devices/*/usb*/*               auto            auto    defaults                                                    voldmanaged=usb:auto
+/devices/*/*sdmmc*/*            auto            auto    defaults                                                    voldmanaged=sdcard1:auto
+/devices/*/80860F14:01/mmc_*    auto            auto    defaults                                                    voldmanaged=sdcard1:auto
+
+# If enable AVB and A/B slot, then will mount system partition as / through /dev/dm-0
+/dev/block/by-name/system       /               ext4    ro                                                          wait,slotselect,avb
+/dev/block/by-name/data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts,quota
+/dev/block/by-name/boot         /boot           emmc    defaults                                                    defaults,slotselect
+/dev/block/by-name/misc         /misc           emmc    defaults                                                    defaults
+/dev/block/by-name/bootloader   /bootloader     emmc    defaults                                                    recoveryonly
+/dev/block/by-name/bootloader2  /bootloader2    emmc    defaults                                                    recoveryonly
+/dev/block/by-name/persistent   /persistent     emmc    defaults                                                    defaults
+/dev/block/by-name/metadata     /metadata       ext4    noatime,nosuid,nodev,errors=panic                           wait,check
+/dev/block/by-name/tos          /tos            emmc    defaults                                                    defaults,slotselect
+# ------------------ END MIX-IN DEFINITIONS ------------------

From 0e0761d1717fd9fd468f6105c275b0721081e99d Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Thu, 30 Aug 2018 10:24:39 +0530
Subject: [PATCH 317/427] [MIXINUP] Mount config partition to
 /vendor/oem_config #52

Tracked-On: None
Signed-off-by: Swaroop Balan <swaroop.balan@intel.com>
---
 cel_apl/AndroidBoard.mk | 26 +++++++++++++-------------
 cel_apl/BoardConfig.mk  | 14 +++++++-------
 cel_apl/fstab           |  8 ++++----
 cel_apl/fstab.recovery  |  8 ++++----
 cel_apl/init.rc         |  2 +-
 celadon/AndroidBoard.mk | 26 +++++++++++++-------------
 celadon/BoardConfig.mk  | 14 +++++++-------
 celadon/fstab           |  8 ++++----
 celadon/fstab.recovery  |  8 ++++----
 celadon/init.rc         |  2 +-
 10 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/cel_apl/AndroidBoard.mk b/cel_apl/AndroidBoard.mk
index 9b395e44d..ca10627c9 100644
--- a/cel_apl/AndroidBoard.mk
+++ b/cel_apl/AndroidBoard.mk
@@ -128,6 +128,18 @@ make_dir_ab_factory:
 
 $(PRODUCT_OUT)/ramdisk.img: make_dir_ab_factory
 ##############################################################
+# Source: device/intel/mixins/groups/vendor-partition/true/AndroidBoard.mk
+##############################################################
+
+# This is to ensure that kernel modules are installed before
+# vendor.img is generated.
+$(PRODUCT_OUT)/vendor.img : $(KERNEL_MODULES_INSTALL)
+
+make_dir_ab_vendor:
+	@mkdir -p $(PRODUCT_OUT)/root/vendor
+
+$(PRODUCT_OUT)/ramdisk.img: make_dir_ab_vendor
+##############################################################
 # Source: device/intel/mixins/groups/config-partition/enabled/AndroidBoard.mk
 ##############################################################
 INSTALLED_CONFIGIMAGE_TARGET := $(PRODUCT_OUT)/config.img
@@ -156,7 +168,7 @@ selinux_fc :=
 configimage: $(INSTALLED_CONFIGIMAGE_TARGET)
 
 make_dir_ab_config:
-	@mkdir -p $(PRODUCT_OUT)/root/oem_config
+	@mkdir -p $(PRODUCT_OUT)/vendor/oem_config
 
 $(PRODUCT_OUT)/ramdisk.img: make_dir_ab_config
 ##############################################################
@@ -176,18 +188,6 @@ $(if $(wildcard $(blob)), \
     $(if $(3), $(error $(blob) does not exist)))
 endef
 
-##############################################################
-# Source: device/intel/mixins/groups/vendor-partition/true/AndroidBoard.mk
-##############################################################
-
-# This is to ensure that kernel modules are installed before
-# vendor.img is generated.
-$(PRODUCT_OUT)/vendor.img : $(KERNEL_MODULES_INSTALL)
-
-make_dir_ab_vendor:
-	@mkdir -p $(PRODUCT_OUT)/root/vendor
-
-$(PRODUCT_OUT)/ramdisk.img: make_dir_ab_vendor
 ##############################################################
 # Source: device/intel/mixins/groups/boot-arch/project-celadon/AndroidBoard.mk
 ##############################################################
diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index fb4be30fd..5eb806792 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -140,13 +140,6 @@ BOARD_FLASHFILES += $(PRODUCT_OUT)/factory.img
 BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/factory-partition
 BOARD_SEPOLICY_M4DEFS += module_factory_partition=true
 ##############################################################
-# Source: device/intel/mixins/groups/config-partition/enabled/BoardConfig.mk
-##############################################################
-BOARD_CONFIGIMAGE_PARTITION_SIZE := 8388608
-BOARD_FLASHFILES += $(PRODUCT_OUT)/config.img
-BOARD_SEPOLICY_M4DEFS += module_config_partition=true
-BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/config-partition
-##############################################################
 # Source: device/intel/mixins/groups/avb/true/BoardConfig.mk
 ##############################################################
 BOARD_AVB_ENABLE := true
@@ -175,6 +168,13 @@ endif
 BOARD_FLASHFILES += $(PRODUCT_OUT)/vendor.img
 AB_OTA_PARTITIONS += vendor
 ##############################################################
+# Source: device/intel/mixins/groups/config-partition/enabled/BoardConfig.mk
+##############################################################
+BOARD_CONFIGIMAGE_PARTITION_SIZE := 8388608
+BOARD_FLASHFILES += $(PRODUCT_OUT)/config.img
+BOARD_SEPOLICY_M4DEFS += module_config_partition=true
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/config-partition
+##############################################################
 # Source: device/intel/mixins/groups/boot-arch/project-celadon/BoardConfig.mk
 ##############################################################
 #TARGET_NO_RECOVERY ?= false
diff --git a/cel_apl/fstab b/cel_apl/fstab
index 842315754..f6e8887cd 100644
--- a/cel_apl/fstab
+++ b/cel_apl/fstab
@@ -10,10 +10,6 @@
 ##############################################################
 /dev/block/by-name/factory      /factory        ext4    rw,noatime                                                  wait
 ##############################################################
-# Source: device/intel/mixins/groups/config-partition/enabled/fstab
-##############################################################
-/dev/block/by-name/config	    /oem_config     ext4    noatime,nosuid,nodev,errors=panic                           wait,check
-##############################################################
 # Source: device/intel/mixins/groups/avb/true/fstab
 ##############################################################
 /dev/block/by-name/vbmeta       /vbmeta         emmc    defaults                                                    defaults,slotselect,avb
@@ -25,6 +21,10 @@
 # following line should be commented with the related ones in BoardConfig.mk
 /dev/block/by-name/vendor	    /vendor         ext4    ro                                                          wait,slotselect,avb
 ##############################################################
+# Source: device/intel/mixins/groups/config-partition/enabled/fstab
+##############################################################
+/dev/block/by-name/config	    /vendor/oem_config      ext4    noatime,nosuid,nodev,errors=panic                           wait,check
+##############################################################
 # Source: device/intel/mixins/groups/boot-arch/project-celadon/fstab
 ##############################################################
 # Android fstab file.
diff --git a/cel_apl/fstab.recovery b/cel_apl/fstab.recovery
index 6ea51e384..3d4b9debb 100644
--- a/cel_apl/fstab.recovery
+++ b/cel_apl/fstab.recovery
@@ -5,10 +5,6 @@
 ##############################################################
 /dev/block/by-name/factory      /factory        ext4    rw,noatime                                                  wait
 ##############################################################
-# Source: device/intel/mixins/groups/config-partition/enabled/fstab.recovery
-##############################################################
-/dev/block/by-name/config	    /oem_config     ext4    noatime,nosuid,nodev,errors=panic                           wait,check
-##############################################################
 # Source: device/intel/mixins/groups/avb/true/fstab.recovery
 ##############################################################
 /dev/block/by-name/vbmeta       /vbmeta         emmc    defaults                                                    defaults,slotselect
@@ -20,6 +16,10 @@
 # following line should be commented with the related ones in BoardConfig.mk
 /dev/block/by-name/vendor	    /vendor         ext4    ro                                                          wait,slotselect
 ##############################################################
+# Source: device/intel/mixins/groups/config-partition/enabled/fstab.recovery
+##############################################################
+/dev/block/by-name/config	    /vendor/oem_config      ext4    noatime,nosuid,nodev,errors=panic                           wait,check
+##############################################################
 # Source: device/intel/mixins/groups/boot-arch/project-celadon/fstab.recovery
 ##############################################################
 # Android fstab file.
diff --git a/cel_apl/init.rc b/cel_apl/init.rc
index 0325c83df..31f5067ca 100644
--- a/cel_apl/init.rc
+++ b/cel_apl/init.rc
@@ -490,7 +490,7 @@ on post-fs
 ##############################################################
 # Enable SELinux labeling
 on post-fs
-    restorecon_recursive /oem_config
+    restorecon_recursive /vendor/oem_config
 ##############################################################
 # Source: device/intel/mixins/groups/wlan/iwlwifi/init.rc
 ##############################################################
diff --git a/celadon/AndroidBoard.mk b/celadon/AndroidBoard.mk
index 5d53b12e1..86b04594f 100644
--- a/celadon/AndroidBoard.mk
+++ b/celadon/AndroidBoard.mk
@@ -122,6 +122,18 @@ make_dir_ab_factory:
 
 $(PRODUCT_OUT)/ramdisk.img: make_dir_ab_factory
 ##############################################################
+# Source: device/intel/mixins/groups/vendor-partition/true/AndroidBoard.mk
+##############################################################
+
+# This is to ensure that kernel modules are installed before
+# vendor.img is generated.
+$(PRODUCT_OUT)/vendor.img : $(KERNEL_MODULES_INSTALL)
+
+make_dir_ab_vendor:
+	@mkdir -p $(PRODUCT_OUT)/root/vendor
+
+$(PRODUCT_OUT)/ramdisk.img: make_dir_ab_vendor
+##############################################################
 # Source: device/intel/mixins/groups/config-partition/enabled/AndroidBoard.mk
 ##############################################################
 INSTALLED_CONFIGIMAGE_TARGET := $(PRODUCT_OUT)/config.img
@@ -150,7 +162,7 @@ selinux_fc :=
 configimage: $(INSTALLED_CONFIGIMAGE_TARGET)
 
 make_dir_ab_config:
-	@mkdir -p $(PRODUCT_OUT)/root/oem_config
+	@mkdir -p $(PRODUCT_OUT)/vendor/oem_config
 
 $(PRODUCT_OUT)/ramdisk.img: make_dir_ab_config
 ##############################################################
@@ -170,18 +182,6 @@ $(if $(wildcard $(blob)), \
     $(if $(3), $(error $(blob) does not exist)))
 endef
 
-##############################################################
-# Source: device/intel/mixins/groups/vendor-partition/true/AndroidBoard.mk
-##############################################################
-
-# This is to ensure that kernel modules are installed before
-# vendor.img is generated.
-$(PRODUCT_OUT)/vendor.img : $(KERNEL_MODULES_INSTALL)
-
-make_dir_ab_vendor:
-	@mkdir -p $(PRODUCT_OUT)/root/vendor
-
-$(PRODUCT_OUT)/ramdisk.img: make_dir_ab_vendor
 ##############################################################
 # Source: device/intel/mixins/groups/boot-arch/project-celadon/AndroidBoard.mk
 ##############################################################
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index 77cd6bf15..d1cf7bf78 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -140,13 +140,6 @@ BOARD_FLASHFILES += $(PRODUCT_OUT)/factory.img
 BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/factory-partition
 BOARD_SEPOLICY_M4DEFS += module_factory_partition=true
 ##############################################################
-# Source: device/intel/mixins/groups/config-partition/enabled/BoardConfig.mk
-##############################################################
-BOARD_CONFIGIMAGE_PARTITION_SIZE := 8388608
-BOARD_FLASHFILES += $(PRODUCT_OUT)/config.img
-BOARD_SEPOLICY_M4DEFS += module_config_partition=true
-BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/config-partition
-##############################################################
 # Source: device/intel/mixins/groups/avb/true/BoardConfig.mk
 ##############################################################
 BOARD_AVB_ENABLE := true
@@ -175,6 +168,13 @@ endif
 BOARD_FLASHFILES += $(PRODUCT_OUT)/vendor.img
 AB_OTA_PARTITIONS += vendor
 ##############################################################
+# Source: device/intel/mixins/groups/config-partition/enabled/BoardConfig.mk
+##############################################################
+BOARD_CONFIGIMAGE_PARTITION_SIZE := 8388608
+BOARD_FLASHFILES += $(PRODUCT_OUT)/config.img
+BOARD_SEPOLICY_M4DEFS += module_config_partition=true
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/config-partition
+##############################################################
 # Source: device/intel/mixins/groups/boot-arch/project-celadon/BoardConfig.mk
 ##############################################################
 #TARGET_NO_RECOVERY ?= false
diff --git a/celadon/fstab b/celadon/fstab
index 842315754..f6e8887cd 100644
--- a/celadon/fstab
+++ b/celadon/fstab
@@ -10,10 +10,6 @@
 ##############################################################
 /dev/block/by-name/factory      /factory        ext4    rw,noatime                                                  wait
 ##############################################################
-# Source: device/intel/mixins/groups/config-partition/enabled/fstab
-##############################################################
-/dev/block/by-name/config	    /oem_config     ext4    noatime,nosuid,nodev,errors=panic                           wait,check
-##############################################################
 # Source: device/intel/mixins/groups/avb/true/fstab
 ##############################################################
 /dev/block/by-name/vbmeta       /vbmeta         emmc    defaults                                                    defaults,slotselect,avb
@@ -25,6 +21,10 @@
 # following line should be commented with the related ones in BoardConfig.mk
 /dev/block/by-name/vendor	    /vendor         ext4    ro                                                          wait,slotselect,avb
 ##############################################################
+# Source: device/intel/mixins/groups/config-partition/enabled/fstab
+##############################################################
+/dev/block/by-name/config	    /vendor/oem_config      ext4    noatime,nosuid,nodev,errors=panic                           wait,check
+##############################################################
 # Source: device/intel/mixins/groups/boot-arch/project-celadon/fstab
 ##############################################################
 # Android fstab file.
diff --git a/celadon/fstab.recovery b/celadon/fstab.recovery
index 6ea51e384..3d4b9debb 100644
--- a/celadon/fstab.recovery
+++ b/celadon/fstab.recovery
@@ -5,10 +5,6 @@
 ##############################################################
 /dev/block/by-name/factory      /factory        ext4    rw,noatime                                                  wait
 ##############################################################
-# Source: device/intel/mixins/groups/config-partition/enabled/fstab.recovery
-##############################################################
-/dev/block/by-name/config	    /oem_config     ext4    noatime,nosuid,nodev,errors=panic                           wait,check
-##############################################################
 # Source: device/intel/mixins/groups/avb/true/fstab.recovery
 ##############################################################
 /dev/block/by-name/vbmeta       /vbmeta         emmc    defaults                                                    defaults,slotselect
@@ -20,6 +16,10 @@
 # following line should be commented with the related ones in BoardConfig.mk
 /dev/block/by-name/vendor	    /vendor         ext4    ro                                                          wait,slotselect
 ##############################################################
+# Source: device/intel/mixins/groups/config-partition/enabled/fstab.recovery
+##############################################################
+/dev/block/by-name/config	    /vendor/oem_config      ext4    noatime,nosuid,nodev,errors=panic                           wait,check
+##############################################################
 # Source: device/intel/mixins/groups/boot-arch/project-celadon/fstab.recovery
 ##############################################################
 # Android fstab file.
diff --git a/celadon/init.rc b/celadon/init.rc
index 0325c83df..31f5067ca 100644
--- a/celadon/init.rc
+++ b/celadon/init.rc
@@ -490,7 +490,7 @@ on post-fs
 ##############################################################
 # Enable SELinux labeling
 on post-fs
-    restorecon_recursive /oem_config
+    restorecon_recursive /vendor/oem_config
 ##############################################################
 # Source: device/intel/mixins/groups/wlan/iwlwifi/init.rc
 ##############################################################

From 2276207a3bb543ecc90fe497b5231243165e7ac7 Mon Sep 17 00:00:00 2001
From: ops <ramya.v.naidu@intel.com>
Date: Thu, 30 Aug 2018 01:55:08 -0400
Subject: [PATCH 318/427] Upgrading kernel def_config to 4.14.66

Tracked-On: none
Signed-off-by: rnaidu <ramya.v.naidu@intel.com>
---
 kernel_config/kernel_64_defconfig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index ecb9c7f85..cf65cabf5 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.14.61 Kernel Configuration
+# Linux/x86_64 4.14.66 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -250,6 +250,7 @@ CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
+CONFIG_HOTPLUG_SMT=y
 CONFIG_OPROFILE=y
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 CONFIG_HAVE_OPROFILE=y
@@ -4092,6 +4093,7 @@ CONFIG_VIDEO_MEYE=m
 # CONFIG_VIDEO_INTEL_IPU is not set
 # CONFIG_VIDEO_INTEL_IPU_FW_LIB is not set
 # CONFIG_VIDEO_INTEL_UOS is not set
+# CONFIG_VIDEO_INTEL_IPU_ACRN is not set
 
 #
 # Media capture/analog TV support
@@ -6149,6 +6151,7 @@ CONFIG_ION=y
 # CONFIG_ION_CARVEOUT_HEAP is not set
 # CONFIG_ION_CHUNK_HEAP is not set
 # CONFIG_ABL_BOOTLOADER_CONTROL is not set
+# CONFIG_SEND_SLCAN_ENABLE is not set
 # CONFIG_SBL_BOOTLOADER_CONTROL is not set
 # CONFIG_VSBL_BOOTLOADER_CONTROL is not set
 # CONFIG_FIQ_WATCHDOG is not set

From 61b03aef27b1fcb921cec75f2ce8df467b7ece5b Mon Sep 17 00:00:00 2001
From: ysiyer <yegnesh.s.iyer@intel.com>
Date: Mon, 16 Jul 2018 10:35:29 +0530
Subject: [PATCH 319/427] thermal-daemon: Defining the sepolicy for
 thermal-daemon

Change-Id: I4c89c03257787f51d1cca173049b041f0102da07
Tracked-On: OAM-67241
Signed-off-by: ysiyer <yegnesh.s.iyer@intel.com>
---
 sepolicy/thermal/thermal-daemon/file.te       |  3 +++
 sepolicy/thermal/thermal-daemon/file_contexts |  5 ++++
 .../thermal/thermal-daemon/thermal-daemon.te  | 25 +++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 sepolicy/thermal/thermal-daemon/file.te
 create mode 100644 sepolicy/thermal/thermal-daemon/file_contexts
 create mode 100644 sepolicy/thermal/thermal-daemon/thermal-daemon.te

diff --git a/sepolicy/thermal/thermal-daemon/file.te b/sepolicy/thermal/thermal-daemon/file.te
new file mode 100644
index 000000000..e04f3382c
--- /dev/null
+++ b/sepolicy/thermal/thermal-daemon/file.te
@@ -0,0 +1,3 @@
+type thermal-daemon_data_file, file_type, data_file_type;
+type sysfs_dmi_id, fs_type, sysfs_type;
+type thermal-daemon_run_dir, fs_type, data_file_type;
diff --git a/sepolicy/thermal/thermal-daemon/file_contexts b/sepolicy/thermal/thermal-daemon/file_contexts
new file mode 100644
index 000000000..bc941488a
--- /dev/null
+++ b/sepolicy/thermal/thermal-daemon/file_contexts
@@ -0,0 +1,5 @@
+/vendor/bin/thermal-daemon        u:object_r:thermal-daemon_exec:s0
+/vendor/etc/thermal_daemon(/.*)?        u:object_r:thermal-daemon_data_file:s0
+/data/misc/thermal-daemon(/.*)?	u:object_r:thermal-daemon_run_dir:s0
+/sys/devices/virtual/dmi/id/product_name		u:object_r:sysfs_dmi_id:s0
+/sys/devices/virtual/dmi/id/product_uuid		u:object_r:sysfs_dmi_id:s0
diff --git a/sepolicy/thermal/thermal-daemon/thermal-daemon.te b/sepolicy/thermal/thermal-daemon/thermal-daemon.te
new file mode 100644
index 000000000..25c222a41
--- /dev/null
+++ b/sepolicy/thermal/thermal-daemon/thermal-daemon.te
@@ -0,0 +1,25 @@
+#
+# thermal-daemon
+#
+
+type thermal-daemon, domain;
+type thermal-daemon_exec, exec_type, file_type, vendor_file_type;
+init_daemon_domain(thermal-daemon)
+
+allow thermal-daemon sysfs:dir r_dir_perms;
+allow thermal-daemon sysfs_thermal_management:dir r_dir_perms;
+allow thermal-daemon sysfs_thermal_management:file rw_file_perms;
+allow thermal-daemon sysfs_powercap:{ file lnk_file } rw_file_perms;
+allow thermal-daemon sysfs_powercap:dir r_dir_perms;
+allow thermal-daemon sysfs_thermal:file rw_file_perms;
+allow thermal-daemon sysfs_dmi_id:{ file lnk_file } rw_file_perms;
+allow thermal-daemon system_data_file:dir create_dir_perms;
+allow thermal-daemon system_data_file:dir rw_dir_perms;
+allow thermal-daemon thermal-daemon_run_dir:dir create_dir_perms;
+allow thermal-daemon thermal-daemon_run_dir:file create_file_perms;
+allow thermal-daemon thermal-daemon_data_file:dir r_file_perms;
+allow thermal-daemon thermal-daemon_data_file:file r_file_perms;
+allow thermal-daemon thermal_device:chr_file rw_file_perms;
+
+# properties
+set_prop(thermal-daemon, powerctl_prop)

From db3a305795b9fe9ab1ce09241428f9b7f950308a Mon Sep 17 00:00:00 2001
From: ysiyer <yegnesh.s.iyer@intel.com>
Date: Mon, 16 Jul 2018 10:36:17 +0530
Subject: [PATCH 320/427] thermal-daemon: Adding the thermal-daemon config
 files

thermal-conf.xml and thermal-cpu-cdev-order.xml files are the
config files thermal-daemon expects to be defined.

thermal-conf.xml is the file that defines the thermal throttling
policies for a platform. Passive and critical policies are defined
for celadon.

Passive policy controls the cpu power limit when the trip is breached.
Critical policy syncs the file system and shutdown the system upon trip
point breach.

Change-Id: I2bece957a2119011352fdd1cd28ab3dd63339e18
Tracked-On: OAM-67241
Signed-off-by: ysiyer <yegnesh.s.iyer@intel.com>
---
 celadon/thermal-conf.xml           | 61 ++++++++++++++++++++++++++++++
 celadon/thermal-cpu-cdev-order.xml | 18 +++++++++
 2 files changed, 79 insertions(+)
 create mode 100644 celadon/thermal-conf.xml
 create mode 100644 celadon/thermal-cpu-cdev-order.xml

diff --git a/celadon/thermal-conf.xml b/celadon/thermal-conf.xml
new file mode 100644
index 000000000..aa0f4fdad
--- /dev/null
+++ b/celadon/thermal-conf.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<!-- BEGIN -->
+<ThermalConfiguration>
+	<Platform>
+		<Name> KBL-NUC </Name>
+		<ProductName>NUC7i5BNH</ProductName>
+		<Preference>QUIET</Preference>
+		<ThermalZones>
+			<ThermalZone>
+				<Type>cpu_passive</Type>
+				<TripPoints>
+					<TripPoint>
+						<SensorType>x86_pkg_temp</SensorType>
+						<Temperature>90000</Temperature>
+						<Type>Passive</Type>
+						<CoolingDevice>
+							<Type>rapl_limit_1</Type>
+						</CoolingDevice>
+					</TripPoint>
+					<TripPoint>
+						<SensorType>x86_pkg_temp</SensorType>
+						<Temperature>105000</Temperature>
+						<Type>Passive</Type>
+						<CoolingDevice>
+							<Type>rapl_limit_2</Type>
+						</CoolingDevice>
+					</TripPoint>
+				</TripPoints>
+			</ThermalZone>
+			<ThermalZone>
+				<Type>cpu_critical</Type>
+				<TripPoints>
+					<TripPoint>
+						<SensorType>x86_pkg_temp</SensorType>
+						<Temperature>110000</Temperature>
+						<Type>Critical</Type>
+					</TripPoint>
+				</TripPoints>
+			</ThermalZone>
+		</ThermalZones>
+		<CoolingDevices>
+			<CoolingDevice>
+				<Type>rapl_limit_1</Type>
+				<Path>/sys/devices/virtual/powercap/intel-rapl/intel-rapl:0/constraint_0_power_limit_uw</Path>
+				<MinState>25000000</MinState>
+				<ReadBack>0</ReadBack>
+				<MaxState>13000000</MaxState>
+				<IncDecStep>-200000</IncDecStep>
+			</CoolingDevice>
+			<CoolingDevice>
+				<Type>rapl_limit_2</Type>
+				<Path>/sys/devices/virtual/powercap/intel-rapl/intel-rapl:0/constraint_0_power_limit_uw</Path>
+				<MinState>13000000</MinState>
+				<ReadBack>0</ReadBack>
+				<MaxState>6000000</MaxState>
+				<IncDecStep>-200000</IncDecStep>
+			</CoolingDevice>
+		</CoolingDevices>
+	</Platform>
+</ThermalConfiguration>
+<!-- END -->
diff --git a/celadon/thermal-cpu-cdev-order.xml b/celadon/thermal-cpu-cdev-order.xml
new file mode 100644
index 000000000..a9a497813
--- /dev/null
+++ b/celadon/thermal-cpu-cdev-order.xml
@@ -0,0 +1,18 @@
+
+<!--
+Specifies the order of compensation to cool CPU only.
+There is a default already implemented in the code, but
+this file can be used to change order
+
+The Following cooling device can present
+-->
+<!--BEGIN-->
+<CoolingDeviceOrder>
+	<!-- Specify Cooling device order -->
+	<CoolingDevice>rapl_controller</CoolingDevice>
+	<CoolingDevice>intel_pstate</CoolingDevice>
+	<CoolingDevice>intel_powerclamp</CoolingDevice>
+	<CoolingDevice>cpufreq</CoolingDevice>
+	<CoolingDevice>Processor</CoolingDevice>
+</CoolingDeviceOrder>
+<!--END-->

From f91a21af059238b98f6a934719092c24ee6f2294 Mon Sep 17 00:00:00 2001
From: ysiyer <yegnesh.s.iyer@intel.com>
Date: Mon, 16 Jul 2018 10:40:19 +0530
Subject: [PATCH 321/427] thermal-daemon: Specifying thermal-daemon in the
 mixins

Change-Id: I34353bc87911a74cf7366b83a51ca1adce547c20
Tracked-On: OAM-67241
Signed-off-by: ysiyer <yegnesh.s.iyer@intel.com>
---
 celadon/mixins.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/celadon/mixins.spec b/celadon/mixins.spec
index 24e6b090c..2c7974f32 100644
--- a/celadon/mixins.spec
+++ b/celadon/mixins.spec
@@ -29,7 +29,7 @@ dexpreopt: enabled
 disk-bus: auto
 usb: host+acc
 lights: true
-thermal: dptf(intel_modem=true)
+thermal: thermal-daemon
 config-partition: enabled
 vendor-partition: true
 factory-partition: true

From 54de5d78bdc8954bad8548ad934eeeedfc68ac63 Mon Sep 17 00:00:00 2001
From: ysiyer <yegnesh.s.iyer@intel.com>
Date: Fri, 10 Aug 2018 15:43:58 +0530
Subject: [PATCH 322/427] thermal_daemon: Adding sepolicy definitions for type
 and cur_state files

Tracked-On: OAM-67241
Signed-off-by: ysiyer <yegnesh.s.iyer@intel.com>
---
 sepolicy/thermal/thermal-daemon/file.te           | 1 +
 sepolicy/thermal/thermal-daemon/file_contexts     | 1 +
 sepolicy/thermal/thermal-daemon/thermal-daemon.te | 7 +++++++
 3 files changed, 9 insertions(+)

diff --git a/sepolicy/thermal/thermal-daemon/file.te b/sepolicy/thermal/thermal-daemon/file.te
index e04f3382c..9a43b7c36 100644
--- a/sepolicy/thermal/thermal-daemon/file.te
+++ b/sepolicy/thermal/thermal-daemon/file.te
@@ -1,3 +1,4 @@
 type thermal-daemon_data_file, file_type, data_file_type;
 type sysfs_dmi_id, fs_type, sysfs_type;
+type sysfs_backlight_thermal, fs_type, sysfs_type;
 type thermal-daemon_run_dir, fs_type, data_file_type;
diff --git a/sepolicy/thermal/thermal-daemon/file_contexts b/sepolicy/thermal/thermal-daemon/file_contexts
index bc941488a..0e91532ce 100644
--- a/sepolicy/thermal/thermal-daemon/file_contexts
+++ b/sepolicy/thermal/thermal-daemon/file_contexts
@@ -3,3 +3,4 @@
 /data/misc/thermal-daemon(/.*)?	u:object_r:thermal-daemon_run_dir:s0
 /sys/devices/virtual/dmi/id/product_name		u:object_r:sysfs_dmi_id:s0
 /sys/devices/virtual/dmi/id/product_uuid		u:object_r:sysfs_dmi_id:s0
+/sys/class/backlight(/.*)?		u:object_r:sysfs_backlight_thermal:s0
diff --git a/sepolicy/thermal/thermal-daemon/thermal-daemon.te b/sepolicy/thermal/thermal-daemon/thermal-daemon.te
index 25c222a41..44e2479b8 100644
--- a/sepolicy/thermal/thermal-daemon/thermal-daemon.te
+++ b/sepolicy/thermal/thermal-daemon/thermal-daemon.te
@@ -11,7 +11,14 @@ allow thermal-daemon sysfs_thermal_management:dir r_dir_perms;
 allow thermal-daemon sysfs_thermal_management:file rw_file_perms;
 allow thermal-daemon sysfs_powercap:{ file lnk_file } rw_file_perms;
 allow thermal-daemon sysfs_powercap:dir r_dir_perms;
+allow thermal-daemon sysfs_thermal:dir r_dir_perms;
 allow thermal-daemon sysfs_thermal:file rw_file_perms;
+allow thermal-daemon sysfs_leds:dir r_dir_perms;
+allow thermal-daemon sysfs_leds:file rw_file_perms;
+allow thermal-daemon sysfs_backlight_thermal:dir r_dir_perms;
+allow thermal-daemon sysfs_backlight_thermal:file rw_file_perms;
+allow hal_light_default sysfs_backlight_thermal:dir r_dir_perms;
+allow hal_light_default sysfs_backlight_thermal:file rw_file_perms;
 allow thermal-daemon sysfs_dmi_id:{ file lnk_file } rw_file_perms;
 allow thermal-daemon system_data_file:dir create_dir_perms;
 allow thermal-daemon system_data_file:dir rw_dir_perms;

From 849933584713cf15f4f3e09bc9489f7871659f93 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Tue, 4 Sep 2018 13:36:34 +0530
Subject: [PATCH 323/427] [MIXINUP] thermal-daemon

Tracked-On: None
Signed-off-by: Swaroop Balan <swaroop.balan@intel.com>
---
 celadon/BoardConfig.mk |  5 ++---
 celadon/device.mk      | 26 +++++++-------------------
 celadon/init.rc        | 23 +++++++++++++----------
 3 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index d1cf7bf78..7592c42ac 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -365,11 +365,10 @@ BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/rfkill
 WITH_DEXPREOPT := true
 WITH_DEXPREOPT_PIC := true
 ##############################################################
-# Source: device/intel/mixins/groups/thermal/dptf/BoardConfig.mk
+# Source: device/intel/mixins/groups/thermal/thermal-daemon/BoardConfig.mk
 ##############################################################
 BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/thermal
-BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/thermal/dptf
-BOARD_KERNEL_CMDLINE += thermal.off=1
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/thermal/thermal-daemon
 ##############################################################
 # Source: device/intel/mixins/groups/pstore/ram_dummy/BoardConfig.mk.1
 ##############################################################
diff --git a/celadon/device.mk b/celadon/device.mk
index 1c5452ef9..86202d77c 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -534,25 +534,13 @@ PRODUCT_PACKAGES += lights.project-celadon \
     android.hardware.light@2.0-service \
     android.hardware.light@2.0-impl
 ##############################################################
-# Source: device/intel/mixins/groups/thermal/dptf/product.mk
-##############################################################
-# DPTF
-INTEL_MODEM_CTL := true
-PRODUCT_PACKAGES += esif_ufd \
-    dsp.dv \
-    dptf.dv \
-    libc++_shared.so \
-    Dptf \
-    DptfPolicyActive \
-    DptfPolicyAdaptivePerformance \
-    DptfPolicyConditionalLogicLib \
-    DptfPolicyCritical \
-    DptfPolicyEmergencyCallMode \
-    DptfPolicyPassive \
-    DptfPolicyVirtualSensor \
-    upe_java \
-    jhs
-PRODUCT_COPY_FILES += $(LOCAL_PATH)/dptf.dv:/system/etc/dptf/dv/dptf.dv
+# Source: device/intel/mixins/groups/thermal/thermal-daemon/product.mk
+##############################################################
+# thermal-daemon
+PRODUCT_PACKAGES += thermal-daemon
+PRODUCT_COPY_FILES += \
+	$(LOCAL_PATH)/thermal-conf.xml:/vendor/etc/thermal-daemon/thermal-conf.xml \
+	$(LOCAL_PATH)/thermal-cpu-cdev-order.xml:/vendor/etc/thermal-daemon/thermal-cpu-cdev-order.xml
 ##############################################################
 # Source: device/intel/mixins/groups/pstore/ram_dummy/product.mk
 ##############################################################
diff --git a/celadon/init.rc b/celadon/init.rc
index 31f5067ca..2040d3902 100644
--- a/celadon/init.rc
+++ b/celadon/init.rc
@@ -602,19 +602,12 @@ on post-fs
    insmod /vendor/lib/modules/kernel/drivers/usb/serial/pl2303.ko
    insmod /vendor/lib/modules/kernel/drivers/usb/serial/ftdi_sio.ko
 ##############################################################
-# Source: device/intel/mixins/groups/thermal/dptf/init.rc
+# Source: device/intel/mixins/groups/thermal/thermal-daemon/init.rc
 ##############################################################
-on post-fs
-    setprop persist.thermal.mode dptf
-
-service esif_ufd /system/vendor/bin/esif_ufd -n
+service thermal-daemon /system/vendor/bin/thermal-daemon --config-file /system/vendor/etc/thermal-daemon/thermal-conf.xml
+    class main
     user system
     group system
-    class main
-
-on post-fs-data
-    mkdir /data/misc/dptf 0770 system system
-    mkdir /data/misc/dptf/lock 0770 system system
 
 on boot
     chown system system /sys/devices/system/cpu/intel_pstate/max_perf_pct
@@ -622,7 +615,17 @@ on boot
     chown system system /sys/devices/system/cpu/intel_pstate/no_turbo
     chown system system /sys/class/powercap/intel-rapl:0/enabled
     chown system system /sys/class/powercap/intel-rapl:0/constraint_0_power_limit_uw
+    chown system system /sys/class/dmi/id/product_uuid
+    chown system system /sys/class/dmi/id/product_name
+    chown system system /system/vendor/etc/
+    chown system system /system/vendor/etc/thermal-conf.xml
     restorecon_recursive /sys/class/powercap
+
+on post-fs
+    setprop persist.thermal.mode thermal-daemon
+    mkdir /data/misc/thermal-daemon 0771 system system
+    start thermal-daemon
+
 ##############################################################
 # Source: device/intel/mixins/groups/pstore/ram_dummy/init.rc
 ##############################################################

From 0f9440f49246691a79fab32c857af446d28f4cba Mon Sep 17 00:00:00 2001
From: Ankit Navik <ankit.tarot@gmail.com>
Date: Mon, 3 Sep 2018 15:59:04 +0530
Subject: [PATCH 324/427] Enable socwatch and socperf on Celadon

socwatch and socperf configuration changes for cel_apl and celadon.

Track-On: OAM-56483
Signed-off-by: Ankit Navik <ankit.tarot@gmail.com>
---
 cel_apl/mixins.spec | 2 +-
 celadon/mixins.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cel_apl/mixins.spec b/cel_apl/mixins.spec
index daaca192a..e10f920c7 100644
--- a/cel_apl/mixins.spec
+++ b/cel_apl/mixins.spec
@@ -17,7 +17,7 @@ storage: sdcard-mmc0-usb-sd(adoptablesd=true,adoptableusb=false)
 display-density: default
 usb-gadget: g_ffs
 adb_net: true
-kernel: project-celadon(loglevel=3, disable_cpuidle_on_boot=true)
+kernel: project-celadon(loglevel=3, disable_cpuidle_on_boot=true, external_modules=perftools-external/soc_perf_driver/src perftools-external/socwatch_driver)
 bluetooth: btusb (ivi=true)
 boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true)
 audio: project-celadon
diff --git a/celadon/mixins.spec b/celadon/mixins.spec
index 2c7974f32..0351971df 100644
--- a/celadon/mixins.spec
+++ b/celadon/mixins.spec
@@ -17,7 +17,7 @@ storage: sdcard-mmc0-usb-sd(adoptablesd=true,adoptableusb=false)
 display-density: default
 usb-gadget: g_ffs
 adb_net: true
-kernel: project-celadon(loglevel=3, disable_cpuidle_on_boot=true)
+kernel: project-celadon(loglevel=3, disable_cpuidle_on_boot=true, external_modules=perftools-external/soc_perf_driver/src perftools-external/socwatch_driver)
 bluetooth: btusb
 boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true)
 audio: project-celadon

From 0fe68632471ccb416073b26e1cf417246a5f72ba Mon Sep 17 00:00:00 2001
From: Ankit Navik <ankit.tarot@gmail.com>
Date: Tue, 4 Sep 2018 11:30:10 +0530
Subject: [PATCH 325/427] [MIXINUP] enable socperf and socwatch driver on
 celadon

It adds socperf and socwatch kernel-modules in extra kernel modules
to consider extra modules for compile and build.

Tracked-On: OAM-56483
Signed-off-by: Ankit Navik <ankit.tarot@gmail.com>
---
 cel_apl/AndroidBoard.mk | 5 +++--
 celadon/AndroidBoard.mk | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cel_apl/AndroidBoard.mk b/cel_apl/AndroidBoard.mk
index ca10627c9..6fed0ffbc 100644
--- a/cel_apl/AndroidBoard.mk
+++ b/cel_apl/AndroidBoard.mk
@@ -69,7 +69,8 @@ $(PRODUCT_OUT)/kernel: $(KERNEL_CONFIG) | $(ACP)
 	$(hide) $(ACP) -fp $(KERNEL_BIN) $@
 
 EXTMOD_SRC := ../../../../../..
-TARGET_EXTRA_KERNEL_MODULES :=
+TARGET_EXTRA_KERNEL_MODULES := $(EXTMOD_SRC)/kernel/modules/perftools-external/soc_perf_driver/src
+TARGET_EXTRA_KERNEL_MODULES += $(EXTMOD_SRC)/kernel/modules/perftools-external/socwatch_driver
 
 ALL_EXTRA_MODULES := $(patsubst %,$(TARGET_OUT_INTERMEDIATES)/kmodule/%,$(TARGET_EXTRA_KERNEL_MODULES))
 $(ALL_EXTRA_MODULES): $(TARGET_OUT_INTERMEDIATES)/kmodule/%: $(PRODUCT_OUT)/kernel
@@ -82,7 +83,7 @@ $(ALL_EXTRA_MODULES): $(TARGET_OUT_INTERMEDIATES)/kmodule/%: $(PRODUCT_OUT)/kern
 $(KERNEL_MODULES_INSTALL): $(PRODUCT_OUT)/kernel $(ALL_EXTRA_MODULES)
 	$(hide) rm -rf $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules
 	$(build_kernel) modules_install
-	$(hide) for kmod in "$(TARGET_EXTRA_KERNEL_MODULES)" ; do \
+	$(hide) for kmod in $(TARGET_EXTRA_KERNEL_MODULES) ; do \
 		echo Installing additional kernel module $${kmod} ; \
 		$(subst +,,$(subst $(hide),,$(build_kernel))) M=$(abspath $(TARGET_OUT_INTERMEDIATES))/kernel/$${kmod} modules_install ; \
 	done
diff --git a/celadon/AndroidBoard.mk b/celadon/AndroidBoard.mk
index 86b04594f..4abbd9ef4 100644
--- a/celadon/AndroidBoard.mk
+++ b/celadon/AndroidBoard.mk
@@ -63,7 +63,8 @@ $(PRODUCT_OUT)/kernel: $(KERNEL_CONFIG) | $(ACP)
 	$(hide) $(ACP) -fp $(KERNEL_BIN) $@
 
 EXTMOD_SRC := ../../../../../..
-TARGET_EXTRA_KERNEL_MODULES :=
+TARGET_EXTRA_KERNEL_MODULES := $(EXTMOD_SRC)/kernel/modules/perftools-external/soc_perf_driver/src
+TARGET_EXTRA_KERNEL_MODULES += $(EXTMOD_SRC)/kernel/modules/perftools-external/socwatch_driver
 
 ALL_EXTRA_MODULES := $(patsubst %,$(TARGET_OUT_INTERMEDIATES)/kmodule/%,$(TARGET_EXTRA_KERNEL_MODULES))
 $(ALL_EXTRA_MODULES): $(TARGET_OUT_INTERMEDIATES)/kmodule/%: $(PRODUCT_OUT)/kernel
@@ -76,7 +77,7 @@ $(ALL_EXTRA_MODULES): $(TARGET_OUT_INTERMEDIATES)/kmodule/%: $(PRODUCT_OUT)/kern
 $(KERNEL_MODULES_INSTALL): $(PRODUCT_OUT)/kernel $(ALL_EXTRA_MODULES)
 	$(hide) rm -rf $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules
 	$(build_kernel) modules_install
-	$(hide) for kmod in "$(TARGET_EXTRA_KERNEL_MODULES)" ; do \
+	$(hide) for kmod in $(TARGET_EXTRA_KERNEL_MODULES) ; do \
 		echo Installing additional kernel module $${kmod} ; \
 		$(subst +,,$(subst $(hide),,$(build_kernel))) M=$(abspath $(TARGET_OUT_INTERMEDIATES))/kernel/$${kmod} modules_install ; \
 	done

From 1d4d56b60889e926e6fb083a3a333a94d989b9da Mon Sep 17 00:00:00 2001
From: "tianmi.chen" <tianmi.chen@intel.com>
Date: Wed, 5 Sep 2018 16:05:10 +0800
Subject: [PATCH 326/427] [Celadon] Remove hevc encoder library

Remove hevc encoder library as hevc encoder is already supported in libmfxhw64.

Jira: None.
Test: None.

Signed-off-by: tianmi.chen <tianmi.chen@intel.com>
---
 cel_apl/device.mk | 2 --
 celadon/device.mk | 2 --
 2 files changed, 4 deletions(-)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 67f22d0c4..a4771f051 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -251,8 +251,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PACKAGES += \
     libmfxhw32 \
     libmfxhw64 \
-    libmfx_hevce_hw32 \
-    libmfx_hevce_hw64 \
     libmfx_omx_core \
     libmfx_omx_components_hw \
     libstagefrighthw
diff --git a/celadon/device.mk b/celadon/device.mk
index 86202d77c..c666c8199 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -240,8 +240,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PACKAGES += \
     libmfxhw32 \
     libmfxhw64 \
-    libmfx_hevce_hw32 \
-    libmfx_hevce_hw64 \
     libmfx_omx_core \
     libmfx_omx_components_hw \
     libstagefrighthw

From ec5067956c96a8763e24e30bf9ebf98eeca34818 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Wed, 5 Sep 2018 14:11:07 +0530
Subject: [PATCH 327/427] [MiXINUP] Always create teedata and erase teedata
 when install. #61

Tracked-On: None
Signed-off-by: Swaroop Balan <swaroop.balan@intel.com>
---
 cel_apl/flashfiles.ini | 5 +++++
 celadon/flashfiles.ini | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/cel_apl/flashfiles.ini b/cel_apl/flashfiles.ini
index af6f0e18e..2e74fb37b 100644
--- a/cel_apl/flashfiles.ini
+++ b/cel_apl/flashfiles.ini
@@ -79,6 +79,11 @@ tool = fastboot
 args = erase metadata
 description = Erase metadata partition
 
+[command.erase.teedata]
+tool = fastboot
+args = erase teedata
+description = Erase teedata partition
+
 [group.erase-efivars]
 name = Erase efi vars
 description = Erase all optional efi vars
diff --git a/celadon/flashfiles.ini b/celadon/flashfiles.ini
index af6f0e18e..2e74fb37b 100644
--- a/celadon/flashfiles.ini
+++ b/celadon/flashfiles.ini
@@ -79,6 +79,11 @@ tool = fastboot
 args = erase metadata
 description = Erase metadata partition
 
+[command.erase.teedata]
+tool = fastboot
+args = erase teedata
+description = Erase teedata partition
+
 [group.erase-efivars]
 name = Erase efi vars
 description = Erase all optional efi vars

From a60d5629c99c68a2fa5bcc85587c3accfcfb0a74 Mon Sep 17 00:00:00 2001
From: ops <ramya.v.naidu@intel.com>
Date: Wed, 5 Sep 2018 06:38:21 -0400
Subject: [PATCH 328/427] Upgrading the kernel def_config to 4.14.67

Tracked-On: none
Signed-off-by: ops <ramya.v.naidu@intel.com>
---
 kernel_config/kernel_64_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index cf65cabf5..a9f2cd9eb 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.14.66 Kernel Configuration
+# Linux/x86_64 4.14.67 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y

From 9f960a0f9778ea600a7185150f3173ffa2458a3e Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Mon, 10 Sep 2018 14:08:57 +0530
Subject: [PATCH 329/427] [MIXINUP] start storageproxyd at an earlier stage
 Tracked-On: None

---
 cel_apl/init.rc | 4 +++-
 celadon/init.rc | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cel_apl/init.rc b/cel_apl/init.rc
index 31f5067ca..edebf56b1 100644
--- a/cel_apl/init.rc
+++ b/cel_apl/init.rc
@@ -685,8 +685,10 @@ on post-fs-data
     mkdir /data/vendor/securestorage 0700 system system
     chmod 666 /dev/rpmb0
 
+on early-boot
+    start storageproxyd
+
 service storageproxyd /vendor/bin/storageproxyd -d /dev/trusty-ipc-dev0 -p /data/vendor/securestorage -r /dev/rpmb0
-    class late_start
     user system
     group system
 
diff --git a/celadon/init.rc b/celadon/init.rc
index 2040d3902..28767fdae 100644
--- a/celadon/init.rc
+++ b/celadon/init.rc
@@ -688,8 +688,10 @@ on post-fs-data
     mkdir /data/vendor/securestorage 0700 system system
     chmod 666 /dev/rpmb0
 
+on early-boot
+    start storageproxyd
+
 service storageproxyd /vendor/bin/storageproxyd -d /dev/trusty-ipc-dev0 -p /data/vendor/securestorage -r /dev/rpmb0
-    class late_start
     user system
     group system
 

From 4a0afa3f5d9bd5bf7feb8dd9dd63736529c80a11 Mon Sep 17 00:00:00 2001
From: anitha3x <anithax.h.chandrasekar@intel.com>
Date: Wed, 5 Sep 2018 09:53:32 +0530
Subject: [PATCH 330/427] Summary: [MIXINUP] Fix for changing the order of
 updating the flags

Description:
We see that the flags for device type car like
"profile_supported_hid_host" is overriding the flags
defined for overlay-car-disablehfp.Since we are
referring to the flags of overlay-car-disablehfp for
celadon IVI, changed the order to update the
overlay-car-disablehfp first in mixins.spec

Tracked-On: OAM-67764

Signed-off-by: anitha3x <anithax.h.chandrasekar@intel.com>
---
 cel_apl/mixins.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cel_apl/mixins.spec b/cel_apl/mixins.spec
index e10f920c7..b14abf48e 100644
--- a/cel_apl/mixins.spec
+++ b/cel_apl/mixins.spec
@@ -10,7 +10,6 @@ project-celadon: default
 sepolicy: enforcing
 graphics: project-celadon(gen9+=true,hwc2=true,vulkan=true,drmhwc=false,minigbm=true,gralloc1=true)
 media: project-celadon(mediasdk=false,media_sdk_source=false)
-device-type: car
 ethernet: dhcp
 debugfs: default
 storage: sdcard-mmc0-usb-sd(adoptablesd=true,adoptableusb=false)
@@ -51,3 +50,4 @@ avb: true
 slot-ab: true
 art-config: default
 gptbuild: true(size=14G)
+device-type: car

From a6d53ac65bb72824d7f4410984693b47ae4c1569 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Mon, 10 Sep 2018 14:13:26 +0530
Subject: [PATCH 331/427] [MIXINUP] Summary: device type car mixin changes

Tracked-On:OAM-67764
---
 cel_apl/AndroidBoard.mk | 12 +++++-----
 cel_apl/BoardConfig.mk  | 20 ++++++++--------
 cel_apl/device.mk       | 52 ++++++++++++++++++++---------------------
 3 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/cel_apl/AndroidBoard.mk b/cel_apl/AndroidBoard.mk
index 6fed0ffbc..7602c1a5a 100644
--- a/cel_apl/AndroidBoard.mk
+++ b/cel_apl/AndroidBoard.mk
@@ -6,12 +6,6 @@
 droid: flashfiles
 	-$(hide) $(ACP) $(out_flashfiles) $(DIST_DIR)
 ##############################################################
-# Source: device/intel/mixins/groups/device-type/car/AndroidBoard.mk
-##############################################################
-# Car device required kernel diff config
-#KERNEL_CAR_DIFFCONFIG = $(wildcard $(KERNEL_CONFIG_PATH)/car_diffconfig)
-#KERNEL_DIFFCONFIG += $(KERNEL_CAR_DIFFCONFIG)
-##############################################################
 # Source: device/intel/mixins/groups/slot-ab/true/AndroidBoard.mk
 ##############################################################
 
@@ -564,4 +558,10 @@ $(GPTIMAGE_BIN): \
 
 .PHONY: gptimage
 gptimage: $(GPTIMAGE_BIN)
+##############################################################
+# Source: device/intel/mixins/groups/device-type/car/AndroidBoard.mk
+##############################################################
+# Car device required kernel diff config
+#KERNEL_CAR_DIFFCONFIG = $(wildcard $(KERNEL_CONFIG_PATH)/car_diffconfig)
+#KERNEL_DIFFCONFIG += $(KERNEL_CAR_DIFFCONFIG)
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index 5eb806792..ec8bd06d9 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -68,16 +68,6 @@ USE_MEDIASDK := true
 
 BOARD_HAVE_MEDIASDK_OPEN_SOURCE := true
 ##############################################################
-# Source: device/intel/mixins/groups/device-type/car/BoardConfig.mk
-##############################################################
-
-BOARD_SEPOLICY_DIRS += \
-    packages/services/Car/car_product/sepolicy \
-    device/generic/car/common/sepolicy \
-    device/intel/project-celadon/sepolicy/car
-
-TARGET_USES_CAR_FUTURE_FEATURES := true
-##############################################################
 # Source: device/intel/mixins/groups/debugfs/default/BoardConfig.mk
 ##############################################################
 BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/debugfs
@@ -467,6 +457,16 @@ BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/memtrack
 # can't use := here, as PRODUCT_OUT is not defined yet
 GPTIMAGE_BIN = $(PRODUCT_OUT)/$(TARGET_PRODUCT)_gptimage.img
 CRAFFIMAGE_BIN = $(PRODUCT_OUT)/$(TARGET_PRODUCT)_gptimage.craff
+##############################################################
+# Source: device/intel/mixins/groups/device-type/car/BoardConfig.mk
+##############################################################
+
+BOARD_SEPOLICY_DIRS += \
+    packages/services/Car/car_product/sepolicy \
+    device/generic/car/common/sepolicy \
+    device/intel/project-celadon/sepolicy/car
+
+TARGET_USES_CAR_FUTURE_FEATURES := true
 # ------------------ END MIX-IN DEFINITIONS ------------------
 
 # Install Native Bridge
diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index a4771f051..09a4f32cb 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -258,32 +258,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     device/intel/project-celadon/common/media/mfx_omxil_core.conf:vendor/etc/mfx_omxil_core.conf
 ##############################################################
-# Source: device/intel/mixins/groups/device-type/car/product.mk
-##############################################################
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/car_core_hardware.xml:vendor/etc/permissions/car_core_hardware.xml \
-    frameworks/native/data/etc/android.hardware.type.automotive.xml:vendor/etc/permissions/android.hardware.type.automotive.xml \
-    frameworks/native/data/etc/android.hardware.screen.landscape.xml:vendor/etc/permissions/android.hardware.screen.landscape.xml \
-    frameworks/native/data/etc/android.hardware.ethernet.xml:vendor/etc/permissions/android.hardware.ethernet.xml \
-    frameworks/native/data/etc/android.hardware.broadcastradio.xml:vendor/etc/permissions/android.hardware.broadcastradio.xml \
-    frameworks/native/data/etc/android.software.activities_on_secondary_displays.xml:vendor/etc/permissions/android.software.activities_on_secondary_displays.xml
-
-$(call inherit-product, packages/services/Car/car_product/build/car.mk)
-
-$(call inherit-product,frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-heap.mk)
-
-PRODUCT_PACKAGES += \
-    radio.fm.default \
-    CarSettings \
-    VmsPublisherClientSample \
-    VmsSubscriberClientSample \
-
-PRODUCT_PACKAGES += android.hardware.automotive.vehicle.intel@2.0-service \
-					android.hardware.automotive.vehicle@2.0-service \
-					android.hardware.automotive.vehicle@2.0-impl
-
-VEHICLE_HAL_PROTO_TYPE := google-emulator
-##############################################################
 # Source: device/intel/mixins/groups/ethernet/dhcp/product.mk
 ##############################################################
 PRODUCT_COPY_FILES += \
@@ -722,6 +696,32 @@ PRODUCT_PACKAGES_TESTS += \
     libnativebridgetest \
     libart-gtest
 ##############################################################
+# Source: device/intel/mixins/groups/device-type/car/product.mk
+##############################################################
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/car_core_hardware.xml:vendor/etc/permissions/car_core_hardware.xml \
+    frameworks/native/data/etc/android.hardware.type.automotive.xml:vendor/etc/permissions/android.hardware.type.automotive.xml \
+    frameworks/native/data/etc/android.hardware.screen.landscape.xml:vendor/etc/permissions/android.hardware.screen.landscape.xml \
+    frameworks/native/data/etc/android.hardware.ethernet.xml:vendor/etc/permissions/android.hardware.ethernet.xml \
+    frameworks/native/data/etc/android.hardware.broadcastradio.xml:vendor/etc/permissions/android.hardware.broadcastradio.xml \
+    frameworks/native/data/etc/android.software.activities_on_secondary_displays.xml:vendor/etc/permissions/android.software.activities_on_secondary_displays.xml
+
+$(call inherit-product, packages/services/Car/car_product/build/car.mk)
+
+$(call inherit-product,frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-heap.mk)
+
+PRODUCT_PACKAGES += \
+    radio.fm.default \
+    CarSettings \
+    VmsPublisherClientSample \
+    VmsSubscriberClientSample \
+
+PRODUCT_PACKAGES += android.hardware.automotive.vehicle.intel@2.0-service \
+					android.hardware.automotive.vehicle@2.0-service \
+					android.hardware.automotive.vehicle@2.0-impl
+
+VEHICLE_HAL_PROTO_TYPE := google-emulator
+##############################################################
 # Source: device/intel/mixins/groups/debug-kernel/default/product.mk
 ##############################################################
 ifneq ($(TARGET_BUILD_VARIANT),user)

From b4ab85be25ef3cb01984a98e31ee5cc1f6511383 Mon Sep 17 00:00:00 2001
From: Harish Krupo <harish.krupo.kps@intel.com>
Date: Thu, 31 May 2018 10:24:34 +0530
Subject: [PATCH 332/427] Set ignore_not_applicable_reset flag to true

Setting this flag to true makes the bootloader ignore the
not_applicable boot reason.

Jira: None.
Test: When this feature is enabled the boot reason will be
      something other than not_applicable.

Signed-off-by: Harish Krupo <harish.krupo.kps@intel.com>
---
 cel_apl/mixins.spec | 2 +-
 celadon/mixins.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cel_apl/mixins.spec b/cel_apl/mixins.spec
index b14abf48e..feeffc3d7 100644
--- a/cel_apl/mixins.spec
+++ b/cel_apl/mixins.spec
@@ -18,7 +18,7 @@ usb-gadget: g_ffs
 adb_net: true
 kernel: project-celadon(loglevel=3, disable_cpuidle_on_boot=true, external_modules=perftools-external/soc_perf_driver/src perftools-external/socwatch_driver)
 bluetooth: btusb (ivi=true)
-boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true)
+boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true,ignore_not_applicable_reset=true)
 audio: project-celadon
 wlan: iwlwifi
 cpu-arch: skl
diff --git a/celadon/mixins.spec b/celadon/mixins.spec
index 0351971df..6775fa5bb 100644
--- a/celadon/mixins.spec
+++ b/celadon/mixins.spec
@@ -19,7 +19,7 @@ usb-gadget: g_ffs
 adb_net: true
 kernel: project-celadon(loglevel=3, disable_cpuidle_on_boot=true, external_modules=perftools-external/soc_perf_driver/src perftools-external/socwatch_driver)
 bluetooth: btusb
-boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true)
+boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true,ignore_not_applicable_reset=true)
 audio: project-celadon
 wlan: iwlwifi
 cpu-arch: skl

From 37d9d1c51185d257d9f04b71354916419079c38c Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Tue, 11 Sep 2018 14:20:07 +0530
Subject: [PATCH 333/427] [MIXINUP] Set ignore_not_applicable_reset to true #7

Tracked-On: None
---
 cel_apl/device.mk | 3 +++
 celadon/device.mk | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 09a4f32cb..80aff2a62 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -393,6 +393,9 @@ endif
 
 PRODUCT_PACKAGES += updater_ab_esp
 
+# Allow Kernelflinger to ignore the RSCI reset source "not_applicable"
+# when setting the bootreason
+KERNELFLINGER_IGNORE_NOT_APPLICABLE_RESET := true
 
 
 ifneq (0x0,static)
diff --git a/celadon/device.mk b/celadon/device.mk
index c666c8199..b1f646926 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -393,6 +393,9 @@ endif
 
 PRODUCT_PACKAGES += updater_ab_esp
 
+# Allow Kernelflinger to ignore the RSCI reset source "not_applicable"
+# when setting the bootreason
+KERNELFLINGER_IGNORE_NOT_APPLICABLE_RESET := true
 
 
 ifneq (0x0,static)

From 6c70a075cb1c77193e16f86bdadea294701647ad Mon Sep 17 00:00:00 2001
From: Ming Tan <ming.tan@intel.com>
Date: Wed, 12 Sep 2018 13:03:52 +0800
Subject: [PATCH 334/427] Add the missing sepolicy of cel_apl.

Copy sepolicy from celadon.

Tracked-On: OAM-68583
Signed-off-by: Ming Tan <ming.tan@intel.com>
---
 .../boot-arch/project-celadon/cel_apl/device.te    |  1 +
 .../project-celadon/cel_apl/hal_bootctl_default.te |  6 ++++++
 sepolicy/boot-arch/project-celadon/cel_apl/init.te |  3 +++
 .../project-celadon/cel_apl/postinstall.te         | 14 ++++++++++++++
 .../boot-arch/project-celadon/cel_apl/property.te  |  1 +
 .../boot-arch/project-celadon/cel_apl/recovery.te  |  1 +
 .../project-celadon/cel_apl/update_engine.te       |  5 +++++
 .../cel_apl/update_engine_common.te                |  3 +++
 .../cel_apl/update_engine_sideload.te              |  3 +++
 sepolicy/boot-arch/project-celadon/cel_apl/vold.te |  1 +
 10 files changed, 38 insertions(+)
 create mode 100644 sepolicy/boot-arch/project-celadon/cel_apl/device.te
 create mode 100644 sepolicy/boot-arch/project-celadon/cel_apl/hal_bootctl_default.te
 create mode 100644 sepolicy/boot-arch/project-celadon/cel_apl/postinstall.te
 create mode 100644 sepolicy/boot-arch/project-celadon/cel_apl/property.te
 create mode 100644 sepolicy/boot-arch/project-celadon/cel_apl/recovery.te
 create mode 100644 sepolicy/boot-arch/project-celadon/cel_apl/update_engine.te
 create mode 100644 sepolicy/boot-arch/project-celadon/cel_apl/update_engine_common.te
 create mode 100644 sepolicy/boot-arch/project-celadon/cel_apl/update_engine_sideload.te
 create mode 100644 sepolicy/boot-arch/project-celadon/cel_apl/vold.te

diff --git a/sepolicy/boot-arch/project-celadon/cel_apl/device.te b/sepolicy/boot-arch/project-celadon/cel_apl/device.te
new file mode 100644
index 000000000..b31ee1953
--- /dev/null
+++ b/sepolicy/boot-arch/project-celadon/cel_apl/device.te
@@ -0,0 +1 @@
+type vendor_block_device, dev_type;
diff --git a/sepolicy/boot-arch/project-celadon/cel_apl/hal_bootctl_default.te b/sepolicy/boot-arch/project-celadon/cel_apl/hal_bootctl_default.te
new file mode 100644
index 000000000..2f1f82bc0
--- /dev/null
+++ b/sepolicy/boot-arch/project-celadon/cel_apl/hal_bootctl_default.te
@@ -0,0 +1,6 @@
+allow hal_bootctl_default rootfs:file r_file_perms;
+allow hal_bootctl_default proc:file r_file_perms;
+allow hal_bootctl_default block_device:dir r_dir_perms;
+allow hal_bootctl_default misc_block_device:blk_file rw_file_perms;
+allow hal_bootctl_default tmpfs:file r_file_perms;
+allow hal_bootctl_default tmpfs:dir r_dir_perms;
diff --git a/sepolicy/boot-arch/project-celadon/cel_apl/init.te b/sepolicy/boot-arch/project-celadon/cel_apl/init.te
index 35d653a71..a2f993a8d 100644
--- a/sepolicy/boot-arch/project-celadon/cel_apl/init.te
+++ b/sepolicy/boot-arch/project-celadon/cel_apl/init.te
@@ -1 +1,4 @@
+allow init system_file:system module_load;
+allow init tmpfs:file r_file_perms;
+allow init { boot_block_device vendor_block_device }:lnk_file relabelto;
 allow init userdata_block_device:{ lnk_file blk_file } w_file_perms;
diff --git a/sepolicy/boot-arch/project-celadon/cel_apl/postinstall.te b/sepolicy/boot-arch/project-celadon/cel_apl/postinstall.te
new file mode 100644
index 000000000..d04464da6
--- /dev/null
+++ b/sepolicy/boot-arch/project-celadon/cel_apl/postinstall.te
@@ -0,0 +1,14 @@
+set_prop(postinstall, ota_prop)
+recovery_only(`
+  allow postinstall rootfs:file rx_file_perms;
+')
+
+allow postinstall vendor_shell_exec:file rx_file_perms;
+allow postinstall vendor_toolbox_exec:file rx_file_perms;
+allow postinstall vendor_file:file rx_file_perms;
+allow postinstall rootfs:dir { write add_name create mounton };
+allow postinstall self:capability { sys_admin };
+allow postinstall vfat:filesystem { mount unmount };
+allow postinstall vfat:dir { write add_name search };
+allow postinstall vfat:file { create write open getattr };
+allow postinstall block_device:dir { search };
diff --git a/sepolicy/boot-arch/project-celadon/cel_apl/property.te b/sepolicy/boot-arch/project-celadon/cel_apl/property.te
new file mode 100644
index 000000000..0b672d819
--- /dev/null
+++ b/sepolicy/boot-arch/project-celadon/cel_apl/property.te
@@ -0,0 +1 @@
+type ota_prop, property_type;
diff --git a/sepolicy/boot-arch/project-celadon/cel_apl/recovery.te b/sepolicy/boot-arch/project-celadon/cel_apl/recovery.te
new file mode 100644
index 000000000..15fb95121
--- /dev/null
+++ b/sepolicy/boot-arch/project-celadon/cel_apl/recovery.te
@@ -0,0 +1 @@
+allow recovery sysfs_thermal_management:dir { search };
diff --git a/sepolicy/boot-arch/project-celadon/cel_apl/update_engine.te b/sepolicy/boot-arch/project-celadon/cel_apl/update_engine.te
new file mode 100644
index 000000000..91f256a22
--- /dev/null
+++ b/sepolicy/boot-arch/project-celadon/cel_apl/update_engine.te
@@ -0,0 +1,5 @@
+allow update_engine vendor_block_device:blk_file rw_file_perms;
+allow update_engine tmpfs:dir r_dir_perms;
+allow update_engine tmpfs:file r_file_perms;
+allow update_engine tmpfs:lnk_file r_file_perms;
+allow update_engine vendor_shell_exec:file rx_file_perms;
diff --git a/sepolicy/boot-arch/project-celadon/cel_apl/update_engine_common.te b/sepolicy/boot-arch/project-celadon/cel_apl/update_engine_common.te
new file mode 100644
index 000000000..eb5f3aab2
--- /dev/null
+++ b/sepolicy/boot-arch/project-celadon/cel_apl/update_engine_common.te
@@ -0,0 +1,3 @@
+allow update_engine_common vendor_block_device:blk_file rw_file_perms;
+allow update_engine_common tmpfs:file r_file_perms;
+allow update_engine_common tmpfs:lnk_file r_file_perms;
diff --git a/sepolicy/boot-arch/project-celadon/cel_apl/update_engine_sideload.te b/sepolicy/boot-arch/project-celadon/cel_apl/update_engine_sideload.te
new file mode 100644
index 000000000..7ef4adf62
--- /dev/null
+++ b/sepolicy/boot-arch/project-celadon/cel_apl/update_engine_sideload.te
@@ -0,0 +1,3 @@
+type update_engine_sideload, domain;
+
+allow update_engine_sideload recovery:capability { sys_rawio };
diff --git a/sepolicy/boot-arch/project-celadon/cel_apl/vold.te b/sepolicy/boot-arch/project-celadon/cel_apl/vold.te
new file mode 100644
index 000000000..a7cd94845
--- /dev/null
+++ b/sepolicy/boot-arch/project-celadon/cel_apl/vold.te
@@ -0,0 +1 @@
+allow vold tmpfs:file r_file_perms;

From 13c3f31ce5764ddd806fdbbf23a9da6a57059866 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Fri, 14 Sep 2018 15:22:24 +0530
Subject: [PATCH 335/427] [CELADON] Mixinup Disable secure adb

Tracked-On: None
Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 cel_apl/device.mk | 12 ------------
 celadon/device.mk | 12 ------------
 2 files changed, 24 deletions(-)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 80aff2a62..6d069a7ec 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -279,28 +279,16 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.sf.lcd_density=160
 ##############################################################
 # Set default USB interface
 USB_CONFIG := mtp
-
 ifeq ($(TARGET_BUILD_VARIANT),user)
 # Enable Secure Debugging
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.adb.secure=1
 ifeq ($(BUILD_FOR_CTS_AUTOMATION),true)
 # Build for automated CTS
-ifneq ($(USB_CONFIG), adb)
 USB_CONFIG := $(USB_CONFIG),adb
-endif
-PRODUCT_COPY_FILES += $(INTEL_PATH_COMMON)/usb-gadget/adb_keys:root/adb_keys
 endif #BUILD_FOR_CTS_AUTOMATION == true
 endif #TARGET_BUILD_VARIANT == user
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.sys.usb.config=$(USB_CONFIG)
 
-# Add Intel adb keys for userdebug/eng builds
-ifneq ($(TARGET_BUILD_VARIANT),user)
-PRODUCT_COPY_FILES += $(INTEL_PATH_COMMON)/usb-gadget/adb_keys:root/adb_keys
-# Enable Secure Debugging for userdebug
-ifeq ($(TARGET_BUILD_VARIANT),userdebug) #userdebug
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.adb.secure=1
-endif #userdebug
-endif #userdebug/eng
 ##############################################################
 # Source: device/intel/mixins/groups/adb_net/true/product.mk
 ##############################################################
diff --git a/celadon/device.mk b/celadon/device.mk
index b1f646926..060ecf8a8 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -279,28 +279,16 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.sf.lcd_density=160
 ##############################################################
 # Set default USB interface
 USB_CONFIG := mtp
-
 ifeq ($(TARGET_BUILD_VARIANT),user)
 # Enable Secure Debugging
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.adb.secure=1
 ifeq ($(BUILD_FOR_CTS_AUTOMATION),true)
 # Build for automated CTS
-ifneq ($(USB_CONFIG), adb)
 USB_CONFIG := $(USB_CONFIG),adb
-endif
-PRODUCT_COPY_FILES += $(INTEL_PATH_COMMON)/usb-gadget/adb_keys:root/adb_keys
 endif #BUILD_FOR_CTS_AUTOMATION == true
 endif #TARGET_BUILD_VARIANT == user
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.sys.usb.config=$(USB_CONFIG)
 
-# Add Intel adb keys for userdebug/eng builds
-ifneq ($(TARGET_BUILD_VARIANT),user)
-PRODUCT_COPY_FILES += $(INTEL_PATH_COMMON)/usb-gadget/adb_keys:root/adb_keys
-# Enable Secure Debugging for userdebug
-ifeq ($(TARGET_BUILD_VARIANT),userdebug) #userdebug
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.adb.secure=1
-endif #userdebug
-endif #userdebug/eng
 ##############################################################
 # Source: device/intel/mixins/groups/adb_net/true/product.mk
 ##############################################################

From 812e5d18bf9cc81a62fa8f3b5d6104cc72c2b2f9 Mon Sep 17 00:00:00 2001
From: "Yan, WalterX" <walterx.yan@intel.com>
Date: Wed, 12 Sep 2018 16:23:57 +0800
Subject: [PATCH 336/427] Remove Houdini config.

Tracked-On: OAM-68647
Signed-off-by: Yan, WalterX <walterx.yan@intel.com>
---
 cel_apl/BoardConfig.mk | 30 ------------------------------
 cel_apl/device.mk      | 23 -----------------------
 celadon/BoardConfig.mk | 30 ------------------------------
 celadon/device.mk      | 23 -----------------------
 4 files changed, 106 deletions(-)

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index ec8bd06d9..abe1b20d2 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -468,33 +468,3 @@ BOARD_SEPOLICY_DIRS += \
 
 TARGET_USES_CAR_FUTURE_FEATURES := true
 # ------------------ END MIX-IN DEFINITIONS ------------------
-
-# Install Native Bridge
-WITH_NATIVE_BRIDGE := true
-
-# Enable ARM codegen for x86 with Native Bridge
-BUILD_ARM_FOR_X86 := true
-
-# Native Bridge ABI List
-NB_ABI_LIST_32_BIT := armeabi-v7a armeabi
-NB_ABI_LIST_64_BIT := arm64-v8a
-
-# Support 64 Bit Apps
-ifeq ($(ENABLE_NATIVEBRIDGE_64BIT),true)
-  TARGET_CPU_ABI_LIST_64_BIT ?= $(TARGET_CPU_ABI) $(TARGET_CPU_ABI2)
-  TARGET_CPU_ABI_LIST_32_BIT ?= $(TARGET_2ND_CPU_ABI) $(TARGET_2ND_CPU_ABI2)
-  TARGET_CPU_ABI_LIST := \
-      $(TARGET_CPU_ABI_LIST_64_BIT) \
-      $(TARGET_CPU_ABI_LIST_32_BIT) \
-      $(NB_ABI_LIST_32_BIT) \
-      $(NB_ABI_LIST_64_BIT)
-  TARGET_CPU_ABI_LIST_32_BIT += $(NB_ABI_LIST_32_BIT)
-  TARGET_CPU_ABI_LIST_64_BIT += $(NB_ABI_LIST_64_BIT)
-else
-  TARGET_CPU_ABI_LIST_32_BIT ?= $(TARGET_CPU_ABI) $(TARGET_CPU_ABI2)
-  TARGET_CPU_ABI_LIST_32_BIT += $(NB_ABI_LIST_32_BIT)
-  TARGET_CPU_ABI_LIST := $(TARGET_CPU_ABI_LIST_32_BIT)
-endif
-
-BOARD_SEPOLICY_M4DEFS += module_houdini=true
-BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/houdini
diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 6d069a7ec..c7c98d09e 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -13,8 +13,6 @@ INTEL_PATH_BUILD := device/intel/build
 INTEL_PATH_HARDWARE := hardware/intel
 INTEL_PATH_VENDOR := vendor/intel
 
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.dalvik.vm.native.bridge=libhoudini.so
-
 PRODUCT_TAGS += dalvik.gc.type-precise
 
 DEVICE_PACKAGE_OVERLAYS += device/intel/project-celadon/common/overlay
@@ -734,26 +732,5 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += sys.dump.stacks_timeout=1500
 
 endif
 # ------------------ END MIX-IN DEFINITIONS ------------------
-PRODUCT_PACKAGES += libhoudini houdini
-PRODUCT_PROPERTY_OVERRIDES += ro.dalvik.vm.isa.arm=x86 ro.enable.native.bridge.exec=1
-
-ENABLE_NATIVEBRIDGE_64BIT := false
-ifeq ($(BOARD_USE_64BIT_USERSPACE),true)
-  ENABLE_NATIVEBRIDGE_64BIT = true
-else
-  ifeq ($(TARGET_SUPPORTS_64_BIT_APPS),true)
-    ENABLE_NATIVEBRIDGE_64BIT = true
-  endif
-endif
-ifeq ($(ENABLE_NATIVEBRIDGE_64BIT),true)
-  PRODUCT_PACKAGES += houdini64
-  PRODUCT_PROPERTY_OVERRIDES += ro.dalvik.vm.isa.arm64=x86_64 ro.enable.native.bridge.exec64=1
-endif
-##############################################################
-# Source: device/intel/mixins/groups/debug-phonedoctor/true/product.mk
-##############################################################
-ifeq ($(MIXIN_DEBUG_LOGS),true)
-PRODUCT_PACKAGES += crash_package
-endif
 
 
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index 7592c42ac..6503ec29e 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -467,33 +467,3 @@ BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/memtrack
 GPTIMAGE_BIN = $(PRODUCT_OUT)/$(TARGET_PRODUCT)_gptimage.img
 CRAFFIMAGE_BIN = $(PRODUCT_OUT)/$(TARGET_PRODUCT)_gptimage.craff
 # ------------------ END MIX-IN DEFINITIONS ------------------
-
-# Install Native Bridge
-WITH_NATIVE_BRIDGE := true
-
-# Enable ARM codegen for x86 with Native Bridge
-BUILD_ARM_FOR_X86 := true
-
-# Native Bridge ABI List
-NB_ABI_LIST_32_BIT := armeabi-v7a armeabi
-NB_ABI_LIST_64_BIT := arm64-v8a
-
-# Support 64 Bit Apps
-ifeq ($(ENABLE_NATIVEBRIDGE_64BIT),true)
-  TARGET_CPU_ABI_LIST_64_BIT ?= $(TARGET_CPU_ABI) $(TARGET_CPU_ABI2)
-  TARGET_CPU_ABI_LIST_32_BIT ?= $(TARGET_2ND_CPU_ABI) $(TARGET_2ND_CPU_ABI2)
-  TARGET_CPU_ABI_LIST := \
-      $(TARGET_CPU_ABI_LIST_64_BIT) \
-      $(TARGET_CPU_ABI_LIST_32_BIT) \
-      $(NB_ABI_LIST_32_BIT) \
-      $(NB_ABI_LIST_64_BIT)
-  TARGET_CPU_ABI_LIST_32_BIT += $(NB_ABI_LIST_32_BIT)
-  TARGET_CPU_ABI_LIST_64_BIT += $(NB_ABI_LIST_64_BIT)
-else
-  TARGET_CPU_ABI_LIST_32_BIT ?= $(TARGET_CPU_ABI) $(TARGET_CPU_ABI2)
-  TARGET_CPU_ABI_LIST_32_BIT += $(NB_ABI_LIST_32_BIT)
-  TARGET_CPU_ABI_LIST := $(TARGET_CPU_ABI_LIST_32_BIT)
-endif
-
-BOARD_SEPOLICY_M4DEFS += module_houdini=true
-BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/houdini
diff --git a/celadon/device.mk b/celadon/device.mk
index 060ecf8a8..97857adae 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -13,8 +13,6 @@ INTEL_PATH_BUILD := device/intel/build
 INTEL_PATH_HARDWARE := hardware/intel
 INTEL_PATH_VENDOR := vendor/intel
 
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.dalvik.vm.native.bridge=libhoudini.so
-
 PRODUCT_TAGS += dalvik.gc.type-precise
 
 DEVICE_PACKAGE_OVERLAYS += device/intel/project-celadon/common/overlay
@@ -696,26 +694,5 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += sys.dump.stacks_timeout=1500
 
 endif
 # ------------------ END MIX-IN DEFINITIONS ------------------
-PRODUCT_PACKAGES += libhoudini houdini
-PRODUCT_PROPERTY_OVERRIDES += ro.dalvik.vm.isa.arm=x86 ro.enable.native.bridge.exec=1
-
-ENABLE_NATIVEBRIDGE_64BIT := false
-ifeq ($(BOARD_USE_64BIT_USERSPACE),true)
-  ENABLE_NATIVEBRIDGE_64BIT = true
-else
-  ifeq ($(TARGET_SUPPORTS_64_BIT_APPS),true)
-    ENABLE_NATIVEBRIDGE_64BIT = true
-  endif
-endif
-ifeq ($(ENABLE_NATIVEBRIDGE_64BIT),true)
-  PRODUCT_PACKAGES += houdini64
-  PRODUCT_PROPERTY_OVERRIDES += ro.dalvik.vm.isa.arm64=x86_64 ro.enable.native.bridge.exec64=1
-endif
-##############################################################
-# Source: device/intel/mixins/groups/debug-phonedoctor/true/product.mk
-##############################################################
-ifeq ($(MIXIN_DEBUG_LOGS),true)
-PRODUCT_PACKAGES += crash_package
-endif
 
 

From 28960444df3ddbbc90d032b38edb35f1114d45a5 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Thu, 20 Sep 2018 14:01:39 +0530
Subject: [PATCH 337/427] [MIXINUP] Select configuration files based on
 device-type

Tracked-On:  OAM-67866
Signed-off-by: Swaroop Balan <swaroop.balan@intel.com>
---
 cel_apl/device.mk | 1 +
 celadon/device.mk | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index c7c98d09e..7abd8ed78 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -348,6 +348,7 @@ PRODUCT_PACKAGES += \
   libbt-vendor
 
 PRODUCT_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/bluetooth/overlay-car-disablehfp
+
 ##############################################################
 # Source: device/intel/mixins/groups/disk-bus/auto/product.mk
 ##############################################################
diff --git a/celadon/device.mk b/celadon/device.mk
index 97857adae..52839f8eb 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -347,7 +347,8 @@ PRODUCT_PACKAGES += \
   android.hardware.bluetooth@1.0-service \
   libbt-vendor
 
-PRODUCT_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/bluetooth/overlay-car-disablehfp
+
+PRODUCT_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/bluetooth/overlay-tablet
 ##############################################################
 # Source: device/intel/mixins/groups/disk-bus/auto/product.mk
 ##############################################################

From 0edaddc07ed241b87dc2a283d2e0e06eac49cfa9 Mon Sep 17 00:00:00 2001
From: Muhammad Aksar <muhammad.aksar@intel.com>
Date: Tue, 4 Sep 2018 12:49:11 +0530
Subject: [PATCH 338/427] Mixin: Enable USB camera as External Camera

Enable USB camera as external camera for
both cel_apl and celadon targets. This
option is newly introduced on Android P

Tracked-On: None

Signed-off-by: Muhammad Aksar <muhammad.aksar@intel.com>
---
 cel_apl/mixins.spec | 2 +-
 celadon/mixins.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cel_apl/mixins.spec b/cel_apl/mixins.spec
index feeffc3d7..5f28df107 100644
--- a/cel_apl/mixins.spec
+++ b/cel_apl/mixins.spec
@@ -43,7 +43,7 @@ midi: true
 trusty: true(enable_hw_sec=true,enable_storage_proxyd=true,ref_target=project-celadon_64)
 slcan: default
 ioc-slcan-reboot: false
-camera: usbcamera
+camera-ext: ext-camera-only
 memtrack: true
 touch: galax7200
 avb: true
diff --git a/celadon/mixins.spec b/celadon/mixins.spec
index 6775fa5bb..fac1cf3c5 100644
--- a/celadon/mixins.spec
+++ b/celadon/mixins.spec
@@ -44,7 +44,7 @@ midi: true
 trusty: true(enable_hw_sec=true,enable_storage_proxyd=true,ref_target=project-celadon_64)
 slcan: default
 ioc-slcan-reboot: false
-camera: usbcamera
+camera-ext: ext-camera-only
 memtrack: true
 touch: galax7200
 avb: true

From a0f5e94c925ec83c5c71745d13de0fee081192a3 Mon Sep 17 00:00:00 2001
From: Muhammad Aksar <muhammad.aksar@intel.com>
Date: Thu, 4 Oct 2018 15:53:26 +0530
Subject: [PATCH 339/427] Add support for External Camera config file

Tracked-On: None

Signed-off-by: Muhammad Aksar <muhammad.aksar@intel.com>
---
 common/camera-ext/external_camera_config.xml | 45 ++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 common/camera-ext/external_camera_config.xml

diff --git a/common/camera-ext/external_camera_config.xml b/common/camera-ext/external_camera_config.xml
new file mode 100644
index 000000000..7cf8b39af
--- /dev/null
+++ b/common/camera-ext/external_camera_config.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Copyright (C) 2017-2018 Intel Corporation.
+
+     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.
+-->
+
+<ExternalCamera>
+    <Provider>
+        <ignore> <!-- Internal video devices to be ignored by external camera HAL -->
+        </ignore>
+    </Provider>
+    <!-- See ExternalCameraUtils.cpp for default values of Device configurations below
+-->
+    <Device>
+        <!-- Max JPEG buffer size in bytes-->
+        <MaxJpegBufferSize bytes="3145728"/> <!-- 3MB (~= 1080p YUV420) -->
+        <!-- Size of v4l2 buffer queue when streaming >= 30fps -->
+        <!-- Larger value: more request can be cached pipeline (less janky)  -->
+        <!-- Smaller value: use less memory -->
+        <NumVideoBuffers count="4"/>
+        <!-- Size of v4l2 buffer queue when streaming < 30fps -->
+        <NumStillBuffers count="2"/>
+
+        <!-- List of maximum fps for various output sizes -->
+        <!-- Any image size smaller than the size listed in Limit row will report
+            fps (as minimum frame duration) up to the fpsBound value. -->
+        <FpsList>
+            <!-- width/height must be increasing, fpsBound must be decreasing-->
+            <Limit width="640" height="480" fpsBound="30.0"/>
+            <Limit width="1280" height="720" fpsBound="15.0"/>
+            <Limit width="1920" height="1080" fpsBound="10.0"/>
+            <!-- image size larger than the last entry will not be supported-->
+        </FpsList>
+    </Device>
+</ExternalCamera>

From dd1270701697ce9ded0b7992f1d9c1d444355f48 Mon Sep 17 00:00:00 2001
From: Muhammad Aksar <muhammad.aksar@intel.com>
Date: Thu, 4 Oct 2018 15:56:15 +0530
Subject: [PATCH 340/427] Add Sepolicy support for External Camera

Tracked-On: None

Signed-off-by: Muhammad Aksar <muhammad.aksar@intel.com>
---
 sepolicy/camera-ext/ext-camera-only/cameraserver.te       | 4 ++++
 sepolicy/camera-ext/ext-camera-only/file_contexts         | 2 ++
 sepolicy/camera-ext/ext-camera-only/hal_camera_default.te | 5 +++++
 sepolicy/camera-ext/ext-camera-only/init.te               | 6 ++++++
 4 files changed, 17 insertions(+)
 create mode 100644 sepolicy/camera-ext/ext-camera-only/cameraserver.te
 create mode 100644 sepolicy/camera-ext/ext-camera-only/file_contexts
 create mode 100644 sepolicy/camera-ext/ext-camera-only/hal_camera_default.te
 create mode 100644 sepolicy/camera-ext/ext-camera-only/init.te

diff --git a/sepolicy/camera-ext/ext-camera-only/cameraserver.te b/sepolicy/camera-ext/ext-camera-only/cameraserver.te
new file mode 100644
index 000000000..e075a0b01
--- /dev/null
+++ b/sepolicy/camera-ext/ext-camera-only/cameraserver.te
@@ -0,0 +1,4 @@
+#============= cameraserver ==============
+allow cameraserver gpu_device:dir search;
+allow cameraserver hal_graphics_allocator_default_tmpfs:file map;
+allow cameraserver hal_graphics_allocator_default_tmpfs:file { read write };
diff --git a/sepolicy/camera-ext/ext-camera-only/file_contexts b/sepolicy/camera-ext/ext-camera-only/file_contexts
new file mode 100644
index 000000000..1435d5fdf
--- /dev/null
+++ b/sepolicy/camera-ext/ext-camera-only/file_contexts
@@ -0,0 +1,2 @@
+/dev/video*                 u:object_r:video_device:s0
+/dev/media([0-9])+          u:object_r:video_device:s0
diff --git a/sepolicy/camera-ext/ext-camera-only/hal_camera_default.te b/sepolicy/camera-ext/ext-camera-only/hal_camera_default.te
new file mode 100644
index 000000000..241faa334
--- /dev/null
+++ b/sepolicy/camera-ext/ext-camera-only/hal_camera_default.te
@@ -0,0 +1,5 @@
+#============= hal_camera_default ==============
+allow hal_camera_default coredump_log_file:file { open read write };
+allow hal_camera_default gpu_device:chr_file { ioctl open read write };
+allow hal_camera_default gpu_device:dir search;
+allow hal_camera_default hal_graphics_allocator_default_tmpfs:file { map read write };
diff --git a/sepolicy/camera-ext/ext-camera-only/init.te b/sepolicy/camera-ext/ext-camera-only/init.te
new file mode 100644
index 000000000..60543c9c0
--- /dev/null
+++ b/sepolicy/camera-ext/ext-camera-only/init.te
@@ -0,0 +1,6 @@
+#
+# init
+#
+
+# wait on /dev/video0 a shared buffer used for camera processing
+allow init video_device:chr_file getattr;

From c6d00e46bc9e945a9eddcfd1ab674d95c190bc8e Mon Sep 17 00:00:00 2001
From: Muhammad Aksar <muhammad.aksar@intel.com>
Date: Thu, 4 Oct 2018 15:58:44 +0530
Subject: [PATCH 341/427] [MIXINUP] Enable USB Camera as External Camera

Tracked-On: None

Signed-off-by: Muhammad Aksar <muhammad.aksar@intel.com>
---
 cel_apl/BoardConfig.mk |  4 ++--
 cel_apl/device.mk      | 14 ++++++++++++++
 cel_apl/ueventd.rc     |  5 ++---
 celadon/BoardConfig.mk |  4 ++--
 celadon/device.mk      | 14 ++++++++++++++
 celadon/ueventd.rc     |  5 ++---
 6 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index abe1b20d2..d48023a9c 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -444,9 +444,9 @@ BOARD_KERNEL_CMDLINE += cpu_init_udelay=500000
 
 BOARD_TOSIMAGE_PARTITION_SIZE := 10485760
 ##############################################################
-# Source: device/intel/mixins/groups/camera/usbcamera/BoardConfig.mk
+# Source: device/intel/mixins/groups/camera-ext/ext-camera-only/BoardConfig.mk
 ##############################################################
-BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/camera/usbcamera
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/camera-ext/ext-camera-only
 ##############################################################
 # Source: device/intel/mixins/groups/memtrack/true/BoardConfig.mk
 ##############################################################
diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 7abd8ed78..7930ff649 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -660,6 +660,20 @@ PRODUCT_PACKAGES += \
 PRODUCT_PROPERTY_OVERRIDES += \
 	ro.hardware.gatekeeper=trusty
 
+##############################################################
+# Source: device/intel/mixins/groups/camera-ext/ext-camera-only/product.mk
+##############################################################
+# Camera: Device-specific configuration files. Supports only External USB camera, no CSI support
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.camera.external.xml:vendor/etc/permissions/android.hardware.camera.external.xml \
+    device/intel/project-celadon/common/camera-ext/external_camera_config.xml:vendor/etc/external_camera_config.xml
+
+# External camera service
+PRODUCT_PACKAGES += android.hardware.camera.provider@2.4-external-service \
+                    android.hardware.camera.provider@2.4-impl
+
+# Only include test apps in eng or userdebug builds.
+PRODUCT_PACKAGES_DEBUG += TestingCamera
 ##############################################################
 # Source: device/intel/mixins/groups/memtrack/true/product.mk
 ##############################################################
diff --git a/cel_apl/ueventd.rc b/cel_apl/ueventd.rc
index b8c000a5f..b6e497c9d 100644
--- a/cel_apl/ueventd.rc
+++ b/cel_apl/ueventd.rc
@@ -77,10 +77,9 @@
 ##############################################################
 /dev/block/pci/pci0000:00/0000:00:*.0/by-name/teedata      0660 system system
 ##############################################################
-# Source: device/intel/mixins/groups/camera/usbcamera/ueventd.rc
+# Source: device/intel/mixins/groups/camera-ext/ext-camera-only/ueventd.rc
 ##############################################################
 # Camera
-/dev/video*       0666  system  camera
+/dev/video*       0660  system  camera
 /dev/media*       0660  system  camera
-/dev/v4l-subdev*  0660  system  camera
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index 6503ec29e..9dc1814c6 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -453,9 +453,9 @@ BOARD_KERNEL_CMDLINE += cpu_init_udelay=500000
 
 BOARD_TOSIMAGE_PARTITION_SIZE := 10485760
 ##############################################################
-# Source: device/intel/mixins/groups/camera/usbcamera/BoardConfig.mk
+# Source: device/intel/mixins/groups/camera-ext/ext-camera-only/BoardConfig.mk
 ##############################################################
-BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/camera/usbcamera
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/camera-ext/ext-camera-only
 ##############################################################
 # Source: device/intel/mixins/groups/memtrack/true/BoardConfig.mk
 ##############################################################
diff --git a/celadon/device.mk b/celadon/device.mk
index 52839f8eb..19d289c65 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -648,6 +648,20 @@ PRODUCT_PACKAGES += \
 PRODUCT_PROPERTY_OVERRIDES += \
 	ro.hardware.gatekeeper=trusty
 
+##############################################################
+# Source: device/intel/mixins/groups/camera-ext/ext-camera-only/product.mk
+##############################################################
+# Camera: Device-specific configuration files. Supports only External USB camera, no CSI support
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.camera.external.xml:vendor/etc/permissions/android.hardware.camera.external.xml \
+    device/intel/project-celadon/common/camera-ext/external_camera_config.xml:vendor/etc/external_camera_config.xml
+
+# External camera service
+PRODUCT_PACKAGES += android.hardware.camera.provider@2.4-external-service \
+                    android.hardware.camera.provider@2.4-impl
+
+# Only include test apps in eng or userdebug builds.
+PRODUCT_PACKAGES_DEBUG += TestingCamera
 ##############################################################
 # Source: device/intel/mixins/groups/memtrack/true/product.mk
 ##############################################################
diff --git a/celadon/ueventd.rc b/celadon/ueventd.rc
index b8c000a5f..b6e497c9d 100644
--- a/celadon/ueventd.rc
+++ b/celadon/ueventd.rc
@@ -77,10 +77,9 @@
 ##############################################################
 /dev/block/pci/pci0000:00/0000:00:*.0/by-name/teedata      0660 system system
 ##############################################################
-# Source: device/intel/mixins/groups/camera/usbcamera/ueventd.rc
+# Source: device/intel/mixins/groups/camera-ext/ext-camera-only/ueventd.rc
 ##############################################################
 # Camera
-/dev/video*       0666  system  camera
+/dev/video*       0660  system  camera
 /dev/media*       0660  system  camera
-/dev/v4l-subdev*  0660  system  camera
 # ------------------ END MIX-IN DEFINITIONS ------------------

From 527035f57900fc6770e46becc1aafbaf3b25ebdc Mon Sep 17 00:00:00 2001
From: saranya <saranya.gopal@intel.com>
Date: Wed, 3 Oct 2018 22:23:55 +0530
Subject: [PATCH 342/427] Enabling USB Role switch config for Commercial nuc

Tracked-On:
---
 kernel_config/kernel_64_defconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index a9f2cd9eb..a59dab866 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -5690,7 +5690,8 @@ CONFIG_TYPEC_UCSI=y
 # CONFIG_UCSI_ACPI is not set
 # CONFIG_USB_LED_TRIG is not set
 # CONFIG_USB_ULPI_BUS is not set
-# CONFIG_USB_ROLE_SWITCH is not set
+CONFIG_USB_ROLE_SWITCH=y
+CONFIG_USB_ROLES_INTEL_XHCI=y
 # CONFIG_UWB is not set
 CONFIG_MMC=y
 CONFIG_PWRSEQ_EMMC=y

From c1d5de7671d5b8e573da9717f69a92634b312841 Mon Sep 17 00:00:00 2001
From: Muhammad Aksar <muhammad.aksar@intel.com>
Date: Wed, 10 Oct 2018 14:39:04 +0530
Subject: [PATCH 343/427] Sepolicy: Fix for compilation error on user build

Tracked-On: None

Signed-off-by: Muhammad Aksar <muhammad.aksar@intel.com>
---
 sepolicy/camera-ext/ext-camera-only/hal_camera_default.te | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sepolicy/camera-ext/ext-camera-only/hal_camera_default.te b/sepolicy/camera-ext/ext-camera-only/hal_camera_default.te
index 241faa334..b4f4ceacf 100644
--- a/sepolicy/camera-ext/ext-camera-only/hal_camera_default.te
+++ b/sepolicy/camera-ext/ext-camera-only/hal_camera_default.te
@@ -1,5 +1,4 @@
 #============= hal_camera_default ==============
-allow hal_camera_default coredump_log_file:file { open read write };
 allow hal_camera_default gpu_device:chr_file { ioctl open read write };
 allow hal_camera_default gpu_device:dir search;
 allow hal_camera_default hal_graphics_allocator_default_tmpfs:file { map read write };

From b209872633c1b7bd4f6ab301977d26541bc44363 Mon Sep 17 00:00:00 2001
From: "tianmi.chen" <tianmi.chen@intel.com>
Date: Tue, 16 Oct 2018 14:57:59 +0800
Subject: [PATCH 344/427] Add hw mpeg2 decoder support

Jira: OAM-66318
Test: Tested locally

Tracked-On:
Signed-off-by: tianmi.chen <tianmi.chen@intel.com>
---
 common/media/media_codecs.xml    | 8 ++++++++
 common/media/mfx_omxil_core.conf | 1 +
 2 files changed, 9 insertions(+)

diff --git a/common/media/media_codecs.xml b/common/media/media_codecs.xml
index 0d4397e39..e06ddc852 100644
--- a/common/media/media_codecs.xml
+++ b/common/media/media_codecs.xml
@@ -115,6 +115,14 @@ Only the three quirks included above are recognized at this point:
             <Feature name="adaptive-playback" />
         </MediaCodec>
 
+        <MediaCodec name="OMX.Intel.hw_vd.mp2" type="video/mpeg2" >
+            <Limit name="size" min="64x64" max="3840x2160" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" range="1-972000" />
+            <Limit name="bitrate" range="1-40000000" />
+            <Feature name="adaptive-playback" />
+        </MediaCodec>
 
     </Decoders>
 
diff --git a/common/media/mfx_omxil_core.conf b/common/media/mfx_omxil_core.conf
index 64c9d833e..6cb44422f 100644
--- a/common/media/mfx_omxil_core.conf
+++ b/common/media/mfx_omxil_core.conf
@@ -4,3 +4,4 @@ OMX.Intel.hw_vd.h265 : libmfx_omx_components_hw.so
 OMX.Intel.hw_ve.h265 : libmfx_omx_components_hw.so
 OMX.Intel.hw_vd.vp8 : libmfx_omx_components_hw.so
 OMX.Intel.hw_vd.vp9 : libmfx_omx_components_hw.so
+OMX.Intel.hw_vd.mp2 : libmfx_omx_components_hw.so

From 3c2510204065fbc5f036a0dbb7fa3a1afb79f6e5 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Wed, 17 Oct 2018 15:26:05 +0530
Subject: [PATCH 345/427] [CELADON] Upgrading the kernel def_config to 4.14.76
 Tracked-On: None

Signed-off-by: Swaroop Balan <swaroop.balan@intel.com>
---
 kernel_config/kernel_64_defconfig | 362 ++++++++++++++----------------
 1 file changed, 168 insertions(+), 194 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index a59dab866..163f1d703 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -1,25 +1,23 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.14.67 Kernel Configuration
+# Linux/i386 4.14.76 Kernel Configuration
 #
-CONFIG_64BIT=y
-CONFIG_X86_64=y
+# CONFIG_64BIT is not set
+CONFIG_X86_32=y
 CONFIG_X86=y
 CONFIG_INSTRUCTION_DECODER=y
-CONFIG_OUTPUT_FORMAT="elf64-x86-64"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+CONFIG_OUTPUT_FORMAT="elf32-i386"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_MMU=y
-CONFIG_ARCH_MMAP_RND_BITS_MIN=28
-CONFIG_ARCH_MMAP_RND_BITS_MAX=32
+CONFIG_ARCH_MMAP_RND_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_BITS_MAX=16
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
-CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -33,14 +31,12 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-CONFIG_ZONE_DMA32=y
-CONFIG_AUDIT_ARCH=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_X86_64_SMP=y
+CONFIG_X86_32_SMP=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_PGTABLE_LEVELS=4
+CONFIG_PGTABLE_LEVELS=2
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
@@ -112,7 +108,6 @@ CONFIG_TICK_ONESHOT=y
 CONFIG_NO_HZ_COMMON=y
 # CONFIG_HZ_PERIODIC is not set
 CONFIG_NO_HZ_IDLE=y
-# CONFIG_NO_HZ_FULL is not set
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_ANDROID_AUTO_SUSPEND_BEHAVIOR is not set
@@ -121,7 +116,6 @@ CONFIG_HIGH_RES_TIMERS=y
 # CPU/Task time and stats accounting
 #
 CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
 # CONFIG_SCHED_WALT is not set
 CONFIG_BSD_PROCESS_ACCT=y
@@ -154,9 +148,7 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_PELT_UTIL_HALFLIFE_32=y
 # CONFIG_PELT_UTIL_HALFLIFE_16 is not set
 # CONFIG_PELT_UTIL_HALFLIFE_8 is not set
-CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
-CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_CGROUPS=y
 # CONFIG_MEMCG is not set
 # CONFIG_BLK_CGROUP is not set
@@ -210,7 +202,7 @@ CONFIG_SYSCTL_SYSCALL=y
 CONFIG_POSIX_TIMERS=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
+# CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set
 CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_PRINTK=y
 CONFIG_PRINTK_NMI=y
@@ -285,11 +277,11 @@ CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
+CONFIG_HAVE_RCU_TABLE_INVALIDATE=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
-CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_GCC_PLUGINS=y
@@ -303,32 +295,22 @@ CONFIG_THIN_ARCHIVES=y
 # CONFIG_LTO is not set
 CONFIG_LTO_NONE=y
 CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
-CONFIG_HAVE_CONTEXT_TRACKING=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y
-CONFIG_HAVE_ARCH_HUGE_VMAP=y
-CONFIG_HAVE_ARCH_SOFT_DIRTY=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_MODULES_USE_ELF_RELA=y
-CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
+CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_HAVE_EXIT_THREAD=y
-CONFIG_ARCH_MMAP_RND_BITS=28
-CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
-CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y
+CONFIG_ARCH_MMAP_RND_BITS=8
 CONFIG_HAVE_COPY_THREAD_TLS=y
-CONFIG_HAVE_STACK_VALIDATION=y
 # CONFIG_HAVE_ARCH_HASH is not set
 # CONFIG_ISA_BUS_API is not set
+CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_COMPAT_OLD_SIGACTION=y
+CONFIG_OLD_SIGACTION=y
 # CONFIG_CPU_NO_EFFICIENT_FFS is not set
-CONFIG_HAVE_ARCH_VMAP_STACK=y
-CONFIG_VMAP_STACK=y
+# CONFIG_HAVE_ARCH_VMAP_STACK is not set
 # CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set
 # CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
@@ -343,7 +325,7 @@ CONFIG_ARCH_HAS_REFCOUNT=y
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
@@ -365,6 +347,7 @@ CONFIG_MODULE_SIG_HASH="sha512"
 # CONFIG_MODULE_COMPRESS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
+CONFIG_LBDAF=y
 CONFIG_BLK_SCSI_REQUEST=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_BLK_DEV_BSGLIB is not set
@@ -398,7 +381,6 @@ CONFIG_MSDOS_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 # CONFIG_CMDLINE_PARTITION is not set
-CONFIG_BLOCK_COMPAT=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
 
@@ -434,56 +416,76 @@ CONFIG_ZONE_DMA=y
 CONFIG_SMP=y
 CONFIG_X86_FEATURE_NAMES=y
 CONFIG_X86_FAST_FEATURE_TESTS=y
-# CONFIG_X86_X2APIC is not set
 CONFIG_X86_MPPARSE=y
+# CONFIG_X86_BIGSMP is not set
 # CONFIG_GOLDFISH is not set
 CONFIG_RETPOLINE=y
 # CONFIG_INTEL_RDT is not set
 CONFIG_X86_EXTENDED_PLATFORM=y
-# CONFIG_X86_VSMP is not set
 # CONFIG_X86_GOLDFISH is not set
 # CONFIG_X86_INTEL_MID is not set
+# CONFIG_X86_INTEL_QUARK is not set
 CONFIG_X86_INTEL_LPSS=y
 # CONFIG_X86_AMD_PLATFORM_DEVICE is not set
 CONFIG_IOSF_MBI=y
 # CONFIG_IOSF_MBI_DEBUG is not set
-CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+# CONFIG_X86_RDC321X is not set
+# CONFIG_X86_32_NON_STANDARD is not set
+# CONFIG_X86_32_IRIS is not set
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_HYPERVISOR_GUEST=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_DEBUG is not set
 # CONFIG_PARAVIRT_SPINLOCKS is not set
-# CONFIG_ACRN is not set
-# CONFIG_XEN is not set
 CONFIG_KVM_GUEST=y
 # CONFIG_KVM_DEBUG_FS is not set
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_PARAVIRT_CLOCK=y
 CONFIG_NO_BOOTMEM=y
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+CONFIG_M686=y
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
 # CONFIG_MK8 is not set
-# CONFIG_MPSC is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MELAN is not set
+# CONFIG_MGEODEGX1 is not set
+# CONFIG_MGEODE_LX is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
 # CONFIG_MCORE2 is not set
 # CONFIG_MATOM is not set
-CONFIG_GENERIC_CPU=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_L1_CACHE_SHIFT=6
+# CONFIG_X86_GENERIC is not set
+CONFIG_X86_INTERNODE_CACHE_SHIFT=5
+CONFIG_X86_L1_CACHE_SHIFT=5
+# CONFIG_X86_PPRO_FENCE is not set
+CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_TSC=y
 CONFIG_X86_CMPXCHG64=y
 CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=64
+CONFIG_X86_MINIMUM_CPU_FAMILY=5
 CONFIG_X86_DEBUGCTLMSR=y
 CONFIG_PROCESSOR_SELECT=y
 CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_CYRIX_32=y
 CONFIG_CPU_SUP_AMD=y
 CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_TRANSMETA_32=y
+CONFIG_CPU_SUP_UMC_32=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_DMI=y
-# CONFIG_GART_IOMMU is not set
-# CONFIG_CALGARY_IOMMU is not set
-CONFIG_SWIOTLB=y
-CONFIG_IOMMU_HELPER=y
-# CONFIG_MAXSMP is not set
 CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
@@ -499,6 +501,7 @@ CONFIG_X86_MCE=y
 # CONFIG_X86_MCELOG_LEGACY is not set
 CONFIG_X86_MCE_INTEL=y
 CONFIG_X86_MCE_AMD=y
+# CONFIG_X86_ANCIENT_MCE is not set
 CONFIG_X86_MCE_THRESHOLD=y
 # CONFIG_X86_MCE_INJECT is not set
 CONFIG_X86_THERMAL_VECTOR=y
@@ -510,37 +513,41 @@ CONFIG_PERF_EVENTS_INTEL_UNCORE=y
 CONFIG_PERF_EVENTS_INTEL_RAPL=y
 CONFIG_PERF_EVENTS_INTEL_CSTATE=y
 # CONFIG_PERF_EVENTS_AMD_POWER is not set
+# CONFIG_X86_LEGACY_VM86 is not set
 # CONFIG_VM86 is not set
 CONFIG_X86_16BIT=y
-CONFIG_X86_ESPFIX64=y
-CONFIG_X86_VSYSCALL_EMULATION=y
+CONFIG_X86_ESPFIX32=y
+# CONFIG_TOSHIBA is not set
 CONFIG_I8K=m
+# CONFIG_X86_REBOOTFIXUPS is not set
 CONFIG_MICROCODE=y
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
 CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
-# CONFIG_X86_5LEVEL is not set
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_X86_DIRECT_GBPAGES=y
+# CONFIG_NOHIGHMEM is not set
+CONFIG_HIGHMEM4G=y
+# CONFIG_HIGHMEM64G is not set
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_3G_OPT is not set
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_2G_OPT is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_HIGHMEM=y
 CONFIG_ARCH_HAS_MEM_ENCRYPT=y
-# CONFIG_AMD_MEM_ENCRYPT is not set
-# CONFIG_NUMA is not set
+CONFIG_NEED_NODE_MEMMAP_SIZE=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_PROC_KCORE_TEXT=y
-CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_ILLEGAL_POINTER_VALUE=0
 CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_FLATMEM_MANUAL is not set
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM=y
 CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
-CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_SPARSEMEM_STATIC=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
 CONFIG_HAVE_GENERIC_GUP=y
@@ -548,21 +555,18 @@ CONFIG_ARCH_DISCARD_MEMBLOCK=y
 # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
 # CONFIG_MEMORY_HOTPLUG is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
-CONFIG_PHYS_ADDR_T_64BIT=y
+# CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-# CONFIG_MEMORY_FAILURE is not set
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
-CONFIG_ARCH_WANTS_THP_SWAP=y
+# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_CLEANCACHE=y
 CONFIG_FRONTSWAP=y
 # CONFIG_CMA is not set
@@ -574,14 +578,12 @@ CONFIG_FRONTSWAP=y
 CONFIG_GENERIC_EARLY_IOREMAP=y
 CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
-CONFIG_ARCH_HAS_ZONE_DEVICE=y
 CONFIG_FRAME_VECTOR=y
-CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
-CONFIG_ARCH_HAS_PKEYS=y
 # CONFIG_PERCPU_STATS is not set
-# CONFIG_X86_PMEM_LEGACY is not set
+# CONFIG_HIGHPTE is not set
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_RESERVE_LOW=64
+# CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
 # CONFIG_MTRR_SANITIZER is not set
 CONFIG_X86_PAT=y
@@ -589,11 +591,8 @@ CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
 # CONFIG_X86_SMAP is not set
 # CONFIG_X86_INTEL_UMIP is not set
-# CONFIG_X86_INTEL_MPX is not set
-CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
-CONFIG_EFI_MIXED=y
 CONFIG_SECCOMP=y
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_250 is not set
@@ -602,27 +601,18 @@ CONFIG_HZ_1000=y
 CONFIG_HZ=1000
 CONFIG_SCHED_HRTICK=y
 # CONFIG_KEXEC is not set
-# CONFIG_KEXEC_FILE is not set
 # CONFIG_CRASH_DUMP is not set
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_RELOCATABLE=y
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_X86_NEED_RELOCS=y
 CONFIG_PHYSICAL_ALIGN=0x200000
-CONFIG_RANDOMIZE_MEMORY=y
-CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0x0
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 # CONFIG_COMPAT_VDSO is not set
-# CONFIG_LEGACY_VSYSCALL_NATIVE is not set
-CONFIG_LEGACY_VSYSCALL_EMULATE=y
-# CONFIG_LEGACY_VSYSCALL_NONE is not set
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_MODIFY_LDT_SYSCALL=y
-CONFIG_HAVE_LIVEPATCH=y
-# CONFIG_LIVEPATCH is not set
-CONFIG_ARCH_HAS_ADD_PAGES=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
 #
@@ -666,7 +656,6 @@ CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_CPU_FREQ_PSS=y
 CONFIG_ACPI_PROCESSOR_CSTATE=y
 CONFIG_ACPI_PROCESSOR_IDLE=y
-CONFIG_ACPI_CPPC_LIB=y
 CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_PROCESSOR_AGGREGATOR=y
@@ -684,7 +673,6 @@ CONFIG_ACPI_HED=m
 # CONFIG_ACPI_CUSTOM_METHOD is not set
 # CONFIG_ACPI_BGRT is not set
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
-# CONFIG_ACPI_NFIT is not set
 CONFIG_HAVE_ACPI_APEI=y
 CONFIG_HAVE_ACPI_APEI_NMI=y
 CONFIG_ACPI_APEI=y
@@ -698,6 +686,7 @@ CONFIG_CRC_PMIC_OPREGION=y
 CONFIG_BXT_WC_PMIC_OPREGION=y
 # CONFIG_ACPI_CONFIGFS is not set
 # CONFIG_SFI is not set
+# CONFIG_APM is not set
 
 #
 # CPU Frequency scaling
@@ -728,10 +717,19 @@ CONFIG_X86_INTEL_PSTATE=y
 CONFIG_X86_PCC_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ_CPB=y
+# CONFIG_X86_POWERNOW_K6 is not set
+# CONFIG_X86_POWERNOW_K7 is not set
 CONFIG_X86_POWERNOW_K8=m
 CONFIG_X86_AMD_FREQ_SENSITIVITY=m
+# CONFIG_X86_GX_SUSPMOD is not set
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
+# CONFIG_X86_SPEEDSTEP_ICH is not set
+# CONFIG_X86_SPEEDSTEP_SMI is not set
 CONFIG_X86_P4_CLOCKMOD=m
+# CONFIG_X86_CPUFREQ_NFORCE2 is not set
+# CONFIG_X86_LONGRUN is not set
+# CONFIG_X86_LONGHAUL is not set
+# CONFIG_X86_E_POWERSAVER is not set
 
 #
 # shared options
@@ -751,6 +749,11 @@ CONFIG_INTEL_IDLE=y
 # Bus options (PCI etc.)
 #
 CONFIG_PCI=y
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+# CONFIG_PCI_GODIRECT is not set
+CONFIG_PCI_GOANY=y
+CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_DOMAINS=y
@@ -769,7 +772,6 @@ CONFIG_PCIEASPM_DEFAULT=y
 CONFIG_PCIE_PME=y
 # CONFIG_PCIE_DPC is not set
 # CONFIG_PCIE_PTM is not set
-CONFIG_PCI_BUS_ADDR_T_64BIT=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 # CONFIG_PCI_DEBUG is not set
@@ -781,8 +783,9 @@ CONFIG_PCI_LOCKLESS_CONFIG=y
 # CONFIG_PCI_PRI is not set
 # CONFIG_PCI_PASID is not set
 CONFIG_PCI_LABEL=y
-# CONFIG_PCI_HYPERV is not set
 CONFIG_HOTPLUG_PCI=y
+# CONFIG_HOTPLUG_PCI_COMPAQ is not set
+# CONFIG_HOTPLUG_PCI_IBM is not set
 CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
@@ -796,7 +799,6 @@ CONFIG_HOTPLUG_PCI_SHPC=m
 #
 # PCI host controller drivers
 #
-# CONFIG_VMD is not set
 
 #
 # PCI Endpoint
@@ -809,6 +811,12 @@ CONFIG_HOTPLUG_PCI_SHPC=m
 # CONFIG_PCI_SW_SWITCHTEC is not set
 # CONFIG_ISA_BUS is not set
 CONFIG_ISA_DMA_API=y
+# CONFIG_ISA is not set
+# CONFIG_SCx200 is not set
+# CONFIG_OLPC is not set
+# CONFIG_ALIX is not set
+# CONFIG_NET5501 is not set
+# CONFIG_GEOS is not set
 CONFIG_AMD_NB=y
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m
@@ -834,22 +842,16 @@ CONFIG_PCCARD_NONSTATIC=y
 # Executable file formats / Emulations
 #
 CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=y
 CONFIG_ELFCORE=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
-# CONFIG_HAVE_AOUT is not set
+CONFIG_HAVE_AOUT=y
+# CONFIG_BINFMT_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
 CONFIG_COREDUMP=y
-CONFIG_IA32_EMULATION=y
-# CONFIG_IA32_AOUT is not set
-CONFIG_X86_X32=y
 CONFIG_COMPAT_32=y
-CONFIG_COMPAT=y
-CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
-CONFIG_X86_DEV_DMA_OPS=y
+CONFIG_HAVE_ATOMIC_IOMAP=y
 CONFIG_NET=y
-CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
 
@@ -1273,7 +1275,6 @@ CONFIG_XPS=y
 # CONFIG_CGROUP_NET_CLASSID is not set
 CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
-# CONFIG_BPF_JIT is not set
 CONFIG_NET_FLOW_LIMIT=y
 
 #
@@ -1312,7 +1313,6 @@ CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_3WIRE=y
 CONFIG_BT_HCIUART_INTEL=y
 CONFIG_BT_HCIUART_QCA=y
 # CONFIG_BT_HCIUART_AG6XX is not set
@@ -1385,7 +1385,6 @@ CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
 # CONFIG_NET_DEVLINK is not set
 CONFIG_MAY_USE_DEVLINK=y
-CONFIG_HAVE_EBPF_JIT=y
 
 #
 # Device Drivers
@@ -1513,6 +1512,7 @@ CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_DOCG4 is not set
 # CONFIG_MTD_NAND_CAFE is not set
+# CONFIG_MTD_NAND_CS553X is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
 CONFIG_MTD_ONENAND=m
@@ -1580,6 +1580,7 @@ CONFIG_PARIDE_PD=m
 #
 # CONFIG_PARIDE_ATEN is not set
 # CONFIG_PARIDE_BPCK is not set
+# CONFIG_PARIDE_BPCK6 is not set
 # CONFIG_PARIDE_COMM is not set
 # CONFIG_PARIDE_DSTR is not set
 # CONFIG_PARIDE_FIT2 is not set
@@ -1601,7 +1602,6 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_DRBD is not set
 # CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_SKD is not set
 # CONFIG_BLK_DEV_SX8 is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
@@ -1643,6 +1643,7 @@ CONFIG_HMC6352=m
 # CONFIG_DS1682 is not set
 # CONFIG_TI_DAC7512 is not set
 CONFIG_VMWARE_BALLOON=m
+# CONFIG_PCH_PHUB is not set
 CONFIG_USB_SWITCH_FSA9480=m
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 # CONFIG_SRAM is not set
@@ -1686,17 +1687,14 @@ CONFIG_VMWARE_VMCI=m
 #
 # Intel MIC Bus Driver
 #
-# CONFIG_INTEL_MIC_BUS is not set
 
 #
 # SCIF Bus Driver
 #
-# CONFIG_SCIF_BUS is not set
 
 #
 # VOP Bus Driver
 #
-# CONFIG_VOP_BUS is not set
 
 #
 # Intel MIC Host Driver
@@ -1717,7 +1715,6 @@ CONFIG_VMWARE_VMCI=m
 #
 # VOP Driver
 #
-# CONFIG_GENWQE is not set
 CONFIG_ECHO=m
 # CONFIG_CXL_BASE is not set
 # CONFIG_CXL_AFU_DRIVER_OPS is not set
@@ -1760,8 +1757,13 @@ CONFIG_IDE_PROC_FS=y
 # CONFIG_BLK_DEV_ATIIXP is not set
 # CONFIG_BLK_DEV_CMD64X is not set
 # CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_CS5535 is not set
+# CONFIG_BLK_DEV_CS5536 is not set
 # CONFIG_BLK_DEV_HPT366 is not set
 # CONFIG_BLK_DEV_JMICRON is not set
+# CONFIG_BLK_DEV_SC1200 is not set
 # CONFIG_BLK_DEV_PIIX is not set
 # CONFIG_BLK_DEV_IT8172 is not set
 # CONFIG_BLK_DEV_IT8213 is not set
@@ -1867,6 +1869,7 @@ CONFIG_HYPERV_STORAGE=y
 # CONFIG_QEDI is not set
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_AM53C974 is not set
+# CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_WD719X is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_PMCRAID is not set
@@ -1875,6 +1878,7 @@ CONFIG_SCSI_VIRTIO=y
 CONFIG_SCSI_LOWLEVEL_PCMCIA=y
 CONFIG_PCMCIA_AHA152X=m
 CONFIG_PCMCIA_FDOMAIN=m
+# CONFIG_PCMCIA_NINJA_SCSI is not set
 CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_SYM53C500=m
 # CONFIG_SCSI_DH is not set
@@ -1930,6 +1934,10 @@ CONFIG_PATA_AMD=y
 CONFIG_PATA_ATIIXP=y
 # CONFIG_PATA_ATP867X is not set
 # CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CS5535 is not set
+# CONFIG_PATA_CS5536 is not set
 # CONFIG_PATA_CYPRESS is not set
 # CONFIG_PATA_EFAR is not set
 # CONFIG_PATA_HPT366 is not set
@@ -1949,6 +1957,7 @@ CONFIG_PATA_IT8213=y
 # CONFIG_PATA_PDC_OLD is not set
 # CONFIG_PATA_RADISYS is not set
 # CONFIG_PATA_RDC is not set
+# CONFIG_PATA_SC1200 is not set
 CONFIG_PATA_SCH=y
 # CONFIG_PATA_SERVERWORKS is not set
 # CONFIG_PATA_SIL680 is not set
@@ -2004,6 +2013,7 @@ CONFIG_DM_VERITY_FEC=y
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
 # CONFIG_DM_INTEGRITY is not set
+# CONFIG_DM_VERITY_AVB is not set
 # CONFIG_DM_ANDROID_VERITY is not set
 # CONFIG_DM_ANDROID_VERITY_AT_MOST_ONCE_DEFAULT_ENABLED is not set
 # CONFIG_TARGET_CORE is not set
@@ -2090,7 +2100,6 @@ CONFIG_PCMCIA_NMCLAN=m
 # CONFIG_AMD_XGBE is not set
 # CONFIG_AMD_XGBE_HAVE_ECC is not set
 CONFIG_NET_VENDOR_AQUANTIA=y
-# CONFIG_AQTION is not set
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ATL2=m
@@ -2120,12 +2129,6 @@ CONFIG_BNXT_FLOWER_OFFLOAD=y
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_BNA=m
 CONFIG_NET_VENDOR_CAVIUM=y
-CONFIG_THUNDER_NIC_PF=m
-# CONFIG_THUNDER_NIC_VF is not set
-CONFIG_THUNDER_NIC_BGX=m
-CONFIG_THUNDER_NIC_RGX=m
-CONFIG_LIQUIDIO=m
-# CONFIG_LIQUIDIO_VF is not set
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
@@ -2175,12 +2178,10 @@ CONFIG_E1000E=m
 CONFIG_E1000E_HWTS=y
 CONFIG_IGB=m
 CONFIG_IGB_HWMON=y
-CONFIG_IGB_DCA=y
 CONFIG_IGBVF=m
 CONFIG_IXGB=m
 CONFIG_IXGBE=m
 CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBE_DCA=y
 CONFIG_IXGBEVF=m
 CONFIG_I40E=m
 CONFIG_I40EVF=m
@@ -2189,6 +2190,7 @@ CONFIG_NET_VENDOR_I825XX=y
 CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_MVMDIO=m
+# CONFIG_MVNETA_BM is not set
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
 # CONFIG_SKGE_GENESIS is not set
@@ -2221,7 +2223,6 @@ CONFIG_ENC28J60=m
 CONFIG_ENCX24J600=m
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
 CONFIG_FEALNX=m
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
@@ -2235,6 +2236,7 @@ CONFIG_NE2K_PCI=m
 CONFIG_NET_VENDOR_NVIDIA=y
 CONFIG_FORCEDETH=m
 CONFIG_NET_VENDOR_OKI=y
+# CONFIG_PCH_GBE is not set
 CONFIG_ETHOC=m
 CONFIG_NET_PACKET_ENGINE=y
 CONFIG_HAMACHI=m
@@ -2319,11 +2321,8 @@ CONFIG_MDIO_BCM_UNIMAC=m
 CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-CONFIG_MDIO_CAVIUM=m
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
-CONFIG_MDIO_OCTEON=m
-CONFIG_MDIO_THUNDER=m
 CONFIG_PHYLIB=m
 CONFIG_SWPHY=y
 # CONFIG_LED_TRIGGER_PHY is not set
@@ -2922,6 +2921,7 @@ CONFIG_INPUT_GP2A=m
 # CONFIG_INPUT_GPIO_BEEPER is not set
 CONFIG_INPUT_GPIO_TILT_POLLED=m
 # CONFIG_INPUT_GPIO_DECODER is not set
+# CONFIG_INPUT_WISTRON_BTNS is not set
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYCHORD=y
@@ -3050,9 +3050,11 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
+# CONFIG_SERIAL_TIMBERDALE is not set
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
 # CONFIG_SERIAL_IFX6X60 is not set
+# CONFIG_SERIAL_PCH_UART is not set
 # CONFIG_SERIAL_XILINX_PS_UART is not set
 # CONFIG_SERIAL_ARC is not set
 # CONFIG_SERIAL_RP2 is not set
@@ -3070,11 +3072,13 @@ CONFIG_HW_RANDOM=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_GEODE=m
 CONFIG_HW_RANDOM_VIA=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_NVRAM=m
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
+# CONFIG_SONYPI is not set
 
 #
 # PCMCIA character devices
@@ -3085,6 +3089,8 @@ CONFIG_NVRAM=m
 # CONFIG_SCR24X is not set
 # CONFIG_IPWIRELESS is not set
 # CONFIG_MWAVE is not set
+# CONFIG_PC8736x_GPIO is not set
+# CONFIG_NSC_GPIO is not set
 CONFIG_RAW_DRIVER=m
 CONFIG_MAX_RAW_DEVS=4096
 CONFIG_HPET=y
@@ -3098,6 +3104,7 @@ CONFIG_RPMB=y
 # CONFIG_RPMB_INTF_DEV is not set
 # CONFIG_RPMB_SIM is not set
 # CONFIG_VIRTIO_RPMB is not set
+# CONFIG_RPMB_MUX is not set
 
 #
 # I2C support
@@ -3166,10 +3173,12 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=y
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
 CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
+# CONFIG_I2C_EG20T is not set
 CONFIG_I2C_EMEV2=m
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_PCA_PLATFORM=m
+# CONFIG_I2C_PXA is not set
 # CONFIG_I2C_PXA_PCI is not set
 # CONFIG_I2C_RK3X is not set
 CONFIG_I2C_SIMTEC=m
@@ -3188,8 +3197,8 @@ CONFIG_I2C_TINY_USB=m
 #
 # Other I2C/SMBus bus drivers
 #
-# CONFIG_I2C_MLXCPLD is not set
 CONFIG_I2C_CROS_EC_TUNNEL=m
+# CONFIG_SCx200_ACB is not set
 # CONFIG_I2C_STUB is not set
 CONFIG_I2C_SLAVE=y
 # CONFIG_I2C_SLAVE_EEPROM is not set
@@ -3220,6 +3229,7 @@ CONFIG_SPI_PXA2XX=m
 CONFIG_SPI_PXA2XX_PCI=m
 # CONFIG_SPI_ROCKCHIP is not set
 # CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_TOPCLIFF_PCH is not set
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
 # CONFIG_SPI_ZYNQMP_GQSPI is not set
@@ -3256,6 +3266,7 @@ CONFIG_PTP_1588_CLOCK=m
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
+# CONFIG_PTP_1588_CLOCK_PCH is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PINCTRL=y
 
@@ -3342,6 +3353,7 @@ CONFIG_GPIO_UCB1400=m
 #
 CONFIG_GPIO_AMD8111=m
 CONFIG_GPIO_ML_IOH=m
+# CONFIG_GPIO_PCH is not set
 # CONFIG_GPIO_PCI_IDIO_16 is not set
 CONFIG_GPIO_RDC321X=m
 # CONFIG_GPIO_SODAVILLE is not set
@@ -3582,11 +3594,6 @@ CONFIG_INTEL_PCH_THERMAL=m
 #
 # Trusty
 #
-CONFIG_TRUSTY=y
-CONFIG_TRUSTY_LOG=y
-CONFIG_TRUSTY_VIRTIO=y
-CONFIG_TRUSTY_VIRTIO_IPC=y
-CONFIG_TRUSTY_BACKUP_TIMER=y
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -3629,6 +3636,8 @@ CONFIG_ITCO_WDT=y
 # CONFIG_PC87413_WDT is not set
 # CONFIG_NV_TCO is not set
 # CONFIG_60XX_WDT is not set
+# CONFIG_SBC8360_WDT is not set
+# CONFIG_SBC7240_WDT is not set
 # CONFIG_CPU5_WDT is not set
 # CONFIG_SMSC_SCH311X_WDT is not set
 # CONFIG_SMSC37B787_WDT is not set
@@ -3693,6 +3702,7 @@ CONFIG_BCMA_DRIVER_GPIO=y
 # Multifunction device drivers
 #
 CONFIG_MFD_CORE=y
+# CONFIG_MFD_CS5535 is not set
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_AS3711 is not set
 # CONFIG_MFD_AS3722 is not set
@@ -3789,6 +3799,7 @@ CONFIG_MFD_TPS65218=m
 # CONFIG_TWL6040_CORE is not set
 # CONFIG_MFD_WL1273_CORE is not set
 CONFIG_MFD_LM3533=m
+# CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TMIO is not set
 CONFIG_MFD_VX855=m
@@ -4090,10 +4101,8 @@ CONFIG_VIDEO_MEYE=m
 # CONFIG_VIDEO_TW68 is not set
 # CONFIG_VIDEO_TW686X is not set
 # CONFIG_VIDEO_ZORAN is not set
-# CONFIG_VIDEO_INTEL_IPU is not set
 # CONFIG_VIDEO_INTEL_IPU_FW_LIB is not set
 # CONFIG_VIDEO_INTEL_UOS is not set
-# CONFIG_VIDEO_INTEL_IPU_ACRN is not set
 
 #
 # Media capture/analog TV support
@@ -4603,10 +4612,16 @@ CONFIG_DVB_HELENE=m
 # Graphics support
 #
 CONFIG_AGP=y
+# CONFIG_AGP_ALI is not set
+# CONFIG_AGP_ATI is not set
+# CONFIG_AGP_AMD is not set
 # CONFIG_AGP_AMD64 is not set
 CONFIG_AGP_INTEL=y
+# CONFIG_AGP_NVIDIA is not set
 # CONFIG_AGP_SIS is not set
+# CONFIG_AGP_SWORKS is not set
 # CONFIG_AGP_VIA is not set
+# CONFIG_AGP_EFFICEON is not set
 CONFIG_INTEL_GTT=y
 CONFIG_VGA_ARB=y
 CONFIG_VGA_ARB_MAX_GPUS=16
@@ -4650,7 +4665,6 @@ CONFIG_DRM_I915=y
 CONFIG_DRM_I915_CAPTURE_ERROR=y
 CONFIG_DRM_I915_COMPRESS_ERROR=y
 CONFIG_DRM_I915_USERPTR=y
-# CONFIG_DRM_I915_GVT is not set
 # CONFIG_DRM_I915_LOAD_ASYNC_SUPPORT is not set
 
 #
@@ -4767,6 +4781,7 @@ CONFIG_FB_RIVA=m
 # CONFIG_FB_RIVA_DEBUG is not set
 CONFIG_FB_RIVA_BACKLIGHT=y
 # CONFIG_FB_I740 is not set
+# CONFIG_FB_I810 is not set
 # CONFIG_FB_LE80578 is not set
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
@@ -4802,6 +4817,7 @@ CONFIG_FB_TRIDENT=m
 # CONFIG_FB_ARK is not set
 # CONFIG_FB_PM3 is not set
 # CONFIG_FB_CARMINE is not set
+# CONFIG_FB_GEODE is not set
 # CONFIG_FB_SMSCUFX is not set
 CONFIG_FB_UDL=m
 # CONFIG_FB_IBM_GXT4500 is not set
@@ -4942,6 +4958,8 @@ CONFIG_SND_OXYGEN=m
 CONFIG_SND_CS4281=m
 CONFIG_SND_CS46XX=m
 CONFIG_SND_CS46XX_NEW_DSP=y
+# CONFIG_SND_CS5530 is not set
+# CONFIG_SND_CS5535AUDIO is not set
 CONFIG_SND_CTXFI=m
 CONFIG_SND_DARLA20=m
 CONFIG_SND_GINA20=m
@@ -4985,6 +5003,7 @@ CONFIG_SND_RIPTIDE=m
 CONFIG_SND_RME32=m
 CONFIG_SND_RME96=m
 CONFIG_SND_RME9652=m
+# CONFIG_SND_SIS7019 is not set
 CONFIG_SND_SONICVIBES=m
 CONFIG_SND_TRIDENT=m
 CONFIG_SND_VIA82XX=m
@@ -5375,12 +5394,6 @@ CONFIG_USB_HIDDEV=y
 # I2C HID support
 #
 CONFIG_I2C_HID=m
-
-#
-# Intel ISH HID support
-#
-# CONFIG_INTEL_ISH_HID is not set
-# CONFIG_INTEL_ISH_UART_INTERFACE is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
@@ -5612,6 +5625,7 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 #
 # USB Peripheral Controller
 #
+# CONFIG_USB_FUSB300 is not set
 # CONFIG_USB_FOTG210_UDC is not set
 # CONFIG_USB_GR_UDC is not set
 # CONFIG_USB_R8A66597 is not set
@@ -5688,10 +5702,10 @@ CONFIG_TYPEC=y
 CONFIG_TYPEC_WCOVE=y
 CONFIG_TYPEC_UCSI=y
 # CONFIG_UCSI_ACPI is not set
+CONFIG_USB_ROLES_INTEL_XHCI=y
 # CONFIG_USB_LED_TRIG is not set
 # CONFIG_USB_ULPI_BUS is not set
 CONFIG_USB_ROLE_SWITCH=y
-CONFIG_USB_ROLES_INTEL_XHCI=y
 # CONFIG_UWB is not set
 CONFIG_MMC=y
 CONFIG_PWRSEQ_EMMC=y
@@ -5784,6 +5798,7 @@ CONFIG_LEDS_GPIO=m
 # CONFIG_LEDS_TCA6507 is not set
 # CONFIG_LEDS_TLC591XX is not set
 # CONFIG_LEDS_LM355x is not set
+# CONFIG_LEDS_OT200 is not set
 # CONFIG_LEDS_MENF21BMC is not set
 # CONFIG_LEDS_IS31FL319X is not set
 # CONFIG_LEDS_IS31FL32XX is not set
@@ -5793,7 +5808,6 @@ CONFIG_LEDS_GPIO=m
 #
 # CONFIG_LEDS_BLINKM is not set
 # CONFIG_LEDS_SYSCON is not set
-# CONFIG_LEDS_MLXCPLD is not set
 # CONFIG_LEDS_USER is not set
 # CONFIG_LEDS_NIC78BX is not set
 
@@ -5956,7 +5970,7 @@ CONFIG_DMA_OF=y
 # CONFIG_ALTERA_MSGDMA is not set
 # CONFIG_FSL_EDMA is not set
 # CONFIG_INTEL_IDMA64 is not set
-CONFIG_INTEL_IOATDMA=m
+# CONFIG_PCH_DMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_HIDMA is not set
 CONFIG_DW_DMAC_CORE=y
@@ -5968,7 +5982,6 @@ CONFIG_DW_DMAC_PCI=y
 #
 # CONFIG_ASYNC_TX_DMA is not set
 # CONFIG_DMATEST is not set
-CONFIG_DMA_ENGINE_RAID=y
 
 #
 # DMABUF options
@@ -5982,7 +5995,6 @@ CONFIG_SW_SYNC=y
 CONFIG_HYPER_DMABUF=y
 CONFIG_HYPER_DMABUF_SYSFS=y
 # CONFIG_HYPER_DMABUF_EVENT_GEN is not set
-CONFIG_DCA=m
 # CONFIG_AUXDISPLAY is not set
 CONFIG_PANEL=m
 CONFIG_PANEL_PARPORT=0
@@ -6018,7 +6030,7 @@ CONFIG_VIRTIO_MMIO=m
 # Microsoft Hyper-V guest support
 #
 CONFIG_HYPERV=y
-CONFIG_HYPERV_TSCPAGE=y
+# CONFIG_HYPERV_TSCPAGE is not set
 CONFIG_HYPERV_UTILS=m
 CONFIG_HYPERV_BALLOON=m
 CONFIG_STAGING=y
@@ -6162,8 +6174,6 @@ CONFIG_ION=y
 # CONFIG_LNET is not set
 # CONFIG_DGNC is not set
 # CONFIG_GS_FPGABOOT is not set
-# CONFIG_CRYPTO_SKEIN is not set
-# CONFIG_UNISYSSPAR is not set
 # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 # CONFIG_FB_TFT is not set
 # CONFIG_WILC1000_SDIO is not set
@@ -6192,6 +6202,7 @@ CONFIG_DELL_RBTN=m
 CONFIG_FUJITSU_LAPTOP=m
 CONFIG_FUJITSU_TABLET=m
 CONFIG_AMILO_RFKILL=m
+# CONFIG_TC1100_WMI is not set
 CONFIG_HP_ACCEL=m
 CONFIG_HP_WIRELESS=m
 CONFIG_HP_WMI=m
@@ -6246,10 +6257,7 @@ CONFIG_INTEL_PMC_IPC=y
 CONFIG_SURFACE_PRO3_BUTTON=m
 # CONFIG_SURFACE_3_BUTTON is not set
 CONFIG_INTEL_PUNIT_IPC=y
-CONFIG_INTEL_TELEMETRY=y
-# CONFIG_MLX_PLATFORM is not set
 # CONFIG_MLX_CPLD_PLATFORM is not set
-# CONFIG_INTEL_TURBO_MAX_3 is not set
 # CONFIG_SILEAD_DMI is not set
 # CONFIG_INTEL_PSTORE_PRAM is not set
 CONFIG_PMC_ATOM=y
@@ -6285,6 +6293,7 @@ CONFIG_COMMON_CLK=y
 #
 # Clock Source drivers
 #
+CONFIG_CLKSRC_I8253=y
 CONFIG_CLKEVT_I8253=y
 CONFIG_I8253_LOCK=y
 CONFIG_CLKBLD_I8253=y
@@ -6303,9 +6312,7 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # Generic IOMMU Pagetable Support
 #
-# CONFIG_AMD_IOMMU is not set
 # CONFIG_INTEL_IOMMU is not set
-# CONFIG_IRQ_REMAP is not set
 
 #
 # Remoteproc drivers
@@ -6787,7 +6794,6 @@ CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 # CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
-# CONFIG_LIBNVDIMM is not set
 CONFIG_DAX=y
 CONFIG_NVMEM=y
 # CONFIG_STM is not set
@@ -6827,7 +6833,8 @@ CONFIG_EFI_VARS_PSTORE=m
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_RUNTIME_WRAPPERS=y
 CONFIG_EFI_BOOTLOADER_CONTROL=y
-# CONFIG_EFI_CAPSULE_LOADER is not set
+CONFIG_EFI_CAPSULE_LOADER=y
+CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH=y
 # CONFIG_EFI_TEST is not set
 CONFIG_APPLE_PROPERTIES=y
 # CONFIG_RESET_ATTACK_MITIGATION is not set
@@ -6907,7 +6914,6 @@ CONFIG_QUOTA_TREE=y
 # CONFIG_QFMT_V1 is not set
 CONFIG_QFMT_V2=y
 CONFIG_QUOTACTL=y
-CONFIG_QUOTACTL_COMPAT=y
 # CONFIG_AUTOFS4_FS is not set
 CONFIG_FUSE_FS=y
 # CONFIG_CUSE is not set
@@ -7112,7 +7118,7 @@ CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-CONFIG_STACK_VALIDATION=y
+CONFIG_FRAME_POINTER=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
@@ -7140,12 +7146,9 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_VIRTUAL is not set
 # CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
-CONFIG_HAVE_ARCH_KASAN=y
-# CONFIG_KASAN is not set
-CONFIG_ARCH_HAS_KCOV=y
-# CONFIG_KCOV is not set
 # CONFIG_DEBUG_SHIRQ is not set
 
 #
@@ -7154,7 +7157,6 @@ CONFIG_ARCH_HAS_KCOV=y
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_SOFTLOCKUP_DETECTOR=y
 CONFIG_HARDLOCKUP_DETECTOR_PERF=y
-CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
 CONFIG_HARDLOCKUP_DETECTOR=y
 # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
@@ -7232,7 +7234,6 @@ CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
 CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_PREEMPT_TRACER is not set
@@ -7327,15 +7328,13 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DEBUG_NMI_SELFTEST is not set
 CONFIG_X86_DEBUG_FPU=y
 # CONFIG_PUNIT_ATOM_DEBUG is not set
-CONFIG_UNWINDER_ORC=y
-# CONFIG_UNWINDER_FRAME_POINTER is not set
+CONFIG_UNWINDER_FRAME_POINTER=y
 # CONFIG_UNWINDER_GUESS is not set
 
 #
 # Security options
 #
 CONFIG_KEYS=y
-CONFIG_KEYS_COMPAT=y
 # CONFIG_PERSISTENT_KEYRINGS is not set
 # CONFIG_BIG_KEYS is not set
 # CONFIG_ENCRYPTED_KEYS is not set
@@ -7346,7 +7345,6 @@ CONFIG_SECURITY=y
 CONFIG_SECURITY_WRITABLE_HOOKS=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
-CONFIG_PAGE_TABLE_ISOLATION=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
 CONFIG_SECURITY_PATH=y
 CONFIG_LSM_MMAP_MIN_ADDR=65536
@@ -7413,9 +7411,7 @@ CONFIG_CRYPTO_CRYPTD=y
 # CONFIG_CRYPTO_MCRYPTD is not set
 CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ABLK_HELPER=y
 CONFIG_CRYPTO_SIMD=y
-CONFIG_CRYPTO_GLUE_HELPER_X86=y
 
 #
 # Authenticated Encryption with Associated Data
@@ -7456,7 +7452,6 @@ CONFIG_CRYPTO_CRC32=y
 # CONFIG_CRYPTO_CRCT10DIF is not set
 CONFIG_CRYPTO_GHASH=m
 # CONFIG_CRYPTO_POLY1305 is not set
-# CONFIG_CRYPTO_POLY1305_X86_64 is not set
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=y
@@ -7465,59 +7460,40 @@ CONFIG_CRYPTO_MICHAEL_MIC=y
 # CONFIG_CRYPTO_RMD256 is not set
 # CONFIG_CRYPTO_RMD320 is not set
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA1_SSSE3=y
-CONFIG_CRYPTO_SHA256_SSSE3=y
-CONFIG_CRYPTO_SHA512_SSSE3=y
-# CONFIG_CRYPTO_SHA1_MB is not set
-# CONFIG_CRYPTO_SHA256_MB is not set
-# CONFIG_CRYPTO_SHA512_MB is not set
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SHA3 is not set
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
-# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
 
 #
 # Ciphers
 #
 CONFIG_CRYPTO_AES=y
 # CONFIG_CRYPTO_AES_TI is not set
-CONFIG_CRYPTO_AES_X86_64=y
+CONFIG_CRYPTO_AES_586=y
 CONFIG_CRYPTO_AES_NI_INTEL=y
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=y
 CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=y
-CONFIG_CRYPTO_BLOWFISH_X86_64=y
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
 CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAMELLIA_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
 CONFIG_CRYPTO_CAST_COMMON=m
 CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST5_AVX_X86_64=m
 CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_CAST6_AVX_X86_64=m
 CONFIG_CRYPTO_DES=y
-# CONFIG_CRYPTO_DES3_EDE_X86_64 is not set
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_KHAZAD=m
 # CONFIG_CRYPTO_SALSA20 is not set
 # CONFIG_CRYPTO_CHACHA20 is not set
-# CONFIG_CRYPTO_CHACHA20_X86_64 is not set
 # CONFIG_CRYPTO_SEED is not set
 CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
+# CONFIG_CRYPTO_SERPENT_SSE2_586 is not set
 # CONFIG_CRYPTO_SPECK is not set
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=y
 CONFIG_CRYPTO_TWOFISH_COMMON=y
-CONFIG_CRYPTO_TWOFISH_X86_64=y
-CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=y
-CONFIG_CRYPTO_TWOFISH_AVX_X86_64=y
+# CONFIG_CRYPTO_TWOFISH_586 is not set
 
 #
 # Compression
@@ -7579,7 +7555,6 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_IO=y
-CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
@@ -7596,6 +7571,7 @@ CONFIG_CRC7=m
 CONFIG_LIBCRC32C=y
 CONFIG_CRC8=y
 CONFIG_XXHASH=m
+CONFIG_AUDIT_GENERIC=y
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
 # CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_ZLIB_INFLATE=y
@@ -7660,7 +7636,5 @@ CONFIG_FONT_AUTOSELECT=y
 # CONFIG_SG_SPLIT is not set
 CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_SG_CHAIN=y
-CONFIG_ARCH_HAS_PMEM_API=y
-CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
 CONFIG_SBITMAP=y
 # CONFIG_STRING_SELFTEST is not set

From b740f0c2c01cf3e60b854db77e720f19bceb9dff Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Fri, 19 Oct 2018 12:35:27 +0530
Subject: [PATCH 346/427] Revert "[CELADON] Upgrading the kernel def_config to
 4.14.76"

This reverts commit 3c2510204065fbc5f036a0dbb7fa3a1afb79f6e5.
---
 kernel_config/kernel_64_defconfig | 362 ++++++++++++++++--------------
 1 file changed, 194 insertions(+), 168 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 163f1d703..a59dab866 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -1,23 +1,25 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 4.14.76 Kernel Configuration
+# Linux/x86_64 4.14.67 Kernel Configuration
 #
-# CONFIG_64BIT is not set
-CONFIG_X86_32=y
+CONFIG_64BIT=y
+CONFIG_X86_64=y
 CONFIG_X86=y
 CONFIG_INSTRUCTION_DECODER=y
-CONFIG_OUTPUT_FORMAT="elf32-i386"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_MMU=y
-CONFIG_ARCH_MMAP_RND_BITS_MIN=8
-CONFIG_ARCH_MMAP_RND_BITS_MAX=16
+CONFIG_ARCH_MMAP_RND_BITS_MIN=28
+CONFIG_ARCH_MMAP_RND_BITS_MAX=32
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
+CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -31,12 +33,14 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+CONFIG_ZONE_DMA32=y
+CONFIG_AUDIT_ARCH=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_X86_32_SMP=y
+CONFIG_X86_64_SMP=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_PGTABLE_LEVELS=2
+CONFIG_PGTABLE_LEVELS=4
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
@@ -108,6 +112,7 @@ CONFIG_TICK_ONESHOT=y
 CONFIG_NO_HZ_COMMON=y
 # CONFIG_HZ_PERIODIC is not set
 CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ_FULL is not set
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_ANDROID_AUTO_SUSPEND_BEHAVIOR is not set
@@ -116,6 +121,7 @@ CONFIG_HIGH_RES_TIMERS=y
 # CPU/Task time and stats accounting
 #
 CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
 # CONFIG_SCHED_WALT is not set
 CONFIG_BSD_PROCESS_ACCT=y
@@ -148,7 +154,9 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_PELT_UTIL_HALFLIFE_32=y
 # CONFIG_PELT_UTIL_HALFLIFE_16 is not set
 # CONFIG_PELT_UTIL_HALFLIFE_8 is not set
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
+CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_CGROUPS=y
 # CONFIG_MEMCG is not set
 # CONFIG_BLK_CGROUP is not set
@@ -202,7 +210,7 @@ CONFIG_SYSCTL_SYSCALL=y
 CONFIG_POSIX_TIMERS=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
-# CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set
+CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
 CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_PRINTK=y
 CONFIG_PRINTK_NMI=y
@@ -277,11 +285,11 @@ CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
-CONFIG_HAVE_RCU_TABLE_INVALIDATE=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_GCC_PLUGINS=y
@@ -295,22 +303,32 @@ CONFIG_THIN_ARCHIVES=y
 # CONFIG_LTO is not set
 CONFIG_LTO_NONE=y
 CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_HAVE_EXIT_THREAD=y
-CONFIG_ARCH_MMAP_RND_BITS=8
+CONFIG_ARCH_MMAP_RND_BITS=28
+CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
+CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y
 CONFIG_HAVE_COPY_THREAD_TLS=y
+CONFIG_HAVE_STACK_VALIDATION=y
 # CONFIG_HAVE_ARCH_HASH is not set
 # CONFIG_ISA_BUS_API is not set
-CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_OLD_SIGACTION=y
+CONFIG_COMPAT_OLD_SIGACTION=y
 # CONFIG_CPU_NO_EFFICIENT_FFS is not set
-# CONFIG_HAVE_ARCH_VMAP_STACK is not set
+CONFIG_HAVE_ARCH_VMAP_STACK=y
+CONFIG_VMAP_STACK=y
 # CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set
 # CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
@@ -325,7 +343,7 @@ CONFIG_ARCH_HAS_REFCOUNT=y
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
@@ -347,7 +365,6 @@ CONFIG_MODULE_SIG_HASH="sha512"
 # CONFIG_MODULE_COMPRESS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
-CONFIG_LBDAF=y
 CONFIG_BLK_SCSI_REQUEST=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_BLK_DEV_BSGLIB is not set
@@ -381,6 +398,7 @@ CONFIG_MSDOS_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 # CONFIG_CMDLINE_PARTITION is not set
+CONFIG_BLOCK_COMPAT=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
 
@@ -416,76 +434,56 @@ CONFIG_ZONE_DMA=y
 CONFIG_SMP=y
 CONFIG_X86_FEATURE_NAMES=y
 CONFIG_X86_FAST_FEATURE_TESTS=y
+# CONFIG_X86_X2APIC is not set
 CONFIG_X86_MPPARSE=y
-# CONFIG_X86_BIGSMP is not set
 # CONFIG_GOLDFISH is not set
 CONFIG_RETPOLINE=y
 # CONFIG_INTEL_RDT is not set
 CONFIG_X86_EXTENDED_PLATFORM=y
+# CONFIG_X86_VSMP is not set
 # CONFIG_X86_GOLDFISH is not set
 # CONFIG_X86_INTEL_MID is not set
-# CONFIG_X86_INTEL_QUARK is not set
 CONFIG_X86_INTEL_LPSS=y
 # CONFIG_X86_AMD_PLATFORM_DEVICE is not set
 CONFIG_IOSF_MBI=y
 # CONFIG_IOSF_MBI_DEBUG is not set
-# CONFIG_X86_RDC321X is not set
-# CONFIG_X86_32_NON_STANDARD is not set
-# CONFIG_X86_32_IRIS is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_HYPERVISOR_GUEST=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_DEBUG is not set
 # CONFIG_PARAVIRT_SPINLOCKS is not set
+# CONFIG_ACRN is not set
+# CONFIG_XEN is not set
 CONFIG_KVM_GUEST=y
 # CONFIG_KVM_DEBUG_FS is not set
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_PARAVIRT_CLOCK=y
 CONFIG_NO_BOOTMEM=y
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-CONFIG_M686=y
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
 # CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MEFFICEON is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MELAN is not set
-# CONFIG_MGEODEGX1 is not set
-# CONFIG_MGEODE_LX is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-# CONFIG_MVIAC7 is not set
+# CONFIG_MPSC is not set
 # CONFIG_MCORE2 is not set
 # CONFIG_MATOM is not set
-# CONFIG_X86_GENERIC is not set
-CONFIG_X86_INTERNODE_CACHE_SHIFT=5
-CONFIG_X86_L1_CACHE_SHIFT=5
-# CONFIG_X86_PPRO_FENCE is not set
-CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_GENERIC_CPU=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_L1_CACHE_SHIFT=6
 CONFIG_X86_TSC=y
 CONFIG_X86_CMPXCHG64=y
 CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=5
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
 CONFIG_X86_DEBUGCTLMSR=y
 CONFIG_PROCESSOR_SELECT=y
 CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_CYRIX_32=y
 CONFIG_CPU_SUP_AMD=y
 CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_CPU_SUP_TRANSMETA_32=y
-CONFIG_CPU_SUP_UMC_32=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_DMI=y
+# CONFIG_GART_IOMMU is not set
+# CONFIG_CALGARY_IOMMU is not set
+CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
+# CONFIG_MAXSMP is not set
 CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
@@ -501,7 +499,6 @@ CONFIG_X86_MCE=y
 # CONFIG_X86_MCELOG_LEGACY is not set
 CONFIG_X86_MCE_INTEL=y
 CONFIG_X86_MCE_AMD=y
-# CONFIG_X86_ANCIENT_MCE is not set
 CONFIG_X86_MCE_THRESHOLD=y
 # CONFIG_X86_MCE_INJECT is not set
 CONFIG_X86_THERMAL_VECTOR=y
@@ -513,41 +510,37 @@ CONFIG_PERF_EVENTS_INTEL_UNCORE=y
 CONFIG_PERF_EVENTS_INTEL_RAPL=y
 CONFIG_PERF_EVENTS_INTEL_CSTATE=y
 # CONFIG_PERF_EVENTS_AMD_POWER is not set
-# CONFIG_X86_LEGACY_VM86 is not set
 # CONFIG_VM86 is not set
 CONFIG_X86_16BIT=y
-CONFIG_X86_ESPFIX32=y
-# CONFIG_TOSHIBA is not set
+CONFIG_X86_ESPFIX64=y
+CONFIG_X86_VSYSCALL_EMULATION=y
 CONFIG_I8K=m
-# CONFIG_X86_REBOOTFIXUPS is not set
 CONFIG_MICROCODE=y
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
 CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
-# CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMSPLIT_3G_OPT is not set
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_2G_OPT is not set
-# CONFIG_VMSPLIT_1G is not set
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_HIGHMEM=y
+# CONFIG_X86_5LEVEL is not set
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_X86_DIRECT_GBPAGES=y
 CONFIG_ARCH_HAS_MEM_ENCRYPT=y
-CONFIG_NEED_NODE_MEMMAP_SIZE=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
+# CONFIG_AMD_MEM_ENCRYPT is not set
+# CONFIG_NUMA is not set
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ILLEGAL_POINTER_VALUE=0
+CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_FLATMEM_MANUAL is not set
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM=y
 CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_STATIC=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
+CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
 CONFIG_HAVE_GENERIC_GUP=y
@@ -555,18 +548,21 @@ CONFIG_ARCH_DISCARD_MEMBLOCK=y
 # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
 # CONFIG_MEMORY_HOTPLUG is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
-# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+# CONFIG_MEMORY_FAILURE is not set
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
+CONFIG_ARCH_WANTS_THP_SWAP=y
 CONFIG_CLEANCACHE=y
 CONFIG_FRONTSWAP=y
 # CONFIG_CMA is not set
@@ -578,12 +574,14 @@ CONFIG_FRONTSWAP=y
 CONFIG_GENERIC_EARLY_IOREMAP=y
 CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_ARCH_HAS_ZONE_DEVICE=y
 CONFIG_FRAME_VECTOR=y
+CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
+CONFIG_ARCH_HAS_PKEYS=y
 # CONFIG_PERCPU_STATS is not set
-# CONFIG_HIGHPTE is not set
+# CONFIG_X86_PMEM_LEGACY is not set
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_RESERVE_LOW=64
-# CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
 # CONFIG_MTRR_SANITIZER is not set
 CONFIG_X86_PAT=y
@@ -591,8 +589,11 @@ CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
 # CONFIG_X86_SMAP is not set
 # CONFIG_X86_INTEL_UMIP is not set
+# CONFIG_X86_INTEL_MPX is not set
+CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
+CONFIG_EFI_MIXED=y
 CONFIG_SECCOMP=y
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_250 is not set
@@ -601,18 +602,27 @@ CONFIG_HZ_1000=y
 CONFIG_HZ=1000
 CONFIG_SCHED_HRTICK=y
 # CONFIG_KEXEC is not set
+# CONFIG_KEXEC_FILE is not set
 # CONFIG_CRASH_DUMP is not set
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_RELOCATABLE=y
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_X86_NEED_RELOCS=y
 CONFIG_PHYSICAL_ALIGN=0x200000
+CONFIG_RANDOMIZE_MEMORY=y
+CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0x0
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 # CONFIG_COMPAT_VDSO is not set
+# CONFIG_LEGACY_VSYSCALL_NATIVE is not set
+CONFIG_LEGACY_VSYSCALL_EMULATE=y
+# CONFIG_LEGACY_VSYSCALL_NONE is not set
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_MODIFY_LDT_SYSCALL=y
+CONFIG_HAVE_LIVEPATCH=y
+# CONFIG_LIVEPATCH is not set
+CONFIG_ARCH_HAS_ADD_PAGES=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
 #
@@ -656,6 +666,7 @@ CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_CPU_FREQ_PSS=y
 CONFIG_ACPI_PROCESSOR_CSTATE=y
 CONFIG_ACPI_PROCESSOR_IDLE=y
+CONFIG_ACPI_CPPC_LIB=y
 CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_PROCESSOR_AGGREGATOR=y
@@ -673,6 +684,7 @@ CONFIG_ACPI_HED=m
 # CONFIG_ACPI_CUSTOM_METHOD is not set
 # CONFIG_ACPI_BGRT is not set
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
+# CONFIG_ACPI_NFIT is not set
 CONFIG_HAVE_ACPI_APEI=y
 CONFIG_HAVE_ACPI_APEI_NMI=y
 CONFIG_ACPI_APEI=y
@@ -686,7 +698,6 @@ CONFIG_CRC_PMIC_OPREGION=y
 CONFIG_BXT_WC_PMIC_OPREGION=y
 # CONFIG_ACPI_CONFIGFS is not set
 # CONFIG_SFI is not set
-# CONFIG_APM is not set
 
 #
 # CPU Frequency scaling
@@ -717,19 +728,10 @@ CONFIG_X86_INTEL_PSTATE=y
 CONFIG_X86_PCC_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ_CPB=y
-# CONFIG_X86_POWERNOW_K6 is not set
-# CONFIG_X86_POWERNOW_K7 is not set
 CONFIG_X86_POWERNOW_K8=m
 CONFIG_X86_AMD_FREQ_SENSITIVITY=m
-# CONFIG_X86_GX_SUSPMOD is not set
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
-# CONFIG_X86_SPEEDSTEP_ICH is not set
-# CONFIG_X86_SPEEDSTEP_SMI is not set
 CONFIG_X86_P4_CLOCKMOD=m
-# CONFIG_X86_CPUFREQ_NFORCE2 is not set
-# CONFIG_X86_LONGRUN is not set
-# CONFIG_X86_LONGHAUL is not set
-# CONFIG_X86_E_POWERSAVER is not set
 
 #
 # shared options
@@ -749,11 +751,6 @@ CONFIG_INTEL_IDLE=y
 # Bus options (PCI etc.)
 #
 CONFIG_PCI=y
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GODIRECT is not set
-CONFIG_PCI_GOANY=y
-CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_DOMAINS=y
@@ -772,6 +769,7 @@ CONFIG_PCIEASPM_DEFAULT=y
 CONFIG_PCIE_PME=y
 # CONFIG_PCIE_DPC is not set
 # CONFIG_PCIE_PTM is not set
+CONFIG_PCI_BUS_ADDR_T_64BIT=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 # CONFIG_PCI_DEBUG is not set
@@ -783,9 +781,8 @@ CONFIG_PCI_LOCKLESS_CONFIG=y
 # CONFIG_PCI_PRI is not set
 # CONFIG_PCI_PASID is not set
 CONFIG_PCI_LABEL=y
+# CONFIG_PCI_HYPERV is not set
 CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_COMPAQ is not set
-# CONFIG_HOTPLUG_PCI_IBM is not set
 CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
@@ -799,6 +796,7 @@ CONFIG_HOTPLUG_PCI_SHPC=m
 #
 # PCI host controller drivers
 #
+# CONFIG_VMD is not set
 
 #
 # PCI Endpoint
@@ -811,12 +809,6 @@ CONFIG_HOTPLUG_PCI_SHPC=m
 # CONFIG_PCI_SW_SWITCHTEC is not set
 # CONFIG_ISA_BUS is not set
 CONFIG_ISA_DMA_API=y
-# CONFIG_ISA is not set
-# CONFIG_SCx200 is not set
-# CONFIG_OLPC is not set
-# CONFIG_ALIX is not set
-# CONFIG_NET5501 is not set
-# CONFIG_GEOS is not set
 CONFIG_AMD_NB=y
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m
@@ -842,16 +834,22 @@ CONFIG_PCCARD_NONSTATIC=y
 # Executable file formats / Emulations
 #
 CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
 CONFIG_ELFCORE=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
-CONFIG_HAVE_AOUT=y
-# CONFIG_BINFMT_AOUT is not set
+# CONFIG_HAVE_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
 CONFIG_COREDUMP=y
+CONFIG_IA32_EMULATION=y
+# CONFIG_IA32_AOUT is not set
+CONFIG_X86_X32=y
 CONFIG_COMPAT_32=y
-CONFIG_HAVE_ATOMIC_IOMAP=y
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_X86_DEV_DMA_OPS=y
 CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
 
@@ -1275,6 +1273,7 @@ CONFIG_XPS=y
 # CONFIG_CGROUP_NET_CLASSID is not set
 CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
+# CONFIG_BPF_JIT is not set
 CONFIG_NET_FLOW_LIMIT=y
 
 #
@@ -1313,6 +1312,7 @@ CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_3WIRE=y
 CONFIG_BT_HCIUART_INTEL=y
 CONFIG_BT_HCIUART_QCA=y
 # CONFIG_BT_HCIUART_AG6XX is not set
@@ -1385,6 +1385,7 @@ CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
 # CONFIG_NET_DEVLINK is not set
 CONFIG_MAY_USE_DEVLINK=y
+CONFIG_HAVE_EBPF_JIT=y
 
 #
 # Device Drivers
@@ -1512,7 +1513,6 @@ CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_DOCG4 is not set
 # CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_NAND_CS553X is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
 CONFIG_MTD_ONENAND=m
@@ -1580,7 +1580,6 @@ CONFIG_PARIDE_PD=m
 #
 # CONFIG_PARIDE_ATEN is not set
 # CONFIG_PARIDE_BPCK is not set
-# CONFIG_PARIDE_BPCK6 is not set
 # CONFIG_PARIDE_COMM is not set
 # CONFIG_PARIDE_DSTR is not set
 # CONFIG_PARIDE_FIT2 is not set
@@ -1602,6 +1601,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_DRBD is not set
 # CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SKD is not set
 # CONFIG_BLK_DEV_SX8 is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
@@ -1643,7 +1643,6 @@ CONFIG_HMC6352=m
 # CONFIG_DS1682 is not set
 # CONFIG_TI_DAC7512 is not set
 CONFIG_VMWARE_BALLOON=m
-# CONFIG_PCH_PHUB is not set
 CONFIG_USB_SWITCH_FSA9480=m
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 # CONFIG_SRAM is not set
@@ -1687,14 +1686,17 @@ CONFIG_VMWARE_VMCI=m
 #
 # Intel MIC Bus Driver
 #
+# CONFIG_INTEL_MIC_BUS is not set
 
 #
 # SCIF Bus Driver
 #
+# CONFIG_SCIF_BUS is not set
 
 #
 # VOP Bus Driver
 #
+# CONFIG_VOP_BUS is not set
 
 #
 # Intel MIC Host Driver
@@ -1715,6 +1717,7 @@ CONFIG_VMWARE_VMCI=m
 #
 # VOP Driver
 #
+# CONFIG_GENWQE is not set
 CONFIG_ECHO=m
 # CONFIG_CXL_BASE is not set
 # CONFIG_CXL_AFU_DRIVER_OPS is not set
@@ -1757,13 +1760,8 @@ CONFIG_IDE_PROC_FS=y
 # CONFIG_BLK_DEV_ATIIXP is not set
 # CONFIG_BLK_DEV_CMD64X is not set
 # CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_CS5535 is not set
-# CONFIG_BLK_DEV_CS5536 is not set
 # CONFIG_BLK_DEV_HPT366 is not set
 # CONFIG_BLK_DEV_JMICRON is not set
-# CONFIG_BLK_DEV_SC1200 is not set
 # CONFIG_BLK_DEV_PIIX is not set
 # CONFIG_BLK_DEV_IT8172 is not set
 # CONFIG_BLK_DEV_IT8213 is not set
@@ -1869,7 +1867,6 @@ CONFIG_HYPERV_STORAGE=y
 # CONFIG_QEDI is not set
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_AM53C974 is not set
-# CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_WD719X is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_PMCRAID is not set
@@ -1878,7 +1875,6 @@ CONFIG_SCSI_VIRTIO=y
 CONFIG_SCSI_LOWLEVEL_PCMCIA=y
 CONFIG_PCMCIA_AHA152X=m
 CONFIG_PCMCIA_FDOMAIN=m
-# CONFIG_PCMCIA_NINJA_SCSI is not set
 CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_SYM53C500=m
 # CONFIG_SCSI_DH is not set
@@ -1934,10 +1930,6 @@ CONFIG_PATA_AMD=y
 CONFIG_PATA_ATIIXP=y
 # CONFIG_PATA_ATP867X is not set
 # CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CS5535 is not set
-# CONFIG_PATA_CS5536 is not set
 # CONFIG_PATA_CYPRESS is not set
 # CONFIG_PATA_EFAR is not set
 # CONFIG_PATA_HPT366 is not set
@@ -1957,7 +1949,6 @@ CONFIG_PATA_IT8213=y
 # CONFIG_PATA_PDC_OLD is not set
 # CONFIG_PATA_RADISYS is not set
 # CONFIG_PATA_RDC is not set
-# CONFIG_PATA_SC1200 is not set
 CONFIG_PATA_SCH=y
 # CONFIG_PATA_SERVERWORKS is not set
 # CONFIG_PATA_SIL680 is not set
@@ -2013,7 +2004,6 @@ CONFIG_DM_VERITY_FEC=y
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
 # CONFIG_DM_INTEGRITY is not set
-# CONFIG_DM_VERITY_AVB is not set
 # CONFIG_DM_ANDROID_VERITY is not set
 # CONFIG_DM_ANDROID_VERITY_AT_MOST_ONCE_DEFAULT_ENABLED is not set
 # CONFIG_TARGET_CORE is not set
@@ -2100,6 +2090,7 @@ CONFIG_PCMCIA_NMCLAN=m
 # CONFIG_AMD_XGBE is not set
 # CONFIG_AMD_XGBE_HAVE_ECC is not set
 CONFIG_NET_VENDOR_AQUANTIA=y
+# CONFIG_AQTION is not set
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ATL2=m
@@ -2129,6 +2120,12 @@ CONFIG_BNXT_FLOWER_OFFLOAD=y
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_BNA=m
 CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_THUNDER_NIC_PF=m
+# CONFIG_THUNDER_NIC_VF is not set
+CONFIG_THUNDER_NIC_BGX=m
+CONFIG_THUNDER_NIC_RGX=m
+CONFIG_LIQUIDIO=m
+# CONFIG_LIQUIDIO_VF is not set
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
@@ -2178,10 +2175,12 @@ CONFIG_E1000E=m
 CONFIG_E1000E_HWTS=y
 CONFIG_IGB=m
 CONFIG_IGB_HWMON=y
+CONFIG_IGB_DCA=y
 CONFIG_IGBVF=m
 CONFIG_IXGB=m
 CONFIG_IXGBE=m
 CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCA=y
 CONFIG_IXGBEVF=m
 CONFIG_I40E=m
 CONFIG_I40EVF=m
@@ -2190,7 +2189,6 @@ CONFIG_NET_VENDOR_I825XX=y
 CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_MVMDIO=m
-# CONFIG_MVNETA_BM is not set
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
 # CONFIG_SKGE_GENESIS is not set
@@ -2223,6 +2221,7 @@ CONFIG_ENC28J60=m
 CONFIG_ENCX24J600=m
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
 CONFIG_FEALNX=m
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
@@ -2236,7 +2235,6 @@ CONFIG_NE2K_PCI=m
 CONFIG_NET_VENDOR_NVIDIA=y
 CONFIG_FORCEDETH=m
 CONFIG_NET_VENDOR_OKI=y
-# CONFIG_PCH_GBE is not set
 CONFIG_ETHOC=m
 CONFIG_NET_PACKET_ENGINE=y
 CONFIG_HAMACHI=m
@@ -2321,8 +2319,11 @@ CONFIG_MDIO_BCM_UNIMAC=m
 CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+CONFIG_MDIO_CAVIUM=m
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_OCTEON=m
+CONFIG_MDIO_THUNDER=m
 CONFIG_PHYLIB=m
 CONFIG_SWPHY=y
 # CONFIG_LED_TRIGGER_PHY is not set
@@ -2921,7 +2922,6 @@ CONFIG_INPUT_GP2A=m
 # CONFIG_INPUT_GPIO_BEEPER is not set
 CONFIG_INPUT_GPIO_TILT_POLLED=m
 # CONFIG_INPUT_GPIO_DECODER is not set
-# CONFIG_INPUT_WISTRON_BTNS is not set
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYCHORD=y
@@ -3050,11 +3050,9 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
-# CONFIG_SERIAL_TIMBERDALE is not set
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
 # CONFIG_SERIAL_IFX6X60 is not set
-# CONFIG_SERIAL_PCH_UART is not set
 # CONFIG_SERIAL_XILINX_PS_UART is not set
 # CONFIG_SERIAL_ARC is not set
 # CONFIG_SERIAL_RP2 is not set
@@ -3072,13 +3070,11 @@ CONFIG_HW_RANDOM=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_GEODE=m
 CONFIG_HW_RANDOM_VIA=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_NVRAM=m
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
-# CONFIG_SONYPI is not set
 
 #
 # PCMCIA character devices
@@ -3089,8 +3085,6 @@ CONFIG_NVRAM=m
 # CONFIG_SCR24X is not set
 # CONFIG_IPWIRELESS is not set
 # CONFIG_MWAVE is not set
-# CONFIG_PC8736x_GPIO is not set
-# CONFIG_NSC_GPIO is not set
 CONFIG_RAW_DRIVER=m
 CONFIG_MAX_RAW_DEVS=4096
 CONFIG_HPET=y
@@ -3104,7 +3098,6 @@ CONFIG_RPMB=y
 # CONFIG_RPMB_INTF_DEV is not set
 # CONFIG_RPMB_SIM is not set
 # CONFIG_VIRTIO_RPMB is not set
-# CONFIG_RPMB_MUX is not set
 
 #
 # I2C support
@@ -3173,12 +3166,10 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=y
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
 CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
-# CONFIG_I2C_EG20T is not set
 CONFIG_I2C_EMEV2=m
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_PCA_PLATFORM=m
-# CONFIG_I2C_PXA is not set
 # CONFIG_I2C_PXA_PCI is not set
 # CONFIG_I2C_RK3X is not set
 CONFIG_I2C_SIMTEC=m
@@ -3197,8 +3188,8 @@ CONFIG_I2C_TINY_USB=m
 #
 # Other I2C/SMBus bus drivers
 #
+# CONFIG_I2C_MLXCPLD is not set
 CONFIG_I2C_CROS_EC_TUNNEL=m
-# CONFIG_SCx200_ACB is not set
 # CONFIG_I2C_STUB is not set
 CONFIG_I2C_SLAVE=y
 # CONFIG_I2C_SLAVE_EEPROM is not set
@@ -3229,7 +3220,6 @@ CONFIG_SPI_PXA2XX=m
 CONFIG_SPI_PXA2XX_PCI=m
 # CONFIG_SPI_ROCKCHIP is not set
 # CONFIG_SPI_SC18IS602 is not set
-# CONFIG_SPI_TOPCLIFF_PCH is not set
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
 # CONFIG_SPI_ZYNQMP_GQSPI is not set
@@ -3266,7 +3256,6 @@ CONFIG_PTP_1588_CLOCK=m
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-# CONFIG_PTP_1588_CLOCK_PCH is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PINCTRL=y
 
@@ -3353,7 +3342,6 @@ CONFIG_GPIO_UCB1400=m
 #
 CONFIG_GPIO_AMD8111=m
 CONFIG_GPIO_ML_IOH=m
-# CONFIG_GPIO_PCH is not set
 # CONFIG_GPIO_PCI_IDIO_16 is not set
 CONFIG_GPIO_RDC321X=m
 # CONFIG_GPIO_SODAVILLE is not set
@@ -3594,6 +3582,11 @@ CONFIG_INTEL_PCH_THERMAL=m
 #
 # Trusty
 #
+CONFIG_TRUSTY=y
+CONFIG_TRUSTY_LOG=y
+CONFIG_TRUSTY_VIRTIO=y
+CONFIG_TRUSTY_VIRTIO_IPC=y
+CONFIG_TRUSTY_BACKUP_TIMER=y
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -3636,8 +3629,6 @@ CONFIG_ITCO_WDT=y
 # CONFIG_PC87413_WDT is not set
 # CONFIG_NV_TCO is not set
 # CONFIG_60XX_WDT is not set
-# CONFIG_SBC8360_WDT is not set
-# CONFIG_SBC7240_WDT is not set
 # CONFIG_CPU5_WDT is not set
 # CONFIG_SMSC_SCH311X_WDT is not set
 # CONFIG_SMSC37B787_WDT is not set
@@ -3702,7 +3693,6 @@ CONFIG_BCMA_DRIVER_GPIO=y
 # Multifunction device drivers
 #
 CONFIG_MFD_CORE=y
-# CONFIG_MFD_CS5535 is not set
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_AS3711 is not set
 # CONFIG_MFD_AS3722 is not set
@@ -3799,7 +3789,6 @@ CONFIG_MFD_TPS65218=m
 # CONFIG_TWL6040_CORE is not set
 # CONFIG_MFD_WL1273_CORE is not set
 CONFIG_MFD_LM3533=m
-# CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TMIO is not set
 CONFIG_MFD_VX855=m
@@ -4101,8 +4090,10 @@ CONFIG_VIDEO_MEYE=m
 # CONFIG_VIDEO_TW68 is not set
 # CONFIG_VIDEO_TW686X is not set
 # CONFIG_VIDEO_ZORAN is not set
+# CONFIG_VIDEO_INTEL_IPU is not set
 # CONFIG_VIDEO_INTEL_IPU_FW_LIB is not set
 # CONFIG_VIDEO_INTEL_UOS is not set
+# CONFIG_VIDEO_INTEL_IPU_ACRN is not set
 
 #
 # Media capture/analog TV support
@@ -4612,16 +4603,10 @@ CONFIG_DVB_HELENE=m
 # Graphics support
 #
 CONFIG_AGP=y
-# CONFIG_AGP_ALI is not set
-# CONFIG_AGP_ATI is not set
-# CONFIG_AGP_AMD is not set
 # CONFIG_AGP_AMD64 is not set
 CONFIG_AGP_INTEL=y
-# CONFIG_AGP_NVIDIA is not set
 # CONFIG_AGP_SIS is not set
-# CONFIG_AGP_SWORKS is not set
 # CONFIG_AGP_VIA is not set
-# CONFIG_AGP_EFFICEON is not set
 CONFIG_INTEL_GTT=y
 CONFIG_VGA_ARB=y
 CONFIG_VGA_ARB_MAX_GPUS=16
@@ -4665,6 +4650,7 @@ CONFIG_DRM_I915=y
 CONFIG_DRM_I915_CAPTURE_ERROR=y
 CONFIG_DRM_I915_COMPRESS_ERROR=y
 CONFIG_DRM_I915_USERPTR=y
+# CONFIG_DRM_I915_GVT is not set
 # CONFIG_DRM_I915_LOAD_ASYNC_SUPPORT is not set
 
 #
@@ -4781,7 +4767,6 @@ CONFIG_FB_RIVA=m
 # CONFIG_FB_RIVA_DEBUG is not set
 CONFIG_FB_RIVA_BACKLIGHT=y
 # CONFIG_FB_I740 is not set
-# CONFIG_FB_I810 is not set
 # CONFIG_FB_LE80578 is not set
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
@@ -4817,7 +4802,6 @@ CONFIG_FB_TRIDENT=m
 # CONFIG_FB_ARK is not set
 # CONFIG_FB_PM3 is not set
 # CONFIG_FB_CARMINE is not set
-# CONFIG_FB_GEODE is not set
 # CONFIG_FB_SMSCUFX is not set
 CONFIG_FB_UDL=m
 # CONFIG_FB_IBM_GXT4500 is not set
@@ -4958,8 +4942,6 @@ CONFIG_SND_OXYGEN=m
 CONFIG_SND_CS4281=m
 CONFIG_SND_CS46XX=m
 CONFIG_SND_CS46XX_NEW_DSP=y
-# CONFIG_SND_CS5530 is not set
-# CONFIG_SND_CS5535AUDIO is not set
 CONFIG_SND_CTXFI=m
 CONFIG_SND_DARLA20=m
 CONFIG_SND_GINA20=m
@@ -5003,7 +4985,6 @@ CONFIG_SND_RIPTIDE=m
 CONFIG_SND_RME32=m
 CONFIG_SND_RME96=m
 CONFIG_SND_RME9652=m
-# CONFIG_SND_SIS7019 is not set
 CONFIG_SND_SONICVIBES=m
 CONFIG_SND_TRIDENT=m
 CONFIG_SND_VIA82XX=m
@@ -5394,6 +5375,12 @@ CONFIG_USB_HIDDEV=y
 # I2C HID support
 #
 CONFIG_I2C_HID=m
+
+#
+# Intel ISH HID support
+#
+# CONFIG_INTEL_ISH_HID is not set
+# CONFIG_INTEL_ISH_UART_INTERFACE is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
@@ -5625,7 +5612,6 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 #
 # USB Peripheral Controller
 #
-# CONFIG_USB_FUSB300 is not set
 # CONFIG_USB_FOTG210_UDC is not set
 # CONFIG_USB_GR_UDC is not set
 # CONFIG_USB_R8A66597 is not set
@@ -5702,10 +5688,10 @@ CONFIG_TYPEC=y
 CONFIG_TYPEC_WCOVE=y
 CONFIG_TYPEC_UCSI=y
 # CONFIG_UCSI_ACPI is not set
-CONFIG_USB_ROLES_INTEL_XHCI=y
 # CONFIG_USB_LED_TRIG is not set
 # CONFIG_USB_ULPI_BUS is not set
 CONFIG_USB_ROLE_SWITCH=y
+CONFIG_USB_ROLES_INTEL_XHCI=y
 # CONFIG_UWB is not set
 CONFIG_MMC=y
 CONFIG_PWRSEQ_EMMC=y
@@ -5798,7 +5784,6 @@ CONFIG_LEDS_GPIO=m
 # CONFIG_LEDS_TCA6507 is not set
 # CONFIG_LEDS_TLC591XX is not set
 # CONFIG_LEDS_LM355x is not set
-# CONFIG_LEDS_OT200 is not set
 # CONFIG_LEDS_MENF21BMC is not set
 # CONFIG_LEDS_IS31FL319X is not set
 # CONFIG_LEDS_IS31FL32XX is not set
@@ -5808,6 +5793,7 @@ CONFIG_LEDS_GPIO=m
 #
 # CONFIG_LEDS_BLINKM is not set
 # CONFIG_LEDS_SYSCON is not set
+# CONFIG_LEDS_MLXCPLD is not set
 # CONFIG_LEDS_USER is not set
 # CONFIG_LEDS_NIC78BX is not set
 
@@ -5970,7 +5956,7 @@ CONFIG_DMA_OF=y
 # CONFIG_ALTERA_MSGDMA is not set
 # CONFIG_FSL_EDMA is not set
 # CONFIG_INTEL_IDMA64 is not set
-# CONFIG_PCH_DMA is not set
+CONFIG_INTEL_IOATDMA=m
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_HIDMA is not set
 CONFIG_DW_DMAC_CORE=y
@@ -5982,6 +5968,7 @@ CONFIG_DW_DMAC_PCI=y
 #
 # CONFIG_ASYNC_TX_DMA is not set
 # CONFIG_DMATEST is not set
+CONFIG_DMA_ENGINE_RAID=y
 
 #
 # DMABUF options
@@ -5995,6 +5982,7 @@ CONFIG_SW_SYNC=y
 CONFIG_HYPER_DMABUF=y
 CONFIG_HYPER_DMABUF_SYSFS=y
 # CONFIG_HYPER_DMABUF_EVENT_GEN is not set
+CONFIG_DCA=m
 # CONFIG_AUXDISPLAY is not set
 CONFIG_PANEL=m
 CONFIG_PANEL_PARPORT=0
@@ -6030,7 +6018,7 @@ CONFIG_VIRTIO_MMIO=m
 # Microsoft Hyper-V guest support
 #
 CONFIG_HYPERV=y
-# CONFIG_HYPERV_TSCPAGE is not set
+CONFIG_HYPERV_TSCPAGE=y
 CONFIG_HYPERV_UTILS=m
 CONFIG_HYPERV_BALLOON=m
 CONFIG_STAGING=y
@@ -6174,6 +6162,8 @@ CONFIG_ION=y
 # CONFIG_LNET is not set
 # CONFIG_DGNC is not set
 # CONFIG_GS_FPGABOOT is not set
+# CONFIG_CRYPTO_SKEIN is not set
+# CONFIG_UNISYSSPAR is not set
 # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 # CONFIG_FB_TFT is not set
 # CONFIG_WILC1000_SDIO is not set
@@ -6202,7 +6192,6 @@ CONFIG_DELL_RBTN=m
 CONFIG_FUJITSU_LAPTOP=m
 CONFIG_FUJITSU_TABLET=m
 CONFIG_AMILO_RFKILL=m
-# CONFIG_TC1100_WMI is not set
 CONFIG_HP_ACCEL=m
 CONFIG_HP_WIRELESS=m
 CONFIG_HP_WMI=m
@@ -6257,7 +6246,10 @@ CONFIG_INTEL_PMC_IPC=y
 CONFIG_SURFACE_PRO3_BUTTON=m
 # CONFIG_SURFACE_3_BUTTON is not set
 CONFIG_INTEL_PUNIT_IPC=y
+CONFIG_INTEL_TELEMETRY=y
+# CONFIG_MLX_PLATFORM is not set
 # CONFIG_MLX_CPLD_PLATFORM is not set
+# CONFIG_INTEL_TURBO_MAX_3 is not set
 # CONFIG_SILEAD_DMI is not set
 # CONFIG_INTEL_PSTORE_PRAM is not set
 CONFIG_PMC_ATOM=y
@@ -6293,7 +6285,6 @@ CONFIG_COMMON_CLK=y
 #
 # Clock Source drivers
 #
-CONFIG_CLKSRC_I8253=y
 CONFIG_CLKEVT_I8253=y
 CONFIG_I8253_LOCK=y
 CONFIG_CLKBLD_I8253=y
@@ -6312,7 +6303,9 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # Generic IOMMU Pagetable Support
 #
+# CONFIG_AMD_IOMMU is not set
 # CONFIG_INTEL_IOMMU is not set
+# CONFIG_IRQ_REMAP is not set
 
 #
 # Remoteproc drivers
@@ -6794,6 +6787,7 @@ CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 # CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
+# CONFIG_LIBNVDIMM is not set
 CONFIG_DAX=y
 CONFIG_NVMEM=y
 # CONFIG_STM is not set
@@ -6833,8 +6827,7 @@ CONFIG_EFI_VARS_PSTORE=m
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_RUNTIME_WRAPPERS=y
 CONFIG_EFI_BOOTLOADER_CONTROL=y
-CONFIG_EFI_CAPSULE_LOADER=y
-CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH=y
+# CONFIG_EFI_CAPSULE_LOADER is not set
 # CONFIG_EFI_TEST is not set
 CONFIG_APPLE_PROPERTIES=y
 # CONFIG_RESET_ATTACK_MITIGATION is not set
@@ -6914,6 +6907,7 @@ CONFIG_QUOTA_TREE=y
 # CONFIG_QFMT_V1 is not set
 CONFIG_QFMT_V2=y
 CONFIG_QUOTACTL=y
+CONFIG_QUOTACTL_COMPAT=y
 # CONFIG_AUTOFS4_FS is not set
 CONFIG_FUSE_FS=y
 # CONFIG_CUSE is not set
@@ -7118,7 +7112,7 @@ CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-CONFIG_FRAME_POINTER=y
+CONFIG_STACK_VALIDATION=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
@@ -7146,9 +7140,12 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_VIRTUAL is not set
 # CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
+CONFIG_HAVE_ARCH_KASAN=y
+# CONFIG_KASAN is not set
+CONFIG_ARCH_HAS_KCOV=y
+# CONFIG_KCOV is not set
 # CONFIG_DEBUG_SHIRQ is not set
 
 #
@@ -7157,6 +7154,7 @@ CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_SOFTLOCKUP_DETECTOR=y
 CONFIG_HARDLOCKUP_DETECTOR_PERF=y
+CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
 CONFIG_HARDLOCKUP_DETECTOR=y
 # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
@@ -7234,6 +7232,7 @@ CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
 CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_PREEMPT_TRACER is not set
@@ -7328,13 +7327,15 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DEBUG_NMI_SELFTEST is not set
 CONFIG_X86_DEBUG_FPU=y
 # CONFIG_PUNIT_ATOM_DEBUG is not set
-CONFIG_UNWINDER_FRAME_POINTER=y
+CONFIG_UNWINDER_ORC=y
+# CONFIG_UNWINDER_FRAME_POINTER is not set
 # CONFIG_UNWINDER_GUESS is not set
 
 #
 # Security options
 #
 CONFIG_KEYS=y
+CONFIG_KEYS_COMPAT=y
 # CONFIG_PERSISTENT_KEYRINGS is not set
 # CONFIG_BIG_KEYS is not set
 # CONFIG_ENCRYPTED_KEYS is not set
@@ -7345,6 +7346,7 @@ CONFIG_SECURITY=y
 CONFIG_SECURITY_WRITABLE_HOOKS=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
+CONFIG_PAGE_TABLE_ISOLATION=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
 CONFIG_SECURITY_PATH=y
 CONFIG_LSM_MMAP_MIN_ADDR=65536
@@ -7411,7 +7413,9 @@ CONFIG_CRYPTO_CRYPTD=y
 # CONFIG_CRYPTO_MCRYPTD is not set
 CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ABLK_HELPER=y
 CONFIG_CRYPTO_SIMD=y
+CONFIG_CRYPTO_GLUE_HELPER_X86=y
 
 #
 # Authenticated Encryption with Associated Data
@@ -7452,6 +7456,7 @@ CONFIG_CRYPTO_CRC32=y
 # CONFIG_CRYPTO_CRCT10DIF is not set
 CONFIG_CRYPTO_GHASH=m
 # CONFIG_CRYPTO_POLY1305 is not set
+# CONFIG_CRYPTO_POLY1305_X86_64 is not set
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=y
@@ -7460,40 +7465,59 @@ CONFIG_CRYPTO_MICHAEL_MIC=y
 # CONFIG_CRYPTO_RMD256 is not set
 # CONFIG_CRYPTO_RMD320 is not set
 CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA1_SSSE3=y
+CONFIG_CRYPTO_SHA256_SSSE3=y
+CONFIG_CRYPTO_SHA512_SSSE3=y
+# CONFIG_CRYPTO_SHA1_MB is not set
+# CONFIG_CRYPTO_SHA256_MB is not set
+# CONFIG_CRYPTO_SHA512_MB is not set
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SHA3 is not set
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
+# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
 
 #
 # Ciphers
 #
 CONFIG_CRYPTO_AES=y
 # CONFIG_CRYPTO_AES_TI is not set
-CONFIG_CRYPTO_AES_586=y
+CONFIG_CRYPTO_AES_X86_64=y
 CONFIG_CRYPTO_AES_NI_INTEL=y
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=y
 CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=y
+CONFIG_CRYPTO_BLOWFISH_X86_64=y
 CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAMELLIA_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
 CONFIG_CRYPTO_CAST_COMMON=m
 CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST5_AVX_X86_64=m
 CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_CAST6_AVX_X86_64=m
 CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_DES3_EDE_X86_64 is not set
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_KHAZAD=m
 # CONFIG_CRYPTO_SALSA20 is not set
 # CONFIG_CRYPTO_CHACHA20 is not set
+# CONFIG_CRYPTO_CHACHA20_X86_64 is not set
 # CONFIG_CRYPTO_SEED is not set
 CONFIG_CRYPTO_SERPENT=m
-# CONFIG_CRYPTO_SERPENT_SSE2_586 is not set
+CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
 # CONFIG_CRYPTO_SPECK is not set
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=y
 CONFIG_CRYPTO_TWOFISH_COMMON=y
-# CONFIG_CRYPTO_TWOFISH_586 is not set
+CONFIG_CRYPTO_TWOFISH_X86_64=y
+CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=y
+CONFIG_CRYPTO_TWOFISH_AVX_X86_64=y
 
 #
 # Compression
@@ -7555,6 +7579,7 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_IO=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
@@ -7571,7 +7596,6 @@ CONFIG_CRC7=m
 CONFIG_LIBCRC32C=y
 CONFIG_CRC8=y
 CONFIG_XXHASH=m
-CONFIG_AUDIT_GENERIC=y
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
 # CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_ZLIB_INFLATE=y
@@ -7636,5 +7660,7 @@ CONFIG_FONT_AUTOSELECT=y
 # CONFIG_SG_SPLIT is not set
 CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_SG_CHAIN=y
+CONFIG_ARCH_HAS_PMEM_API=y
+CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
 CONFIG_SBITMAP=y
 # CONFIG_STRING_SELFTEST is not set

From 9c3c00c74f23c1ba7127e5c3b984405267d8d916 Mon Sep 17 00:00:00 2001
From: Ming Tan <ming.tan@intel.com>
Date: Fri, 19 Oct 2018 14:40:46 +0800
Subject: [PATCH 347/427] [MIXINUP] Change the default serial port to ttyS0.

Tracked-On: None

Signed-off-by: Ming Tan <ming.tan@intel.com>
---
 cel_apl/BoardConfig.mk | 2 +-
 celadon/BoardConfig.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index d48023a9c..88d34bf55 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -94,7 +94,7 @@ TARGET_PRELINK_MODULE := false
 TARGET_NO_KERNEL ?= false
 
 KERNEL_LOGLEVEL ?= 3
-SERIAL_PARAMETER := console=tty0 console=ttyS2,115200n8
+SERIAL_PARAMETER ?= console=tty0 console=ttyS0,115200n8
 
 
 BOARD_KERNEL_CMDLINE += androidboot.hardware=$(TARGET_PRODUCT) firmware_class.path=/vendor/firmware loglevel=$(KERNEL_LOGLEVEL)
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index 9dc1814c6..259efedf7 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -104,7 +104,7 @@ TARGET_PRELINK_MODULE := false
 TARGET_NO_KERNEL ?= false
 
 KERNEL_LOGLEVEL ?= 3
-SERIAL_PARAMETER := console=tty0 console=ttyS2,115200n8
+SERIAL_PARAMETER ?= console=tty0 console=ttyS0,115200n8
 
 
 BOARD_KERNEL_CMDLINE += androidboot.hardware=$(TARGET_PRODUCT) firmware_class.path=/vendor/firmware loglevel=$(KERNEL_LOGLEVEL)

From d4c5c985c2fcb8ee3f246a152e79430851a19257 Mon Sep 17 00:00:00 2001
From: "Meng, KangX" <kangx.meng@intel.com>
Date: Wed, 24 Oct 2018 13:08:13 +0800
Subject: [PATCH 348/427] [MIXINUP] USB live boot image should set bootloader2
 partition empty.

Tracked-On: OAM-69453

Signed-off-by: Meng, KangX <kangx.meng@intel.com>
---
 cel_apl/AndroidBoard.mk | 1 -
 celadon/AndroidBoard.mk | 1 -
 2 files changed, 2 deletions(-)

diff --git a/cel_apl/AndroidBoard.mk b/cel_apl/AndroidBoard.mk
index 7602c1a5a..b0e1c209d 100644
--- a/cel_apl/AndroidBoard.mk
+++ b/cel_apl/AndroidBoard.mk
@@ -545,7 +545,6 @@ $(GPTIMAGE_BIN): \
 		--table $(TARGET_DEVICE_DIR)/gpt.ini \
 		--size $(gptimage_size) \
 		--bootloader $(bootloader_bin) \
-		--bootloader2 $(bootloader_bin) \
 		--tos $(tos_bin) \
 		--multiboot $(multiboot_bin) \
 		--boot $(INSTALLED_BOOTIMAGE_TARGET) \
diff --git a/celadon/AndroidBoard.mk b/celadon/AndroidBoard.mk
index 4abbd9ef4..3275f7089 100644
--- a/celadon/AndroidBoard.mk
+++ b/celadon/AndroidBoard.mk
@@ -545,7 +545,6 @@ $(GPTIMAGE_BIN): \
 		--table $(TARGET_DEVICE_DIR)/gpt.ini \
 		--size $(gptimage_size) \
 		--bootloader $(bootloader_bin) \
-		--bootloader2 $(bootloader_bin) \
 		--tos $(tos_bin) \
 		--multiboot $(multiboot_bin) \
 		--boot $(INSTALLED_BOOTIMAGE_TARGET) \

From 77f241aed6a626cddc0889514832cbf8224004d9 Mon Sep 17 00:00:00 2001
From: bshwetha <shwetha.b@intel.com>
Date: Wed, 24 Oct 2018 10:20:25 +0530
Subject: [PATCH 349/427] Make CTS work on User build by allowing system_server
 access shell_data_file by map

Tracked-On: OAM-70371
Signed-off-by: bshwetha <shwetha.b@intel.com>
---
 sepolicy/kernel/system_server.te | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sepolicy/kernel/system_server.te b/sepolicy/kernel/system_server.te
index 4c89058f9..ab658b2b6 100644
--- a/sepolicy/kernel/system_server.te
+++ b/sepolicy/kernel/system_server.te
@@ -8,3 +8,4 @@ allow system_server audioserver:file rw_file_perms;
 allow system_server system_app:file rw_file_perms;
 
 allow system_server hal_graphics_allocator_default_tmpfs:file rw_file_perms;
+allow system_server shell_data_file:file map;

From fd69ec3a8a0eee7b250bae2a17ac058a7cb91efd Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Thu, 4 Oct 2018 14:21:27 +0530
Subject: [PATCH 350/427] f2fs filesystem support enabled

f2fs filesystem support is enabled for using in adoptable storage
as per google AOSP CDD adoptable storage shall use both ext4 and f2fs. so enabling f2fs

Tracked-On: None
Test: mount cmd
      1. create a storage volume with mkfs.f2fs utility
      2. mount -t f2fs <dev entry> <mount point>
      3. check mount cmd output and check for mount type as f2fs

Signed-off-by: shyjumon <shyjumon.n@intel.com>
---
 kernel_config/kernel_64_defconfig | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index a59dab866..d0335206d 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -6887,7 +6887,11 @@ CONFIG_BTRFS_FS=m
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_NILFS2_FS is not set
-# CONFIG_F2FS_FS is not set
+CONFIG_F2FS_FS=y
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
 # CONFIG_FS_DAX is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=m

From 0f6682c8caefe08f99aef0f828a4cb0b39b23d5a Mon Sep 17 00:00:00 2001
From: "Yan, WalterX" <walterx.yan@intel.com>
Date: Tue, 16 Oct 2018 17:12:53 +0800
Subject: [PATCH 351/427] Integrate the GMS applicaton for celadon.

Include GMS make file if avaiable.

Tracked-On: OAM-69889
Signed-off-by: Yan, WalterX <walterx.yan@intel.com>
---
 celadon/celadon.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/celadon/celadon.mk b/celadon/celadon.mk
index edfdb18bf..cbc2e6350 100644
--- a/celadon/celadon.mk
+++ b/celadon/celadon.mk
@@ -3,6 +3,11 @@ ENABLE_NATIVEBRIDGE_64BIT := true
 $(call inherit-product,$(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product,device/intel/project-celadon/celadon/device.mk)
 
+# Include GMS application
+FLAG_GMS_MINIMAL := true
+FLAG_GMS_AVAILABLE := true
+$(call inherit-product-if-exists, vendor/google/gms/products/gms.mk)
+
 # Overrides
 PRODUCT_NAME := celadon
 PRODUCT_BRAND := celadon

From e560dd9832fc8632555578dfc860df06324dcf96 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Mon, 29 Oct 2018 16:13:38 +0530
Subject: [PATCH 352/427] [CELADON] New config added for kernel 4.19

Tracked-On: None
---
 kernel_config/kernel_64_defconfig | 5150 ++++++++++++-----------------
 1 file changed, 2092 insertions(+), 3058 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index d0335206d..f1f5c7bbc 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -1,47 +1,14 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.14.67 Kernel Configuration
+# Linux/x86_64 4.19.0-rc7 Kernel Configuration
 #
-CONFIG_64BIT=y
-CONFIG_X86_64=y
-CONFIG_X86=y
-CONFIG_INSTRUCTION_DECODER=y
-CONFIG_OUTPUT_FORMAT="elf64-x86-64"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_MMU=y
-CONFIG_ARCH_MMAP_RND_BITS_MIN=28
-CONFIG_ARCH_MMAP_RND_BITS_MAX=32
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-CONFIG_ZONE_DMA32=y
-CONFIG_AUDIT_ARCH=y
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_X86_64_SMP=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_PGTABLE_LEVELS=4
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Compiler: x86_64-poky-linux-gcc (GCC) 7.3.0
+#
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=70300
+CONFIG_CLANG_VERSION=0
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -50,10 +17,10 @@ CONFIG_THREAD_INFO_IN_TASK=y
 # General setup
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-project-celadon_64"
+CONFIG_LOCALVERSION="-quilt-2e5dc0ac"
 CONFIG_LOCALVERSION_AUTO=y
+CONFIG_BUILD_SALT=""
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
@@ -66,12 +33,12 @@ CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_XZ is not set
 # CONFIG_KERNEL_LZO is not set
 # CONFIG_KERNEL_LZ4 is not set
-CONFIG_DEFAULT_HOSTNAME="project-celadon_64"
+CONFIG_DEFAULT_HOSTNAME="localhost"
 CONFIG_SWAP=y
 # CONFIG_SYSVIPC is not set
-# CONFIG_POSIX_MQUEUE is not set
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_CROSS_MEMORY_ATTACH=y
-# CONFIG_FHANDLE is not set
 # CONFIG_USELIB is not set
 CONFIG_AUDIT=y
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
@@ -87,12 +54,12 @@ CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
 CONFIG_GENERIC_PENDING_IRQ=y
 CONFIG_GENERIC_IRQ_MIGRATION=y
-CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_GENERIC_MSI_IRQ=y
 CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
-# CONFIG_IRQ_DOMAIN_DEBUG is not set
+CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
+CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
@@ -115,7 +82,10 @@ CONFIG_NO_HZ_IDLE=y
 # CONFIG_NO_HZ_FULL is not set
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
-# CONFIG_ANDROID_AUTO_SUSPEND_BEHAVIOR is not set
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_COUNT=y
 
 #
 # CPU/Task time and stats accounting
@@ -123,13 +93,13 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
-# CONFIG_SCHED_WALT is not set
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
+# CONFIG_CPU_ISOLATION is not set
 
 #
 # RCU Subsystem
@@ -141,24 +111,22 @@ CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
-# CONFIG_BUILD_BIN2C is not set
-# CONFIG_IKCONFIG is not set
-CONFIG_LOG_BUF_SHIFT=17
+CONFIG_BUILD_BIN2C=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=18
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-
-#
-# FAIR Scheuler tunables
-#
-CONFIG_PELT_UTIL_HALFLIFE_32=y
-# CONFIG_PELT_UTIL_HALFLIFE_16 is not set
-# CONFIG_PELT_UTIL_HALFLIFE_8 is not set
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_CGROUPS=y
-# CONFIG_MEMCG is not set
+CONFIG_PAGE_COUNTER=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+CONFIG_MEMCG_SWAP_ENABLED=y
+CONFIG_MEMCG_KMEM=y
 # CONFIG_BLK_CGROUP is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -167,34 +135,35 @@ CONFIG_RT_GROUP_SCHED=y
 # CONFIG_CGROUP_PIDS is not set
 # CONFIG_CGROUP_RDMA is not set
 CONFIG_CGROUP_FREEZER=y
+# CONFIG_CGROUP_HUGETLB is not set
 CONFIG_CPUSETS=y
 CONFIG_PROC_PID_CPUSET=y
 # CONFIG_CGROUP_DEVICE is not set
 CONFIG_CGROUP_CPUACCT=y
 # CONFIG_CGROUP_PERF is not set
+CONFIG_CGROUP_BPF=y
 CONFIG_CGROUP_DEBUG=y
-# CONFIG_SOCK_CGROUP_DATA is not set
-# CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_SOCK_CGROUP_DATA=y
 CONFIG_NAMESPACES=y
-# CONFIG_UTS_NS is not set
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
 # CONFIG_USER_NS is not set
-# CONFIG_PID_NS is not set
-# CONFIG_NET_NS is not set
-# CONFIG_SCHED_AUTOGROUP is not set
-# CONFIG_SCHED_TUNE is not set
-# CONFIG_DEFAULT_USE_ENERGY_AWARE is not set
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+# CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_SCHED_AUTOGROUP=y
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_RD_GZIP=y
-# CONFIG_RD_BZIP2 is not set
-# CONFIG_RD_LZMA is not set
-# CONFIG_RD_XZ is not set
-# CONFIG_RD_LZO is not set
-# CONFIG_RD_LZ4 is not set
-# CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y
@@ -204,14 +173,11 @@ CONFIG_BPF=y
 CONFIG_EXPERT=y
 CONFIG_UID16=y
 CONFIG_MULTIUSER=y
-CONFIG_SGETMASK_SYSCALL=y
-CONFIG_SYSFS_SYSCALL=y
-CONFIG_SYSCTL_SYSCALL=y
+# CONFIG_SGETMASK_SYSCALL is not set
+# CONFIG_SYSFS_SYSCALL is not set
+# CONFIG_SYSCTL_SYSCALL is not set
+# CONFIG_FHANDLE is not set
 CONFIG_POSIX_TIMERS=y
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
-CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_PRINTK=y
 CONFIG_PRINTK_NMI=y
 CONFIG_BUG=y
@@ -224,13 +190,19 @@ CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
-# CONFIG_BPF_SYSCALL is not set
 CONFIG_SHMEM=y
 CONFIG_AIO=y
 CONFIG_ADVISE_SYSCALLS=y
-# CONFIG_USERFAULTFD is not set
-CONFIG_PCI_QUIRKS=y
 CONFIG_MEMBARRIER=y
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
+CONFIG_KALLSYMS_BASE_RELATIVE=y
+CONFIG_BPF_SYSCALL=y
+# CONFIG_USERFAULTFD is not set
+CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_RSEQ=y
+# CONFIG_DEBUG_RSEQ is not set
 CONFIG_EMBEDDED=y
 CONFIG_HAVE_PERF_EVENTS=y
 # CONFIG_PC104 is not set
@@ -246,186 +218,50 @@ CONFIG_SLAB=y
 # CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
 CONFIG_SLAB_MERGE_DEFAULT=y
-CONFIG_SLAB_FREELIST_RANDOM=y
+# CONFIG_SLAB_FREELIST_RANDOM is not set
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
-CONFIG_HOTPLUG_SMT=y
-CONFIG_OPROFILE=y
-# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-CONFIG_HAVE_OPROFILE=y
-CONFIG_OPROFILE_NMI_TIMER=y
-# CONFIG_KPROBES is not set
-# CONFIG_JUMP_LABEL is not set
-CONFIG_UPROBES=y
-# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_OPTPROBES=y
-CONFIG_HAVE_KPROBES_ON_FTRACE=y
-CONFIG_HAVE_NMI=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
-CONFIG_ARCH_HAS_SET_MEMORY=y
-CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
-CONFIG_HAVE_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_PERF_EVENTS_NMI=y
-CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_HAVE_RCU_TABLE_FREE=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_HAVE_CMPXCHG_LOCAL=y
-CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
-CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
-CONFIG_HAVE_CC_STACKPROTECTOR=y
-CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_CC_STACKPROTECTOR_NONE is not set
-# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
-CONFIG_CC_STACKPROTECTOR_STRONG=y
-CONFIG_THIN_ARCHIVES=y
-# CONFIG_LTO is not set
-CONFIG_LTO_NONE=y
-CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
-CONFIG_HAVE_CONTEXT_TRACKING=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y
-CONFIG_HAVE_ARCH_HUGE_VMAP=y
-CONFIG_HAVE_ARCH_SOFT_DIRTY=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_MODULES_USE_ELF_RELA=y
-CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
-CONFIG_HAVE_EXIT_THREAD=y
-CONFIG_ARCH_MMAP_RND_BITS=28
-CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
-CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y
-CONFIG_HAVE_COPY_THREAD_TLS=y
-CONFIG_HAVE_STACK_VALIDATION=y
-# CONFIG_HAVE_ARCH_HASH is not set
-# CONFIG_ISA_BUS_API is not set
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_COMPAT_OLD_SIGACTION=y
-# CONFIG_CPU_NO_EFFICIENT_FFS is not set
-CONFIG_HAVE_ARCH_VMAP_STACK=y
-CONFIG_VMAP_STACK=y
-# CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set
-# CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set
-CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
-CONFIG_STRICT_MODULE_RWX=y
-CONFIG_ARCH_HAS_REFCOUNT=y
-# CONFIG_REFCOUNT_FULL is not set
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-CONFIG_MODULE_SIG=y
-CONFIG_MODULE_SIG_FORCE=y
-CONFIG_MODULE_SIG_ALL=y
-# CONFIG_MODULE_SIG_SHA1 is not set
-# CONFIG_MODULE_SIG_SHA224 is not set
-# CONFIG_MODULE_SIG_SHA256 is not set
-# CONFIG_MODULE_SIG_SHA384 is not set
-CONFIG_MODULE_SIG_SHA512=y
-CONFIG_MODULE_SIG_HASH="sha512"
-# CONFIG_MODULE_COMPRESS is not set
-CONFIG_MODULES_TREE_LOOKUP=y
-CONFIG_BLOCK=y
-CONFIG_BLK_SCSI_REQUEST=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_BSGLIB is not set
-# CONFIG_BLK_DEV_INTEGRITY is not set
-# CONFIG_BLK_DEV_ZONED is not set
-# CONFIG_BLK_CMDLINE_PARSER is not set
-# CONFIG_BLK_WBT is not set
-CONFIG_BLK_DEBUG_FS=y
-# CONFIG_BLK_SED_OPAL is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_AIX_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_CMDLINE_PARTITION is not set
-CONFIG_BLOCK_COMPAT=y
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_MQ_VIRTIO=y
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=y
-# CONFIG_IOSCHED_BFQ is not set
-CONFIG_ASN1=y
-CONFIG_UNINLINE_SPIN_UNLOCK=y
-CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
-CONFIG_QUEUED_SPINLOCKS=y
-CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
-CONFIG_QUEUED_RWLOCKS=y
-CONFIG_FREEZER=y
+CONFIG_64BIT=y
+CONFIG_X86_64=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ARCH_MMAP_RND_BITS_MIN=28
+CONFIG_ARCH_MMAP_RND_BITS_MAX=32
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_FILTER_PGPROT=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+CONFIG_ZONE_DMA32=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_INTEL_TXT=y
+CONFIG_X86_64_SMP=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_PGTABLE_LEVELS=4
+CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
 
 #
 # Processor type and features
@@ -433,16 +269,12 @@ CONFIG_FREEZER=y
 CONFIG_ZONE_DMA=y
 CONFIG_SMP=y
 CONFIG_X86_FEATURE_NAMES=y
-CONFIG_X86_FAST_FEATURE_TESTS=y
 # CONFIG_X86_X2APIC is not set
 CONFIG_X86_MPPARSE=y
 # CONFIG_GOLDFISH is not set
 CONFIG_RETPOLINE=y
 # CONFIG_INTEL_RDT is not set
-CONFIG_X86_EXTENDED_PLATFORM=y
-# CONFIG_X86_VSMP is not set
-# CONFIG_X86_GOLDFISH is not set
-# CONFIG_X86_INTEL_MID is not set
+# CONFIG_X86_EXTENDED_PLATFORM is not set
 CONFIG_X86_INTEL_LPSS=y
 # CONFIG_X86_AMD_PLATFORM_DEVICE is not set
 CONFIG_IOSF_MBI=y
@@ -450,55 +282,48 @@ CONFIG_IOSF_MBI=y
 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_HYPERVISOR_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_DEBUG is not set
-# CONFIG_PARAVIRT_SPINLOCKS is not set
-# CONFIG_ACRN is not set
-# CONFIG_XEN is not set
-CONFIG_KVM_GUEST=y
-# CONFIG_KVM_DEBUG_FS is not set
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-CONFIG_PARAVIRT_CLOCK=y
+# CONFIG_PARAVIRT is not set
+# CONFIG_JAILHOUSE_GUEST is not set
 CONFIG_NO_BOOTMEM=y
 # CONFIG_MK8 is not set
 # CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
+CONFIG_MCORE2=y
 # CONFIG_MATOM is not set
-CONFIG_GENERIC_CPU=y
+# CONFIG_GENERIC_CPU is not set
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_P6_NOP=y
 CONFIG_X86_TSC=y
 CONFIG_X86_CMPXCHG64=y
 CONFIG_X86_CMOV=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=64
 CONFIG_X86_DEBUGCTLMSR=y
-CONFIG_PROCESSOR_SELECT=y
+# CONFIG_PROCESSOR_SELECT is not set
 CONFIG_CPU_SUP_INTEL=y
 CONFIG_CPU_SUP_AMD=y
 CONFIG_CPU_SUP_CENTAUR=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_DMI=y
-# CONFIG_GART_IOMMU is not set
+CONFIG_GART_IOMMU=y
 # CONFIG_CALGARY_IOMMU is not set
-CONFIG_SWIOTLB=y
-CONFIG_IOMMU_HELPER=y
 # CONFIG_MAXSMP is not set
-CONFIG_NR_CPUS=8
+CONFIG_NR_CPUS_RANGE_BEGIN=2
+CONFIG_NR_CPUS_RANGE_END=512
+CONFIG_NR_CPUS_DEFAULT=64
+CONFIG_NR_CPUS=32
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_MC_PRIO=y
-# CONFIG_PREEMPT_NONE is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
-CONFIG_PREEMPT_COUNT=y
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
-# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_X86_MCE=y
 # CONFIG_X86_MCELOG_LEGACY is not set
 CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
+# CONFIG_X86_MCE_AMD is not set
 CONFIG_X86_MCE_THRESHOLD=y
 # CONFIG_X86_MCE_INJECT is not set
 CONFIG_X86_THERMAL_VECTOR=y
@@ -510,20 +335,16 @@ CONFIG_PERF_EVENTS_INTEL_UNCORE=y
 CONFIG_PERF_EVENTS_INTEL_RAPL=y
 CONFIG_PERF_EVENTS_INTEL_CSTATE=y
 # CONFIG_PERF_EVENTS_AMD_POWER is not set
-# CONFIG_VM86 is not set
-CONFIG_X86_16BIT=y
-CONFIG_X86_ESPFIX64=y
+# CONFIG_X86_16BIT is not set
 CONFIG_X86_VSYSCALL_EMULATION=y
 CONFIG_I8K=m
 CONFIG_MICROCODE=y
 CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
+# CONFIG_MICROCODE_AMD is not set
 CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_X86_MSR=y
+# CONFIG_X86_MSR is not set
 CONFIG_X86_CPUID=y
 # CONFIG_X86_5LEVEL is not set
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_X86_DIRECT_GBPAGES=y
 CONFIG_ARCH_HAS_MEM_ENCRYPT=y
 # CONFIG_AMD_MEM_ENCRYPT is not set
@@ -533,67 +354,24 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_PROC_KCORE_TEXT=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_HAVE_MEMBLOCK=y
-CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_HAVE_GENERIC_GUP=y
-CONFIG_ARCH_DISCARD_MEMBLOCK=y
-# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
-# CONFIG_MEMORY_HOTPLUG is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
-CONFIG_MEMORY_BALLOON=y
-CONFIG_BALLOON_COMPACTION=y
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-# CONFIG_MEMORY_FAILURE is not set
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
-CONFIG_ARCH_WANTS_THP_SWAP=y
-CONFIG_CLEANCACHE=y
-CONFIG_FRONTSWAP=y
-# CONFIG_CMA is not set
-# CONFIG_ZSWAP is not set
-# CONFIG_ZPOOL is not set
-# CONFIG_ZBUD is not set
-# CONFIG_ZSMALLOC is not set
-# CONFIG_DEBUG_PANIC_ON_BAD_PAGE is not set
-CONFIG_GENERIC_EARLY_IOREMAP=y
-CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
-# CONFIG_IDLE_PAGE_TRACKING is not set
-CONFIG_ARCH_HAS_ZONE_DEVICE=y
-CONFIG_FRAME_VECTOR=y
-CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
-CONFIG_ARCH_HAS_PKEYS=y
-# CONFIG_PERCPU_STATS is not set
 # CONFIG_X86_PMEM_LEGACY is not set
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_CHECK_BIOS_CORRUPTION=y
+CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_RESERVE_LOW=64
 CONFIG_MTRR=y
-# CONFIG_MTRR_SANITIZER is not set
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
-# CONFIG_X86_SMAP is not set
-# CONFIG_X86_INTEL_UMIP is not set
+CONFIG_X86_SMAP=y
+CONFIG_X86_INTEL_UMIP=y
 # CONFIG_X86_INTEL_MPX is not set
 CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
-CONFIG_EFI_MIXED=y
+# CONFIG_EFI_MIXED is not set
 CONFIG_SECCOMP=y
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_250 is not set
@@ -608,14 +386,14 @@ CONFIG_PHYSICAL_START=0x1000000
 CONFIG_RELOCATABLE=y
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_X86_NEED_RELOCS=y
-CONFIG_PHYSICAL_ALIGN=0x200000
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_DYNAMIC_MEMORY_LAYOUT=y
 CONFIG_RANDOMIZE_MEMORY=y
 CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0x0
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 # CONFIG_COMPAT_VDSO is not set
-# CONFIG_LEGACY_VSYSCALL_NATIVE is not set
 CONFIG_LEGACY_VSYSCALL_EMULATE=y
 # CONFIG_LEGACY_VSYSCALL_NONE is not set
 # CONFIG_CMDLINE_BOOL is not set
@@ -624,6 +402,9 @@ CONFIG_HAVE_LIVEPATCH=y
 # CONFIG_LIVEPATCH is not set
 CONFIG_ARCH_HAS_ADD_PAGES=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
+CONFIG_ARCH_ENABLE_THP_MIGRATION=y
 
 #
 # Power management and ACPI options
@@ -636,32 +417,36 @@ CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_AUTOSLEEP=y
 CONFIG_PM_WAKELOCKS=y
-CONFIG_PM_WAKELOCKS_LIMIT=0
-# CONFIG_PM_WAKELOCKS_GC is not set
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_GC=y
 CONFIG_PM=y
 CONFIG_PM_DEBUG=y
-# CONFIG_PM_ADVANCED_DEBUG is not set
+CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_PM_SLEEP_DEBUG=y
 # CONFIG_DPM_WATCHDOG is not set
 CONFIG_PM_TRACE=y
 CONFIG_PM_TRACE_RTC=y
 CONFIG_PM_CLK=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
+CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
+CONFIG_ARCH_SUPPORTS_ACPI=y
 CONFIG_ACPI=y
 CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
 CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
 CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
 # CONFIG_ACPI_DEBUGGER is not set
+CONFIG_ACPI_SPCR_TABLE=y
+CONFIG_ACPI_LPIT=y
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS_POWER is not set
 CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
-CONFIG_ACPI_EC_DEBUGFS=y
+# CONFIG_ACPI_EC_DEBUGFS is not set
 CONFIG_ACPI_AC=y
 CONFIG_ACPI_BATTERY=y
 CONFIG_ACPI_BUTTON=y
 CONFIG_ACPI_VIDEO=y
 CONFIG_ACPI_FAN=y
+# CONFIG_ACPI_TAD is not set
 CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_CPU_FREQ_PSS=y
 CONFIG_ACPI_PROCESSOR_CSTATE=y
@@ -669,18 +454,16 @@ CONFIG_ACPI_PROCESSOR_IDLE=y
 CONFIG_ACPI_CPPC_LIB=y
 CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=y
+# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
 CONFIG_ACPI_THERMAL=y
-# CONFIG_ACPI_CUSTOM_DSDT is not set
 CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_TABLE_UPGRADE=y
 # CONFIG_ACPI_DEBUG is not set
 # CONFIG_ACPI_PCI_SLOT is not set
-CONFIG_X86_PM_TIMER=y
 CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_HOTPLUG_IOAPIC=y
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=m
+# CONFIG_ACPI_SBS is not set
+# CONFIG_ACPI_HED is not set
 # CONFIG_ACPI_CUSTOM_METHOD is not set
 # CONFIG_ACPI_BGRT is not set
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
@@ -697,6 +480,7 @@ CONFIG_PMIC_OPREGION=y
 CONFIG_CRC_PMIC_OPREGION=y
 CONFIG_BXT_WC_PMIC_OPREGION=y
 # CONFIG_ACPI_CONFIGFS is not set
+CONFIG_X86_PM_TIMER=y
 # CONFIG_SFI is not set
 
 #
@@ -705,7 +489,7 @@ CONFIG_BXT_WC_PMIC_OPREGION=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_GOV_ATTR_SET=y
 CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_STAT=y
+# CONFIG_CPU_FREQ_STAT is not set
 # CONFIG_CPU_FREQ_TIMES is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
@@ -715,28 +499,26 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
 # CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set
 
 #
 # CPU frequency scaling drivers
 #
-# CONFIG_CPUFREQ_DT is not set
 CONFIG_X86_INTEL_PSTATE=y
-CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_PCC_CPUFREQ=y
+CONFIG_X86_ACPI_CPUFREQ=y
 CONFIG_X86_ACPI_CPUFREQ_CPB=y
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_AMD_FREQ_SENSITIVITY=m
+# CONFIG_X86_POWERNOW_K8 is not set
+# CONFIG_X86_AMD_FREQ_SENSITIVITY is not set
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
-CONFIG_X86_P4_CLOCKMOD=m
+# CONFIG_X86_P4_CLOCKMOD is not set
 
 #
 # shared options
 #
-CONFIG_X86_SPEEDSTEP_LIB=m
 
 #
 # CPU Idle
@@ -744,7 +526,6 @@ CONFIG_X86_SPEEDSTEP_LIB=m
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 CONFIG_INTEL_IDLE=y
 
 #
@@ -754,50 +535,52 @@ CONFIG_PCI=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_MMCONF_FAM10H=y
 # CONFIG_PCI_CNB20LE_QUIRK is not set
 CONFIG_PCIEPORTBUS=y
-# CONFIG_HOTPLUG_PCI_PCIE is not set
+CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIEAER=y
+# CONFIG_PCIEAER_INJECT is not set
 # CONFIG_PCIE_ECRC is not set
-CONFIG_PCIEAER_INJECT=m
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_DEFAULT is not set
+CONFIG_PCIEASPM_POWERSAVE=y
 # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 # CONFIG_PCIE_DPC is not set
 # CONFIG_PCIE_PTM is not set
-CONFIG_PCI_BUS_ADDR_T_64BIT=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
+CONFIG_PCI_QUIRKS=y
 # CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
 # CONFIG_PCI_STUB is not set
-CONFIG_HT_IRQ=y
 CONFIG_PCI_LOCKLESS_CONFIG=y
 # CONFIG_PCI_IOV is not set
 # CONFIG_PCI_PRI is not set
 # CONFIG_PCI_PASID is not set
 CONFIG_PCI_LABEL=y
-# CONFIG_PCI_HYPERV is not set
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
 # CONFIG_HOTPLUG_PCI_CPCI is not set
-CONFIG_HOTPLUG_PCI_SHPC=m
+# CONFIG_HOTPLUG_PCI_SHPC is not set
 
 #
-# DesignWare PCI Core Support
+# PCI controller drivers
 #
-# CONFIG_PCIE_DW_PLAT is not set
 
 #
-# PCI host controller drivers
+# Cadence PCIe controllers support
 #
 # CONFIG_VMD is not set
 
+#
+# DesignWare PCI Core Support
+#
+# CONFIG_PCIE_DW_PLAT_HOST is not set
+
 #
 # PCI Endpoint
 #
@@ -810,247 +593,519 @@ CONFIG_HOTPLUG_PCI_SHPC=m
 # CONFIG_ISA_BUS is not set
 CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-# CONFIG_PCMCIA_LOAD_CIS is not set
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_PCCARD_NONSTATIC=y
+# CONFIG_PCCARD is not set
 # CONFIG_RAPIDIO is not set
-# CONFIG_X86_SYSFB is not set
+CONFIG_X86_SYSFB=y
 
 #
-# Executable file formats / Emulations
+# Binary Emulations
 #
-CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=y
-CONFIG_ELFCORE=y
-CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-CONFIG_BINFMT_SCRIPT=y
-# CONFIG_HAVE_AOUT is not set
-# CONFIG_BINFMT_MISC is not set
-CONFIG_COREDUMP=y
 CONFIG_IA32_EMULATION=y
 # CONFIG_IA32_AOUT is not set
-CONFIG_X86_X32=y
+# CONFIG_X86_X32 is not set
 CONFIG_COMPAT_32=y
 CONFIG_COMPAT=y
 CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
 CONFIG_X86_DEV_DMA_OPS=y
-CONFIG_NET=y
-CONFIG_COMPAT_NETLINK_MESSAGES=y
-CONFIG_NET_INGRESS=y
-CONFIG_NET_EGRESS=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-# CONFIG_PACKET_DIAG is not set
-CONFIG_UNIX=y
-# CONFIG_UNIX_DIAG is not set
-# CONFIG_TLS is not set
-CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=y
-CONFIG_XFRM_USER=y
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_IPCOMP=y
-CONFIG_NET_KEY=y
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MULTIPLE_TABLES=y
-# CONFIG_IP_ROUTE_MULTIPATH is not set
-# CONFIG_IP_ROUTE_VERBOSE is not set
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-# CONFIG_IP_PNP_BOOTP is not set
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE_DEMUX is not set
-CONFIG_NET_IP_TUNNEL=y
-# CONFIG_IP_MROUTE is not set
-CONFIG_SYN_COOKIES=y
-# CONFIG_NET_IPVTI is not set
-CONFIG_NET_UDP_TUNNEL=m
-# CONFIG_NET_FOU is not set
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-# CONFIG_INET_AH is not set
-CONFIG_INET_ESP=y
-# CONFIG_INET_ESP_OFFLOAD is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-CONFIG_INET_TUNNEL=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-# CONFIG_INET_XFRM_MODE_BEET is not set
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-CONFIG_INET_UDP_DIAG=m
-# CONFIG_INET_RAW_DIAG is not set
-CONFIG_INET_DIAG_DESTROY=y
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_INET6_AH=y
-CONFIG_INET6_ESP=y
-# CONFIG_INET6_ESP_OFFLOAD is not set
-CONFIG_INET6_IPCOMP=y
-CONFIG_IPV6_MIP6=y
-# CONFIG_IPV6_ILA is not set
-CONFIG_INET6_XFRM_TUNNEL=y
-CONFIG_INET6_TUNNEL=y
-CONFIG_INET6_XFRM_MODE_TRANSPORT=y
-CONFIG_INET6_XFRM_MODE_TUNNEL=y
-CONFIG_INET6_XFRM_MODE_BEET=y
-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-# CONFIG_IPV6_VTI is not set
-CONFIG_IPV6_SIT=y
-# CONFIG_IPV6_SIT_6RD is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=y
-# CONFIG_IPV6_FOU is not set
-# CONFIG_IPV6_FOU_TUNNEL is not set
-CONFIG_IPV6_MULTIPLE_TABLES=y
-# CONFIG_IPV6_SUBTREES is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_IPV6_SEG6_LWTUNNEL is not set
-# CONFIG_IPV6_SEG6_HMAC is not set
-# CONFIG_NETLABEL is not set
-CONFIG_ANDROID_PARANOID_NETWORK=y
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NET_PTP_CLASSIFY=y
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-CONFIG_NETFILTER=y
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=m
+CONFIG_HAVE_GENERIC_GUP=y
 
 #
-# Core Netfilter Configuration
+# Firmware Drivers
 #
-CONFIG_NETFILTER_INGRESS=y
-CONFIG_NETFILTER_NETLINK=y
-# CONFIG_NETFILTER_NETLINK_ACCT is not set
-CONFIG_NETFILTER_NETLINK_QUEUE=y
-CONFIG_NETFILTER_NETLINK_LOG=y
-CONFIG_NF_CONNTRACK=y
-# CONFIG_NF_LOG_NETDEV is not set
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_PROCFS=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-# CONFIG_NF_CONNTRACK_TIMEOUT is not set
-# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_GRE=y
-CONFIG_NF_CT_PROTO_SCTP=y
-CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_NF_CONNTRACK_AMANDA=y
-CONFIG_NF_CONNTRACK_FTP=y
-CONFIG_NF_CONNTRACK_H323=y
-CONFIG_NF_CONNTRACK_IRC=y
-CONFIG_NF_CONNTRACK_BROADCAST=y
-CONFIG_NF_CONNTRACK_NETBIOS_NS=y
-# CONFIG_NF_CONNTRACK_SNMP is not set
-CONFIG_NF_CONNTRACK_PPTP=y
-CONFIG_NF_CONNTRACK_SANE=y
-# CONFIG_NF_CONNTRACK_SIP is not set
-CONFIG_NF_CONNTRACK_TFTP=y
-CONFIG_NF_CT_NETLINK=y
-# CONFIG_NF_CT_NETLINK_TIMEOUT is not set
-# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set
-CONFIG_NF_NAT=y
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_NF_NAT_PROTO_DCCP=y
-CONFIG_NF_NAT_PROTO_UDPLITE=y
-CONFIG_NF_NAT_PROTO_SCTP=y
-CONFIG_NF_NAT_AMANDA=y
-CONFIG_NF_NAT_FTP=y
-CONFIG_NF_NAT_IRC=y
-# CONFIG_NF_NAT_SIP is not set
-CONFIG_NF_NAT_TFTP=y
-CONFIG_NF_NAT_REDIRECT=y
-# CONFIG_NF_TABLES is not set
-CONFIG_NETFILTER_XTABLES=y
+CONFIG_EDD=y
+# CONFIG_EDD_OFF is not set
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_DELL_RBU=y
+CONFIG_DCDBAS=y
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=y
+CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
+# CONFIG_ISCSI_IBFT_FIND is not set
+# CONFIG_FW_CFG_SYSFS is not set
+# CONFIG_GOOGLE_FIRMWARE is not set
 
 #
-# Xtables combined modules
+# EFI (Extensible Firmware Interface) Support
 #
-CONFIG_NETFILTER_XT_MARK=y
-CONFIG_NETFILTER_XT_CONNMARK=y
+CONFIG_EFI_VARS=y
+CONFIG_EFI_ESRT=y
+# CONFIG_EFI_VARS_PSTORE is not set
+# CONFIG_EFI_FAKE_MEMMAP is not set
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_EFI_BOOTLOADER_CONTROL=y
+# CONFIG_EFI_CAPSULE_LOADER is not set
+# CONFIG_EFI_TEST is not set
+# CONFIG_APPLE_PROPERTIES is not set
+# CONFIG_RESET_ATTACK_MITIGATION is not set
+CONFIG_UEFI_CPER=y
+CONFIG_UEFI_CPER_X86=y
 
 #
-# Xtables targets
+# Tegra firmware driver
 #
-# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
-# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
-# CONFIG_NETFILTER_XT_TARGET_CT is not set
-# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-# CONFIG_NETFILTER_XT_TARGET_HL is not set
-# CONFIG_NETFILTER_XT_TARGET_HMARK is not set
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
-# CONFIG_NETFILTER_XT_TARGET_LED is not set
-# CONFIG_NETFILTER_XT_TARGET_LOG is not set
-CONFIG_NETFILTER_XT_TARGET_MARK=y
-CONFIG_NETFILTER_XT_NAT=y
-CONFIG_NETFILTER_XT_TARGET_NETMAP=y
-CONFIG_NETFILTER_XT_TARGET_NFLOG=y
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
-# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
-# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=y
-# CONFIG_NETFILTER_XT_TARGET_TEE is not set
-CONFIG_NETFILTER_XT_TARGET_TPROXY=y
-CONFIG_NETFILTER_XT_TARGET_TRACE=y
-CONFIG_NETFILTER_XT_TARGET_SECMARK=y
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
-# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
+CONFIG_HAVE_KVM=y
+CONFIG_VIRTUALIZATION=y
+# CONFIG_KVM is not set
+# CONFIG_VHOST_NET is not set
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
 
 #
-# Xtables matches
+# General architecture-dependent options
 #
-# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_BPF is not set
-# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set
-# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
-CONFIG_NETFILTER_XT_MATCH_COMMENT=y
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y
-# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
-# CONFIG_NETFILTER_XT_MATCH_CPU is not set
-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
-# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-CONFIG_NETFILTER_XT_MATCH_ECN=y
-# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
-CONFIG_NETFILTER_XT_MATCH_HELPER=y
-CONFIG_NETFILTER_XT_MATCH_HL=y
+CONFIG_CRASH_CORE=y
+CONFIG_HOTPLUG_SMT=y
+# CONFIG_OPROFILE is not set
+CONFIG_HAVE_OPROFILE=y
+CONFIG_OPROFILE_NMI_TIMER=y
+# CONFIG_KPROBES is not set
+CONFIG_JUMP_LABEL=y
+# CONFIG_STATIC_KEYS_SELFTEST is not set
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_KPROBES_ON_FTRACE=y
+CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
+CONFIG_HAVE_NMI=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
+CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_STACKPROTECTOR=y
+CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_HAVE_EXIT_THREAD=y
+CONFIG_ARCH_MMAP_RND_BITS=28
+CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
+CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y
+CONFIG_HAVE_COPY_THREAD_TLS=y
+CONFIG_HAVE_STACK_VALIDATION=y
+CONFIG_HAVE_RELIABLE_STACKTRACE=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_COMPAT_OLD_SIGACTION=y
+CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_HAVE_ARCH_VMAP_STACK=y
+CONFIG_VMAP_STACK=y
+CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
+CONFIG_STRICT_KERNEL_RWX=y
+CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
+CONFIG_STRICT_MODULE_RWX=y
+CONFIG_ARCH_HAS_REFCOUNT=y
+# CONFIG_REFCOUNT_FULL is not set
+CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+CONFIG_PLUGIN_HOSTCC=""
+CONFIG_HAVE_GCC_PLUGINS=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_MODULE_SIG=y
+CONFIG_MODULE_SIG_FORCE=y
+CONFIG_MODULE_SIG_ALL=y
+# CONFIG_MODULE_SIG_SHA1 is not set
+# CONFIG_MODULE_SIG_SHA224 is not set
+# CONFIG_MODULE_SIG_SHA256 is not set
+# CONFIG_MODULE_SIG_SHA384 is not set
+CONFIG_MODULE_SIG_SHA512=y
+CONFIG_MODULE_SIG_HASH="sha512"
+# CONFIG_MODULE_COMPRESS is not set
+# CONFIG_TRIM_UNUSED_KSYMS is not set
+CONFIG_MODULES_TREE_LOOKUP=y
+CONFIG_BLOCK=y
+CONFIG_BLK_SCSI_REQUEST=y
+CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_BSGLIB is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
+# CONFIG_BLK_DEV_ZONED is not set
+# CONFIG_BLK_CMDLINE_PARSER is not set
+# CONFIG_BLK_WBT is not set
+CONFIG_BLK_DEBUG_FS=y
+# CONFIG_BLK_SED_OPAL is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_AIX_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_CMDLINE_PARTITION is not set
+CONFIG_BLOCK_COMPAT=y
+CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_MQ_VIRTIO=y
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_MQ_IOSCHED_DEADLINE=y
+CONFIG_MQ_IOSCHED_KYBER=y
+# CONFIG_IOSCHED_BFQ is not set
+CONFIG_ASN1=y
+CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
+CONFIG_QUEUED_SPINLOCKS=y
+CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
+CONFIG_QUEUED_RWLOCKS=y
+CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y
+CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y
+CONFIG_FREEZER=y
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+CONFIG_ELFCORE=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_BINFMT_MISC=y
+CONFIG_COREDUMP=y
+
+#
+# Memory Management options
+#
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_ARCH_DISCARD_MEMBLOCK=y
+# CONFIG_MEMORY_HOTPLUG is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=8192
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+# CONFIG_MEMORY_FAILURE is not set
+CONFIG_TRANSPARENT_HUGEPAGE=y
+# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_ARCH_WANTS_THP_SWAP=y
+CONFIG_THP_SWAP=y
+CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
+# CONFIG_CLEANCACHE is not set
+# CONFIG_FRONTSWAP is not set
+# CONFIG_CMA is not set
+# CONFIG_ZPOOL is not set
+# CONFIG_ZBUD is not set
+CONFIG_ZSMALLOC=y
+# CONFIG_PGTABLE_MAPPING is not set
+# CONFIG_DEBUG_PANIC_ON_BAD_PAGE is not set
+# CONFIG_ZSMALLOC_STAT is not set
+CONFIG_GENERIC_EARLY_IOREMAP=y
+# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
+# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_ARCH_HAS_ZONE_DEVICE=y
+CONFIG_FRAME_VECTOR=y
+CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
+CONFIG_ARCH_HAS_PKEYS=y
+# CONFIG_PERCPU_STATS is not set
+# CONFIG_GUP_BENCHMARK is not set
+CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
+CONFIG_NET_INGRESS=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_DIAG is not set
+CONFIG_UNIX=y
+# CONFIG_UNIX_DIAG is not set
+# CONFIG_TLS is not set
+CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=y
+CONFIG_XFRM_USER=y
+# CONFIG_XFRM_INTERFACE is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=y
+CONFIG_NET_KEY=y
+# CONFIG_NET_KEY_MIGRATE is not set
+# CONFIG_XDP_SOCKETS is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
+CONFIG_IP_MULTIPLE_TABLES=y
+# CONFIG_IP_ROUTE_MULTIPATH is not set
+# CONFIG_IP_ROUTE_VERBOSE is not set
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE_DEMUX is not set
+CONFIG_NET_IP_TUNNEL=y
+# CONFIG_IP_MROUTE is not set
+CONFIG_SYN_COOKIES=y
+# CONFIG_NET_IPVTI is not set
+CONFIG_NET_UDP_TUNNEL=m
+# CONFIG_NET_FOU is not set
+# CONFIG_NET_FOU_IP_TUNNELS is not set
+# CONFIG_INET_AH is not set
+CONFIG_INET_ESP=y
+# CONFIG_INET_ESP_OFFLOAD is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+CONFIG_INET_TUNNEL=y
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+# CONFIG_INET_XFRM_MODE_BEET is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+CONFIG_INET_UDP_DIAG=m
+# CONFIG_INET_RAW_DIAG is not set
+CONFIG_INET_DIAG_DESTROY=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+# CONFIG_TCP_CONG_WESTWOOD is not set
+# CONFIG_TCP_CONG_HTCP is not set
+# CONFIG_TCP_CONG_HSTCP is not set
+# CONFIG_TCP_CONG_HYBLA is not set
+# CONFIG_TCP_CONG_VEGAS is not set
+# CONFIG_TCP_CONG_NV is not set
+# CONFIG_TCP_CONG_SCALABLE is not set
+# CONFIG_TCP_CONG_LP is not set
+# CONFIG_TCP_CONG_VENO is not set
+# CONFIG_TCP_CONG_YEAH is not set
+# CONFIG_TCP_CONG_ILLINOIS is not set
+# CONFIG_TCP_CONG_DCTCP is not set
+# CONFIG_TCP_CONG_CDG is not set
+# CONFIG_TCP_CONG_BBR is not set
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=y
+CONFIG_INET6_ESP=y
+# CONFIG_INET6_ESP_OFFLOAD is not set
+CONFIG_INET6_IPCOMP=y
+CONFIG_IPV6_MIP6=y
+# CONFIG_IPV6_ILA is not set
+CONFIG_INET6_XFRM_TUNNEL=y
+CONFIG_INET6_TUNNEL=y
+CONFIG_INET6_XFRM_MODE_TRANSPORT=y
+CONFIG_INET6_XFRM_MODE_TUNNEL=y
+CONFIG_INET6_XFRM_MODE_BEET=y
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_VTI=y
+CONFIG_IPV6_SIT=y
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=y
+CONFIG_IPV6_MULTIPLE_TABLES=y
+# CONFIG_IPV6_SUBTREES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_IPV6_SEG6_LWTUNNEL is not set
+# CONFIG_IPV6_SEG6_HMAC is not set
+# CONFIG_NETLABEL is not set
+CONFIG_ANDROID_PARANOID_NETWORK=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NET_PTP_CLASSIFY=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_NETLINK=y
+CONFIG_NETFILTER_FAMILY_ARP=y
+# CONFIG_NETFILTER_NETLINK_ACCT is not set
+CONFIG_NETFILTER_NETLINK_QUEUE=y
+CONFIG_NETFILTER_NETLINK_LOG=y
+# CONFIG_NETFILTER_NETLINK_OSF is not set
+CONFIG_NF_CONNTRACK=y
+# CONFIG_NF_LOG_NETDEV is not set
+CONFIG_NETFILTER_CONNCOUNT=y
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+# CONFIG_NF_CONNTRACK_ZONES is not set
+CONFIG_NF_CONNTRACK_PROCFS=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+# CONFIG_NF_CONNTRACK_TIMEOUT is not set
+# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
+# CONFIG_NF_CONNTRACK_LABELS is not set
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_GRE=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_CONNTRACK_AMANDA=y
+CONFIG_NF_CONNTRACK_FTP=y
+CONFIG_NF_CONNTRACK_H323=y
+CONFIG_NF_CONNTRACK_IRC=y
+CONFIG_NF_CONNTRACK_BROADCAST=y
+CONFIG_NF_CONNTRACK_NETBIOS_NS=y
+# CONFIG_NF_CONNTRACK_SNMP is not set
+CONFIG_NF_CONNTRACK_PPTP=y
+CONFIG_NF_CONNTRACK_SANE=y
+CONFIG_NF_CONNTRACK_SIP=y
+CONFIG_NF_CONNTRACK_TFTP=y
+CONFIG_NF_CT_NETLINK=y
+# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set
+CONFIG_NF_NAT=y
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_PROTO_DCCP=y
+CONFIG_NF_NAT_PROTO_UDPLITE=y
+CONFIG_NF_NAT_PROTO_SCTP=y
+CONFIG_NF_NAT_AMANDA=y
+CONFIG_NF_NAT_FTP=y
+CONFIG_NF_NAT_IRC=y
+CONFIG_NF_NAT_SIP=y
+CONFIG_NF_NAT_TFTP=y
+CONFIG_NF_NAT_REDIRECT=y
+# CONFIG_NF_TABLES is not set
+CONFIG_NETFILTER_XTABLES=y
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=y
+CONFIG_NETFILTER_XT_CONNMARK=y
+
+#
+# Xtables targets
+#
+# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
+# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
+# CONFIG_NETFILTER_XT_TARGET_CT is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_HL is not set
+# CONFIG_NETFILTER_XT_TARGET_HMARK is not set
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
+# CONFIG_NETFILTER_XT_TARGET_LED is not set
+# CONFIG_NETFILTER_XT_TARGET_LOG is not set
+CONFIG_NETFILTER_XT_TARGET_MARK=y
+CONFIG_NETFILTER_XT_NAT=y
+CONFIG_NETFILTER_XT_TARGET_NETMAP=y
+CONFIG_NETFILTER_XT_TARGET_NFLOG=y
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=y
+# CONFIG_NETFILTER_XT_TARGET_TEE is not set
+CONFIG_NETFILTER_XT_TARGET_TPROXY=y
+CONFIG_NETFILTER_XT_TARGET_TRACE=y
+CONFIG_NETFILTER_XT_TARGET_SECMARK=y
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
+
+#
+# Xtables matches
+#
+# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_BPF is not set
+# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set
+# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
+CONFIG_NETFILTER_XT_MATCH_COMMENT=y
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y
+# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
+# CONFIG_NETFILTER_XT_MATCH_CPU is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+CONFIG_NETFILTER_XT_MATCH_ECN=y
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
+CONFIG_NETFILTER_XT_MATCH_HELPER=y
+CONFIG_NETFILTER_XT_MATCH_HL=y
 # CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
 CONFIG_NETFILTER_XT_MATCH_L2TP=m
@@ -1089,6 +1144,7 @@ CONFIG_NETFILTER_XT_MATCH_U32=y
 CONFIG_NF_DEFRAG_IPV4=y
 CONFIG_NF_CONNTRACK_IPV4=y
 CONFIG_NF_SOCKET_IPV4=y
+CONFIG_NF_TPROXY_IPV4=y
 # CONFIG_NF_DUP_IPV4 is not set
 # CONFIG_NF_LOG_ARP is not set
 # CONFIG_NF_LOG_IPV4 is not set
@@ -1126,6 +1182,7 @@ CONFIG_IP_NF_ARP_MANGLE=y
 CONFIG_NF_DEFRAG_IPV6=y
 CONFIG_NF_CONNTRACK_IPV6=y
 CONFIG_NF_SOCKET_IPV6=y
+CONFIG_NF_TPROXY_IPV6=y
 # CONFIG_NF_DUP_IPV6 is not set
 CONFIG_NF_REJECT_IPV6=y
 # CONFIG_NF_LOG_IPV6 is not set
@@ -1141,6 +1198,7 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=y
 # CONFIG_IP6_NF_MATCH_MH is not set
 CONFIG_IP6_NF_MATCH_RPFILTER=y
 # CONFIG_IP6_NF_MATCH_RT is not set
+# CONFIG_IP6_NF_MATCH_SRH is not set
 # CONFIG_IP6_NF_TARGET_HL is not set
 CONFIG_IP6_NF_FILTER=y
 CONFIG_IP6_NF_TARGET_REJECT=y
@@ -1167,9 +1225,7 @@ CONFIG_HAVE_NET_DSA=y
 # CONFIG_NET_DSA is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set
-CONFIG_LLC=m
 # CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
@@ -1198,6 +1254,7 @@ CONFIG_NET_SCH_HTB=y
 # CONFIG_NET_SCH_NETEM is not set
 # CONFIG_NET_SCH_DRR is not set
 # CONFIG_NET_SCH_MQPRIO is not set
+# CONFIG_NET_SCH_SKBPRIO is not set
 # CONFIG_NET_SCH_CHOKE is not set
 # CONFIG_NET_SCH_QFQ is not set
 # CONFIG_NET_SCH_CODEL is not set
@@ -1234,6 +1291,8 @@ CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_EMATCH_U32=y
 # CONFIG_NET_EMATCH_META is not set
 # CONFIG_NET_EMATCH_TEXT is not set
+# CONFIG_NET_EMATCH_CANID is not set
+# CONFIG_NET_EMATCH_IPT is not set
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_POLICE=y
 CONFIG_NET_ACT_GACT=y
@@ -1274,6 +1333,7 @@ CONFIG_XPS=y
 CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
 # CONFIG_BPF_JIT is not set
+# CONFIG_BPF_STREAM_PARSER is not set
 CONFIG_NET_FLOW_LIMIT=y
 
 #
@@ -1305,6 +1365,7 @@ CONFIG_BT_BCM=m
 CONFIG_BT_RTL=m
 CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set
 CONFIG_BT_HCIBTUSB_BCM=y
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
@@ -1343,6 +1404,8 @@ CONFIG_CFG80211=m
 # CONFIG_NL80211_TESTMODE is not set
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
 # CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
+CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
 CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEBUGFS is not set
 # CONFIG_CFG80211_INTERNAL_REGDB is not set
@@ -1385,6 +1448,7 @@ CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
 # CONFIG_NET_DEVLINK is not set
 CONFIG_MAY_USE_DEVLINK=y
+# CONFIG_FAILOVER is not set
 CONFIG_HAVE_EBPF_JIT=y
 
 #
@@ -1399,163 +1463,41 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_DEVTMPFS is not set
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
 CONFIG_FW_LOADER=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
-CONFIG_WANT_DEV_COREDUMP=y
+CONFIG_FW_LOADER_USER_HELPER=y
+CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
 CONFIG_ALLOW_DEV_COREDUMP=y
-CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
+CONFIG_DEBUG_DEVRES=y
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPI=y
-CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
-# CONFIG_REGMAP_SDW is not set
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
 
 #
 # Bus devices
 #
-# CONFIG_SIMPLE_PM_BUS is not set
 # CONFIG_DVC_TRACE_BUS is not set
-CONFIG_CONNECTOR=m
-CONFIG_MTD=m
-# CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_OF_PARTS=m
-# CONFIG_MTD_AR7_PARTS is not set
-
-#
-# Partition parsers
-#
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-# CONFIG_MTD_BLOCK_RO is not set
-CONFIG_FTL=m
-CONFIG_NFTL=m
-# CONFIG_NFTL_RW is not set
-CONFIG_INFTL=m
-CONFIG_RFD_FTL=m
-CONFIG_SSFDC=m
-CONFIG_SM_FTL=m
-CONFIG_MTD_OOPS=m
-# CONFIG_MTD_SWAP is not set
-# CONFIG_MTD_PARTITIONED_MASTER is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-# CONFIG_MTD_CFI is not set
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-# CONFIG_MTD_PLATRAM is not set
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_MCHP23K256 is not set
-# CONFIG_MTD_SST25L is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOCG3 is not set
-CONFIG_MTD_NAND_ECC=m
-# CONFIG_MTD_NAND_ECC_SMC is not set
-CONFIG_MTD_NAND=m
-# CONFIG_MTD_NAND_ECC_BCH is not set
-# CONFIG_MTD_SM_COMMON is not set
-# CONFIG_MTD_NAND_DENALI_PCI is not set
-# CONFIG_MTD_NAND_DENALI_DT is not set
-# CONFIG_MTD_NAND_GPIO is not set
-# CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set
-# CONFIG_MTD_NAND_RICOH is not set
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_DOCG4 is not set
-# CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-CONFIG_MTD_ONENAND=m
-# CONFIG_MTD_ONENAND_VERIFY_WRITE is not set
-# CONFIG_MTD_ONENAND_GENERIC is not set
-# CONFIG_MTD_ONENAND_OTP is not set
-# CONFIG_MTD_ONENAND_2X_PROGRAM is not set
-
-#
-# LPDDR & LPDDR2 PCM memory drivers
-#
-CONFIG_MTD_LPDDR=m
-CONFIG_MTD_QINFO_PROBE=m
-# CONFIG_MTD_SPI_NOR is not set
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_LIMIT=20
-# CONFIG_MTD_UBI_FASTMAP is not set
-CONFIG_MTD_UBI_GLUEBI=m
-# CONFIG_MTD_UBI_BLOCK is not set
-CONFIG_OF=y
-# CONFIG_OF_UNITTEST is not set
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_ADDRESS_PCI=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
-CONFIG_OF_MDIO=m
-CONFIG_OF_PCI=y
-CONFIG_OF_PCI_IRQ=y
-# CONFIG_OF_OVERLAY is not set
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+# CONFIG_GNSS is not set
+# CONFIG_MTD is not set
+# CONFIG_OF is not set
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_AX88796=m
-# CONFIG_PARPORT_1284 is not set
-CONFIG_PARPORT_NOT_PC=y
+# CONFIG_PARPORT is not set
 CONFIG_PNP=y
-CONFIG_PNP_DEBUG_MESSAGES=y
+# CONFIG_PNP_DEBUG_MESSAGES is not set
 
 #
 # Protocols
@@ -1564,38 +1506,13 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
 # CONFIG_BLK_DEV_FD is not set
-CONFIG_PARIDE=m
-
-#
-# Parallel IDE high-level drivers
-#
-CONFIG_PARIDE_PD=m
-# CONFIG_PARIDE_PCD is not set
-# CONFIG_PARIDE_PF is not set
-# CONFIG_PARIDE_PT is not set
-# CONFIG_PARIDE_PG is not set
-
-#
-# Parallel IDE protocol modules
-#
-# CONFIG_PARIDE_ATEN is not set
-# CONFIG_PARIDE_BPCK is not set
-# CONFIG_PARIDE_COMM is not set
-# CONFIG_PARIDE_DSTR is not set
-# CONFIG_PARIDE_FIT2 is not set
-# CONFIG_PARIDE_FIT3 is not set
-# CONFIG_PARIDE_EPAT is not set
-# CONFIG_PARIDE_EPIA is not set
-# CONFIG_PARIDE_FRIQ is not set
-# CONFIG_PARIDE_FRPW is not set
-# CONFIG_PARIDE_KBIC is not set
-# CONFIG_PARIDE_KTTI is not set
-# CONFIG_PARIDE_ON20 is not set
-# CONFIG_PARIDE_ON26 is not set
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_CDROM=y
+# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
+CONFIG_ZRAM=y
+# CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZRAM_MEMORY_TRACKING is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -1605,83 +1522,75 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # CONFIG_BLK_DEV_SX8 is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_BLK_DEV_RAM_SIZE=16384
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-CONFIG_VIRTIO_BLK=y
-# CONFIG_VIRTIO_BLK_SCSI is not set
+# CONFIG_VIRTIO_BLK is not set
 # CONFIG_BLK_DEV_RBD is not set
 # CONFIG_BLK_DEV_RSXX is not set
-CONFIG_NVME_CORE=y
-CONFIG_BLK_DEV_NVME=y
+
+#
+# NVME Support
+#
+# CONFIG_BLK_DEV_NVME is not set
 # CONFIG_NVME_FC is not set
 # CONFIG_NVME_TARGET is not set
 
 #
 # Misc devices
 #
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_I2C=m
-# CONFIG_AD525X_DPOT_SPI is not set
+# CONFIG_AD525X_DPOT is not set
 # CONFIG_DUMMY_IRQ is not set
 # CONFIG_IBM_ASM is not set
 # CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
-CONFIG_TIFM_CORE=m
-CONFIG_TIFM_7XX1=m
-CONFIG_ICS932S401=m
-CONFIG_ENCLOSURE_SERVICES=m
+# CONFIG_TIFM_CORE is not set
+# CONFIG_ICS932S401 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
 # CONFIG_HP_ILO is not set
-CONFIG_APDS9802ALS=m
-CONFIG_ISL29003=m
-CONFIG_ISL29020=m
-CONFIG_SENSORS_TSL2550=m
-CONFIG_SENSORS_BH1770=m
-CONFIG_SENSORS_APDS990X=m
-CONFIG_HMC6352=m
+# CONFIG_APDS9802ALS is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_ISL29020 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_SENSORS_BH1770 is not set
+# CONFIG_SENSORS_APDS990X is not set
+# CONFIG_HMC6352 is not set
 # CONFIG_DS1682 is not set
-# CONFIG_TI_DAC7512 is not set
-CONFIG_VMWARE_BALLOON=m
-CONFIG_USB_SWITCH_FSA9480=m
+# CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 # CONFIG_SRAM is not set
 # CONFIG_PCI_ENDPOINT_TEST is not set
 CONFIG_UID_SYS_STATS=y
 # CONFIG_UID_SYS_STATS_DEBUG is not set
-CONFIG_MEMORY_STATE_TIME=y
-CONFIG_C2PORT=m
-CONFIG_C2PORT_DURAMAR_2150=m
+# CONFIG_MEMORY_STATE_TIME is not set
+# CONFIG_C2PORT is not set
 
 #
 # EEPROM support
 #
-CONFIG_EEPROM_AT24=m
+# CONFIG_EEPROM_AT24 is not set
 # CONFIG_EEPROM_AT25 is not set
 # CONFIG_EEPROM_LEGACY is not set
 # CONFIG_EEPROM_MAX6875 is not set
 CONFIG_EEPROM_93CX6=m
 # CONFIG_EEPROM_93XX46 is not set
 # CONFIG_EEPROM_IDT_89HPESX is not set
-CONFIG_CB710_CORE=m
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+# CONFIG_CB710_CORE is not set
 
 #
 # Texas Instruments shared transport line discipline
 #
-CONFIG_TI_ST=m
-CONFIG_SENSORS_LIS3_I2C=m
+# CONFIG_TI_ST is not set
+# CONFIG_SENSORS_LIS3_I2C is not set
+# CONFIG_ALTERA_STAPL is not set
+CONFIG_INTEL_MEI=y
+CONFIG_INTEL_MEI_ME=y
+CONFIG_INTEL_MEI_TXE=y
+# CONFIG_VMWARE_VMCI is not set
 
 #
-# Altera FPGA firmware download module
+# Intel MIC & related support
 #
-CONFIG_ALTERA_STAPL=m
-# CONFIG_INTEL_MEI is not set
-# CONFIG_INTEL_MEI_ME is not set
-# CONFIG_INTEL_MEI_TXE is not set
-# CONFIG_INTEL_MEI_VIRTIO is not set
-CONFIG_VMWARE_VMCI=m
 
 #
 # Intel MIC Bus Driver
@@ -1718,65 +1627,11 @@ CONFIG_VMWARE_VMCI=m
 # VOP Driver
 #
 # CONFIG_GENWQE is not set
-CONFIG_ECHO=m
-# CONFIG_CXL_BASE is not set
-# CONFIG_CXL_AFU_DRIVER_OPS is not set
-# CONFIG_CXL_LIB is not set
+# CONFIG_ECHO is not set
+# CONFIG_MISC_RTSX_PCI is not set
+# CONFIG_MISC_RTSX_USB is not set
 CONFIG_HAVE_IDE=y
-CONFIG_IDE=m
-
-#
-# Please see Documentation/ide/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=m
-CONFIG_IDE_GD_ATA=y
-# CONFIG_IDE_GD_ATAPI is not set
-# CONFIG_BLK_DEV_IDECS is not set
-# CONFIG_BLK_DEV_DELKIN is not set
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDEACPI is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-# CONFIG_IDE_GENERIC is not set
-# CONFIG_BLK_DEV_PLATFORM is not set
-# CONFIG_BLK_DEV_CMD640 is not set
-# CONFIG_BLK_DEV_IDEPNP is not set
-
-#
-# PCI IDE chipsets support
-#
-# CONFIG_BLK_DEV_GENERIC is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_RZ1000 is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_BLK_DEV_ATIIXP is not set
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_JMICRON is not set
-# CONFIG_BLK_DEV_PIIX is not set
-# CONFIG_BLK_DEV_IT8172 is not set
-# CONFIG_BLK_DEV_IT8213 is not set
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-# CONFIG_BLK_DEV_SVWKS is not set
-# CONFIG_BLK_DEV_SIIMAGE is not set
-# CONFIG_BLK_DEV_SIS5513 is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-# CONFIG_BLK_DEV_VIA82CXXX is not set
-# CONFIG_BLK_DEV_TC86C001 is not set
-# CONFIG_BLK_DEV_IDEDMA is not set
+# CONFIG_IDE is not set
 
 #
 # SCSI device support
@@ -1785,9 +1640,8 @@ CONFIG_SCSI_MOD=y
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_NETLINK is not set
 # CONFIG_SCSI_MQ_DEFAULT is not set
-# CONFIG_SCSI_PROC_FS is not set
+CONFIG_SCSI_PROC_FS=y
 
 #
 # SCSI support type (disk, tape, CD-ROM)
@@ -1799,8 +1653,7 @@ CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=y
 # CONFIG_CHR_DEV_SCH is not set
-# CONFIG_SCSI_ENCLOSURE is not set
-# CONFIG_SCSI_CONSTANTS is not set
+CONFIG_SCSI_CONSTANTS=y
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
 
@@ -1842,7 +1695,8 @@ CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_MPT2SAS is not set
 # CONFIG_SCSI_SMARTPQI is not set
 CONFIG_SCSI_UFSHCD=y
-# CONFIG_SCSI_UFSHCD_PCI is not set
+CONFIG_SCSI_UFSHCD_PCI=y
+# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
 # CONFIG_SCSI_UFSHCD_PLATFORM is not set
 # CONFIG_SCSI_HPTIOP is not set
 # CONFIG_SCSI_BUSLOGIC is not set
@@ -1890,6 +1744,7 @@ CONFIG_SATA_PMP=y
 # Controllers with non-SFF native interface
 #
 CONFIG_SATA_AHCI=y
+CONFIG_SATA_MOBILE_LPM_POLICY=0
 CONFIG_SATA_AHCI_PLATFORM=y
 # CONFIG_AHCI_CEVA is not set
 # CONFIG_AHCI_QORIQ is not set
@@ -1924,10 +1779,10 @@ CONFIG_SATA_VIA=y
 #
 # PATA SFF controllers with BMDMA
 #
-CONFIG_PATA_ALI=y
+# CONFIG_PATA_ALI is not set
 CONFIG_PATA_AMD=y
 # CONFIG_PATA_ARTOP is not set
-CONFIG_PATA_ATIIXP=y
+# CONFIG_PATA_ATIIXP is not set
 # CONFIG_PATA_ATP867X is not set
 # CONFIG_PATA_CMD64X is not set
 # CONFIG_PATA_CYPRESS is not set
@@ -1936,14 +1791,14 @@ CONFIG_PATA_ATIIXP=y
 # CONFIG_PATA_HPT37X is not set
 # CONFIG_PATA_HPT3X2N is not set
 # CONFIG_PATA_HPT3X3 is not set
-CONFIG_PATA_IT8213=y
+# CONFIG_PATA_IT8213 is not set
 # CONFIG_PATA_IT821X is not set
 # CONFIG_PATA_JMICRON is not set
 # CONFIG_PATA_MARVELL is not set
 # CONFIG_PATA_NETCELL is not set
 # CONFIG_PATA_NINJA32 is not set
 # CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OLDPIIX is not set
+CONFIG_PATA_OLDPIIX=y
 # CONFIG_PATA_OPTIDMA is not set
 # CONFIG_PATA_PDC2027X is not set
 # CONFIG_PATA_PDC_OLD is not set
@@ -1952,47 +1807,50 @@ CONFIG_PATA_IT8213=y
 CONFIG_PATA_SCH=y
 # CONFIG_PATA_SERVERWORKS is not set
 # CONFIG_PATA_SIL680 is not set
-CONFIG_PATA_SIS=y
+# CONFIG_PATA_SIS is not set
 # CONFIG_PATA_TOSHIBA is not set
 # CONFIG_PATA_TRIFLEX is not set
-CONFIG_PATA_VIA=y
+# CONFIG_PATA_VIA is not set
 # CONFIG_PATA_WINBOND is not set
 
 #
 # PIO-only SFF controllers
 #
 # CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_MPIIX is not set
+CONFIG_PATA_MPIIX=y
 # CONFIG_PATA_NS87410 is not set
 # CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PCMCIA is not set
-CONFIG_PATA_PLATFORM=y
-# CONFIG_PATA_OF_PLATFORM is not set
+# CONFIG_PATA_PLATFORM is not set
 # CONFIG_PATA_RZ1000 is not set
 
 #
 # Generic fallback / legacy drivers
 #
-CONFIG_PATA_ACPI=y
+# CONFIG_PATA_ACPI is not set
 CONFIG_ATA_GENERIC=y
 # CONFIG_PATA_LEGACY is not set
 CONFIG_MD=y
 # CONFIG_BLK_DEV_MD is not set
-# CONFIG_BCACHE is not set
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
 CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_DM=y
 # CONFIG_DM_MQ_DEFAULT is not set
-CONFIG_DM_DEBUG=y
+# CONFIG_DM_DEBUG is not set
 CONFIG_DM_BUFIO=y
 # CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
+# CONFIG_DM_UNSTRIPED is not set
 CONFIG_DM_CRYPT=y
-# CONFIG_DM_SNAPSHOT is not set
+CONFIG_DM_SNAPSHOT=y
 # CONFIG_DM_THIN_PROVISIONING is not set
 # CONFIG_DM_CACHE is not set
+# CONFIG_DM_WRITECACHE is not set
 # CONFIG_DM_ERA is not set
-# CONFIG_DM_MIRROR is not set
+CONFIG_DM_MIRROR=y
+# CONFIG_DM_LOG_USERSPACE is not set
 # CONFIG_DM_RAID is not set
-# CONFIG_DM_ZERO is not set
+CONFIG_DM_ZERO=y
 # CONFIG_DM_MULTIPATH is not set
 # CONFIG_DM_DELAY is not set
 CONFIG_DM_UEVENT=y
@@ -2004,64 +1862,43 @@ CONFIG_DM_VERITY_FEC=y
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
 # CONFIG_DM_INTEGRITY is not set
+# CONFIG_DM_VERITY_AVB is not set
 # CONFIG_DM_ANDROID_VERITY is not set
 # CONFIG_DM_ANDROID_VERITY_AT_MOST_ONCE_DEFAULT_ENABLED is not set
 # CONFIG_TARGET_CORE is not set
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=y
-# CONFIG_FUSION_SAS is not set
-CONFIG_FUSION_MAX_SGE=128
-# CONFIG_FUSION_CTL is not set
-# CONFIG_FUSION_LOGGING is not set
+# CONFIG_FUSION is not set
 
 #
 # IEEE 1394 (FireWire) support
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_FIREWIRE_NOSY is not set
-CONFIG_MACINTOSH_DRIVERS=y
-CONFIG_MAC_EMUMOUSEBTN=m
+# CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_NETDEVICES=y
-CONFIG_MII=m
+CONFIG_MII=y
 CONFIG_NET_CORE=y
 # CONFIG_BONDING is not set
 # CONFIG_DUMMY is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_NET_FC is not set
-CONFIG_IFB=m
-CONFIG_NET_TEAM=m
-# CONFIG_NET_TEAM_MODE_BROADCAST is not set
-# CONFIG_NET_TEAM_MODE_ROUNDROBIN is not set
-# CONFIG_NET_TEAM_MODE_RANDOM is not set
-# CONFIG_NET_TEAM_MODE_ACTIVEBACKUP is not set
-# CONFIG_NET_TEAM_MODE_LOADBALANCE is not set
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
+# CONFIG_IFB is not set
+# CONFIG_NET_TEAM is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_IPVLAN is not set
 # CONFIG_VXLAN is not set
 # CONFIG_GENEVE is not set
 # CONFIG_GTP is not set
 # CONFIG_MACSEC is not set
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETCONSOLE=y
+# CONFIG_NETCONSOLE_DYNAMIC is not set
 CONFIG_NETPOLL=y
 CONFIG_NET_POLL_CONTROLLER=y
 CONFIG_TUN=y
-CONFIG_TAP=m
 # CONFIG_TUN_VNET_CROSS_LE is not set
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-# CONFIG_NLMON is not set
-CONFIG_ARCNET=m
-CONFIG_ARCNET_1201=m
-CONFIG_ARCNET_1051=m
-CONFIG_ARCNET_RAW=m
-CONFIG_ARCNET_CAP=m
-CONFIG_ARCNET_COM90xx=m
-CONFIG_ARCNET_COM90xxIO=m
-CONFIG_ARCNET_RIM_I=m
-CONFIG_ARCNET_COM20020=m
-CONFIG_ARCNET_COM20020_PCI=m
-# CONFIG_ARCNET_COM20020_CS is not set
+# CONFIG_VETH is not set
+# CONFIG_VIRTIO_NET is not set
+CONFIG_NLMON=m
+# CONFIG_ARCNET is not set
 
 #
 # CAIF transport drivers
@@ -2168,6 +2005,7 @@ CONFIG_NET_VENDOR_HP=y
 CONFIG_HP100=m
 CONFIG_NET_VENDOR_HUAWEI=y
 # CONFIG_HINIC is not set
+CONFIG_NET_VENDOR_I825XX=y
 CONFIG_NET_VENDOR_INTEL=y
 # CONFIG_E100 is not set
 CONFIG_E1000=m
@@ -2228,6 +2066,7 @@ CONFIG_NATSEMI=m
 CONFIG_NS83820=m
 CONFIG_NET_VENDOR_NETRONOME=y
 # CONFIG_NFP is not set
+CONFIG_NET_VENDOR_NI=y
 CONFIG_NET_VENDOR_8390=y
 CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
@@ -2310,6 +2149,10 @@ CONFIG_NET_VENDOR_XIRCOM=y
 CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_NET_VENDOR_SYNOPSYS=y
 # CONFIG_DWC_XLGMAC is not set
+# CONFIG_NET_VENDOR_TEHUTI is not set
+# CONFIG_NET_VENDOR_TI is not set
+# CONFIG_NET_VENDOR_VIA is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 CONFIG_NET_SB1000=m
@@ -2365,18 +2208,16 @@ CONFIG_VITESSE_PHY=m
 CONFIG_MICREL_KS8995MA=m
 CONFIG_PLIP=m
 CONFIG_PPP=y
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=y
+CONFIG_PPP_DEFLATE=y
 CONFIG_PPP_FILTER=y
 CONFIG_PPP_MPPE=y
-CONFIG_PPP_MULTILINK=y
+# CONFIG_PPP_MULTILINK is not set
 CONFIG_PPPOE=y
-CONFIG_PPPOL2TP=m
-CONFIG_PPPOLAC=y
-CONFIG_PPPOPNS=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
+CONFIG_PPPOL2TP=y
+# CONFIG_PPP_ASYNC is not set
+# CONFIG_PPP_SYNC_TTY is not set
+# CONFIG_SLIP is not set
 CONFIG_SLHC=y
 # CONFIG_SLIP_COMPRESSED is not set
 # CONFIG_SLIP_SMART is not set
@@ -2428,53 +2269,19 @@ CONFIG_USB_NET_CH9200=m
 CONFIG_WLAN=y
 # CONFIG_WIRELESS_WDS is not set
 CONFIG_WLAN_VENDOR_ADMTEK=y
-CONFIG_ADM8211=m
-CONFIG_ATH_COMMON=m
+# CONFIG_ADM8211 is not set
 CONFIG_WLAN_VENDOR_ATH=y
 # CONFIG_ATH_DEBUG is not set
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-# CONFIG_ATH5K_TRACER is not set
-CONFIG_ATH5K_PCI=y
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-CONFIG_ATH9K_AHB=y
-# CONFIG_ATH9K_DEBUGFS is not set
-# CONFIG_ATH9K_DYNACK is not set
-# CONFIG_ATH9K_WOW is not set
-CONFIG_ATH9K_RFKILL=y
-# CONFIG_ATH9K_CHANNEL_CONTEXT is not set
-CONFIG_ATH9K_PCOEM=y
-CONFIG_ATH9K_HTC=m
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_ATH9K_HWRNG=y
-CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
-CONFIG_CARL9170_WPC=y
-# CONFIG_CARL9170_HWRNG is not set
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-# CONFIG_ATH6KL_DEBUG is not set
-# CONFIG_ATH6KL_TRACING is not set
-CONFIG_AR5523=m
-CONFIG_WIL6210=m
-CONFIG_WIL6210_ISR_COR=y
-CONFIG_WIL6210_TRACING=y
-CONFIG_WIL6210_DEBUGFS=y
-CONFIG_ATH10K=m
-CONFIG_ATH10K_PCI=m
-# CONFIG_ATH10K_AHB is not set
-# CONFIG_ATH10K_SDIO is not set
-# CONFIG_ATH10K_USB is not set
-# CONFIG_ATH10K_DEBUG is not set
-# CONFIG_ATH10K_DEBUGFS is not set
-# CONFIG_ATH10K_TRACING is not set
-CONFIG_WCN36XX=m
-# CONFIG_WCN36XX_DEBUGFS is not set
+# CONFIG_ATH5K is not set
+# CONFIG_ATH5K_PCI is not set
+# CONFIG_ATH9K is not set
+# CONFIG_ATH9K_HTC is not set
+# CONFIG_CARL9170 is not set
+# CONFIG_ATH6KL is not set
+# CONFIG_AR5523 is not set
+# CONFIG_WIL6210 is not set
+# CONFIG_ATH10K is not set
+# CONFIG_WCN36XX is not set
 CONFIG_WLAN_VENDOR_ATMEL=y
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
@@ -2549,7 +2356,8 @@ CONFIG_IWLDVM=m
 CONFIG_IWLMVM=m
 CONFIG_IWLWIFI_OPMODE_MODULAR=y
 # CONFIG_IWLWIFI_BCAST_FILTERING is not set
-# CONFIG_IWLWIFI_PCIE_RTPM is not set
+# CONFI
+G_IWLWIFI_PCIE_RTPM is not set
 
 #
 # Debugging Options
@@ -2677,7 +2485,6 @@ CONFIG_PCMCIA_RAYCS=m
 CONFIG_PCMCIA_WL3501=m
 CONFIG_MAC80211_HWSIM=m
 # CONFIG_USB_NET_RNDIS_WLAN is not set
-# CONFIG_BCMDHD is not set
 
 #
 # WiMAX Wireless Broadband devices
@@ -2807,6 +2614,7 @@ CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_JOYSTICK_XPAD_LEDS=y
 CONFIG_JOYSTICK_WALKERA0701=m
 # CONFIG_JOYSTICK_PSXPAD_SPI is not set
+# CONFIG_JOYSTICK_PXRC is not set
 CONFIG_INPUT_TABLET=y
 CONFIG_TABLET_USB_ACECAD=m
 CONFIG_TABLET_USB_AIPTEK=m
@@ -2920,7 +2728,6 @@ CONFIG_INPUT_MMA8450=m
 CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_GP2A=m
 # CONFIG_INPUT_GPIO_BEEPER is not set
-CONFIG_INPUT_GPIO_TILT_POLLED=m
 # CONFIG_INPUT_GPIO_DECODER is not set
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_ATI_REMOTE2=m
@@ -2934,8 +2741,8 @@ CONFIG_INPUT_CM109=m
 CONFIG_INPUT_REGULATOR_HAPTIC=m
 CONFIG_INPUT_TPS65218_PWRBUTTON=m
 CONFIG_INPUT_UINPUT=y
-CONFIG_INPUT_GPIO=y
-CONFIG_INPUT_PCF8574=m
+# CONFIG_INPUT_GPIO is not set
+# CONFIG_INPUT_PCF8574 is not set
 # CONFIG_INPUT_PWM_BEEPER is not set
 # CONFIG_INPUT_PWM_VIBRA is not set
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
@@ -2943,26 +2750,12 @@ CONFIG_INPUT_ADXL34X=m
 CONFIG_INPUT_ADXL34X_I2C=m
 CONFIG_INPUT_ADXL34X_SPI=m
 # CONFIG_INPUT_IMS_PCU is not set
-CONFIG_INPUT_CMA3000=m
-CONFIG_INPUT_CMA3000_I2C=m
-CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_INPUT_DRV260X_HAPTICS=m
-CONFIG_INPUT_DRV2665_HAPTICS=m
-CONFIG_INPUT_DRV2667_HAPTICS=m
-CONFIG_RMI4_CORE=m
-# CONFIG_RMI4_I2C is not set
-# CONFIG_RMI4_SPI is not set
-# CONFIG_RMI4_SMB is not set
-CONFIG_RMI4_F03=y
-CONFIG_RMI4_F03_SERIO=m
-CONFIG_RMI4_2D_SENSOR=y
-CONFIG_RMI4_F11=y
-CONFIG_RMI4_F12=y
-CONFIG_RMI4_F30=y
-# CONFIG_RMI4_F34 is not set
-# CONFIG_RMI4_F54 is not set
-# CONFIG_RMI4_F55 is not set
+# CONFIG_INPUT_CMA3000 is not set
+CONFIG_INPUT_SOC_BUTTON_ARRAY=y
+# CONFIG_INPUT_DRV260X_HAPTICS is not set
+# CONFIG_INPUT_DRV2665_HAPTICS is not set
+# CONFIG_INPUT_DRV2667_HAPTICS is not set
+# CONFIG_RMI4_CORE is not set
 
 #
 # Hardware I/O ports
@@ -3000,12 +2793,21 @@ CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=32
-# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_NONSTANDARD=y
+# CONFIG_ROCKETPORT is not set
+# CONFIG_CYCLADES is not set
+# CONFIG_MOXA_INTELLIO is not set
+# CONFIG_MOXA_SMARTIO is not set
+# CONFIG_SYNCLINK is not set
+# CONFIG_SYNCLINKMP is not set
+# CONFIG_SYNCLINK_GT is not set
 # CONFIG_NOZOMI is not set
-# CONFIG_N_GSM is not set
-# CONFIG_TRACE_SINK is not set
+# CONFIG_ISI is not set
+# CONFIG_N_HDLC is not set
+CONFIG_N_GSM=y
+CONFIG_TRACE_ROUTER=y
+CONFIG_TRACE_SINK=y
 # CONFIG_CBC_LDISC is not set
 # CONFIG_DEVMEM is not set
 # CONFIG_DEVKMEM is not set
@@ -3053,26 +2855,20 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
 # CONFIG_SERIAL_IFX6X60 is not set
-# CONFIG_SERIAL_XILINX_PS_UART is not set
 # CONFIG_SERIAL_ARC is not set
 # CONFIG_SERIAL_RP2 is not set
 # CONFIG_SERIAL_FSL_LPUART is not set
-# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
 # CONFIG_SERIAL_DEV_BUS is not set
 # CONFIG_TTY_PRINTK is not set
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-# CONFIG_PPDEV is not set
-CONFIG_HVC_DRIVER=y
-CONFIG_VIRTIO_CONSOLE=m
+# CONFIG_VIRTIO_CONSOLE is not set
 # CONFIG_IPMI_HANDLER is not set
-CONFIG_HW_RANDOM=m
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_NVRAM=m
+CONFIG_HW_RANDOM=y
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+CONFIG_HW_RANDOM_INTEL=y
+# CONFIG_HW_RANDOM_AMD is not set
+# CONFIG_HW_RANDOM_VIA is not set
+# CONFIG_HW_RANDOM_VIRTIO is not set
+CONFIG_NVRAM=y
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 
@@ -3106,26 +2902,27 @@ CONFIG_I2C=y
 CONFIG_ACPI_I2C_OPREGION=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_MUX=m
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MUX=y
 
 #
 # Multiplexer I2C Chip support
 #
-# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
-CONFIG_I2C_MUX_GPIO=m
-# CONFIG_I2C_MUX_GPMUX is not set
+# CONFIG_I2C_MUX_GPIO is not set
 # CONFIG_I2C_MUX_LTC4306 is not set
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PCA954x=m
-CONFIG_I2C_MUX_PINCTRL=m
-CONFIG_I2C_MUX_REG=m
-# CONFIG_I2C_DEMUX_PINCTRL is not set
+# CONFIG_I2C_MUX_PCA9541 is not set
+# CONFIG_I2C_MUX_PCA954x is not set
+# CONFIG_I2C_MUX_REG is not set
 # CONFIG_I2C_MUX_MLXCPLD is not set
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_SMBUS=m
+# CONFIG_I2C_HELPER_AUTO is not set
+CONFIG_I2C_SMBUS=y
+
+#
+# I2C Algorithms
+#
 CONFIG_I2C_ALGOBIT=y
-CONFIG_I2C_ALGOPCA=m
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
 
 #
 # I2C Hardware Bus support
@@ -3134,62 +2931,56 @@ CONFIG_I2C_ALGOPCA=m
 #
 # PC SMBus host controller drivers
 #
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_ISMT=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_NFORCE2_S4985=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+CONFIG_I2C_I801=y
+CONFIG_I2C_ISCH=y
+# CONFIG_I2C_ISMT is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
 
 #
 # ACPI drivers
 #
-CONFIG_I2C_SCMI=m
+CONFIG_I2C_SCMI=y
 
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
-CONFIG_I2C_CBUS_GPIO=m
+# CONFIG_I2C_CBUS_GPIO is not set
 CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
-CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_DESIGNWARE_PCI=y
 CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
-CONFIG_I2C_EMEV2=m
-CONFIG_I2C_GPIO=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PCA_PLATFORM=m
-# CONFIG_I2C_PXA_PCI is not set
-# CONFIG_I2C_RK3X is not set
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_XILINX=m
+# CONFIG_I2C_EMEV2 is not set
+# CONFIG_I2C_GPIO is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_XILINX is not set
 
 #
 # External I2C/SMBus adapter drivers
 #
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_ROBOTFUZZ_OSIF=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
+# CONFIG_I2C_DIOLAN_U2C is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_TINY_USB is not set
 
 #
 # Other I2C/SMBus bus drivers
 #
 # CONFIG_I2C_MLXCPLD is not set
-CONFIG_I2C_CROS_EC_TUNNEL=m
 # CONFIG_I2C_STUB is not set
 CONFIG_I2C_SLAVE=y
 # CONFIG_I2C_SLAVE_EEPROM is not set
@@ -3199,25 +2990,20 @@ CONFIG_I2C_SLAVE=y
 CONFIG_SPI=y
 # CONFIG_SPI_DEBUG is not set
 CONFIG_SPI_MASTER=y
+# CONFIG_SPI_MEM is not set
 
 #
 # SPI Master Controller Drivers
 #
 # CONFIG_SPI_ALTERA is not set
 # CONFIG_SPI_AXI_SPI_ENGINE is not set
-CONFIG_SPI_BITBANG=m
-# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_CADENCE is not set
-CONFIG_SPI_DESIGNWARE=m
-CONFIG_SPI_DW_PCI=m
-# CONFIG_SPI_DW_MID_DMA is not set
-CONFIG_SPI_DW_MMIO=m
+# CONFIG_SPI_DESIGNWARE is not set
 # CONFIG_SPI_GPIO is not set
-# CONFIG_SPI_LM70_LLP is not set
-# CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_OC_TINY is not set
-CONFIG_SPI_PXA2XX=m
-CONFIG_SPI_PXA2XX_PCI=m
+CONFIG_SPI_PXA2XX=y
+CONFIG_SPI_PXA2XX_PCI=y
 # CONFIG_SPI_ROCKCHIP is not set
 # CONFIG_SPI_SC18IS602 is not set
 # CONFIG_SPI_XCOMM is not set
@@ -3233,7 +3019,7 @@ CONFIG_SPI_PXA2XX_PCI=m
 # CONFIG_SPI_SLAVE is not set
 # CONFIG_SPMI is not set
 # CONFIG_HSI is not set
-CONFIG_PPS=m
+CONFIG_PPS=y
 # CONFIG_PPS_DEBUG is not set
 
 #
@@ -3241,7 +3027,6 @@ CONFIG_PPS=m
 #
 # CONFIG_PPS_CLIENT_KTIMER is not set
 # CONFIG_PPS_CLIENT_LDISC is not set
-# CONFIG_PPS_CLIENT_PARPORT is not set
 # CONFIG_PPS_CLIENT_GPIO is not set
 
 #
@@ -3251,107 +3036,93 @@ CONFIG_PPS=m
 #
 # PTP clock support
 #
-CONFIG_PTP_1588_CLOCK=m
+CONFIG_PTP_1588_CLOCK=y
 
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PINCTRL=y
-
-#
-# Pin controllers
-#
-CONFIG_GENERIC_PINCTRL_GROUPS=y
 CONFIG_PINMUX=y
-CONFIG_GENERIC_PINMUX_FUNCTIONS=y
 CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
-CONFIG_PINCTRL_AMD=y
+# CONFIG_PINCTRL_AMD is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
-CONFIG_PINCTRL_SINGLE=m
 # CONFIG_PINCTRL_SX150X is not set
 CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_CHERRYVIEW=y
 CONFIG_PINCTRL_INTEL=y
 CONFIG_PINCTRL_BROXTON=y
 # CONFIG_PINCTRL_CANNONLAKE is not set
+# CONFIG_PINCTRL_CEDARFORK is not set
 # CONFIG_PINCTRL_DENVERTON is not set
 # CONFIG_PINCTRL_GEMINILAKE is not set
+# CONFIG_PINCTRL_ICELAKE is not set
 # CONFIG_PINCTRL_LEWISBURG is not set
-CONFIG_PINCTRL_SUNRISEPOINT=m
+# CONFIG_PINCTRL_SUNRISEPOINT is not set
 CONFIG_GPIOLIB=y
-CONFIG_OF_GPIO=y
+CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 CONFIG_GPIO_ACPI=y
 CONFIG_GPIOLIB_IRQCHIP=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_GENERIC=m
-CONFIG_GPIO_MAX730X=m
 
 #
 # Memory mapped GPIO drivers
 #
-# CONFIG_GPIO_74XX_MMIO is not set
-# CONFIG_GPIO_ALTERA is not set
 # CONFIG_GPIO_AMDPT is not set
-CONFIG_GPIO_DWAPB=m
+# CONFIG_GPIO_DWAPB is not set
 # CONFIG_GPIO_EXAR is not set
-# CONFIG_GPIO_FTGPIO010 is not set
-CONFIG_GPIO_GENERIC_PLATFORM=m
-# CONFIG_GPIO_GRGPIO is not set
-CONFIG_GPIO_ICH=m
-CONFIG_GPIO_LYNXPOINT=m
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_ICH is not set
+CONFIG_GPIO_LYNXPOINT=y
+# CONFIG_GPIO_MB86S7X is not set
 # CONFIG_GPIO_MOCKUP is not set
-CONFIG_GPIO_SYSCON=m
-CONFIG_GPIO_VX855=m
-CONFIG_GPIO_XILINX=m
+# CONFIG_GPIO_VX855 is not set
 
 #
 # Port-mapped I/O GPIO drivers
 #
-CONFIG_GPIO_F7188X=m
-CONFIG_GPIO_IT87=m
-CONFIG_GPIO_SCH=m
-CONFIG_GPIO_SCH311X=m
+# CONFIG_GPIO_F7188X is not set
+# CONFIG_GPIO_IT87 is not set
+# CONFIG_GPIO_SCH is not set
+# CONFIG_GPIO_SCH311X is not set
+# CONFIG_GPIO_WINBOND is not set
+# CONFIG_GPIO_WS16C48 is not set
 
 #
 # I2C GPIO expanders
 #
-CONFIG_GPIO_ADP5588=m
-# CONFIG_GPIO_ADNP is not set
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-# CONFIG_GPIO_SX150X is not set
+# CONFIG_GPIO_ADP5588 is not set
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_TPIC2810 is not set
 
 #
 # MFD GPIO expanders
 #
-CONFIG_GPIO_ARIZONA=m
-CONFIG_GPIO_CRYSTAL_COVE=y
-# CONFIG_GPIO_TPS65218 is not set
-CONFIG_GPIO_UCB1400=m
-# CONFIG_GPIO_WHISKEY_COVE is not set
+CONFIG_GPIO_ARIZONA=y
+# CONFIG_GPIO_CRYSTAL_COVE is not set
+CONFIG_GPIO_WHISKEY_COVE=y
 
 #
 # PCI GPIO expanders
 #
-CONFIG_GPIO_AMD8111=m
-CONFIG_GPIO_ML_IOH=m
+# CONFIG_GPIO_AMD8111 is not set
+# CONFIG_GPIO_BT8XX is not set
+# CONFIG_GPIO_ML_IOH is not set
 # CONFIG_GPIO_PCI_IDIO_16 is not set
-CONFIG_GPIO_RDC321X=m
-# CONFIG_GPIO_SODAVILLE is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
+# CONFIG_GPIO_RDC321X is not set
 
 #
 # SPI GPIO expanders
 #
-# CONFIG_GPIO_74X164 is not set
-CONFIG_GPIO_MAX7301=m
-CONFIG_GPIO_MC33880=m
+# CONFIG_GPIO_MAX3191X is not set
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_PISOSR is not set
 # CONFIG_GPIO_XRA1403 is not set
 
@@ -3359,40 +3130,38 @@ CONFIG_GPIO_MC33880=m
 # USB GPIO expanders
 #
 # CONFIG_W1 is not set
-CONFIG_POWER_AVS=y
+# CONFIG_POWER_AVS is not set
 # CONFIG_POWER_RESET is not set
 CONFIG_POWER_SUPPLY=y
-CONFIG_POWER_SUPPLY_DEBUG=y
-CONFIG_PDA_POWER=y
-# CONFIG_GENERIC_ADC_BATTERY is not set
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PDA_POWER is not set
+CONFIG_GENERIC_ADC_BATTERY=m
 # CONFIG_TEST_POWER is not set
+# CONFIG_CHARGER_ADP5061 is not set
 # CONFIG_BATTERY_DS2780 is not set
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_SBS is not set
 # CONFIG_CHARGER_SBS is not set
+# CONFIG_MANAGER_SBS is not set
 # CONFIG_BATTERY_BQ27XXX is not set
 # CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_CHARGER_ISP1704 is not set
+CONFIG_BATTERY_MAX17042=y
+CONFIG_CHARGER_ISP1704=m
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_MANAGER is not set
 # CONFIG_CHARGER_LTC3651 is not set
-# CONFIG_CHARGER_DETECTOR_MAX14656 is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24190 is not set
 # CONFIG_CHARGER_BQ24257 is not set
 # CONFIG_CHARGER_BQ24735 is not set
-# CONFIG_CHARGER_BQ25890 is not set
-CONFIG_CHARGER_SMB347=m
-# CONFIG_CHARGER_TPS65217 is not set
+CONFIG_CHARGER_BQ25890=y
+CONFIG_CHARGER_SMB347=y
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_CHARGER_RT9455 is not set
-CONFIG_HWMON=m
-CONFIG_HWMON_VID=m
+CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
@@ -3419,7 +3188,7 @@ CONFIG_HWMON_VID=m
 # CONFIG_SENSORS_K8TEMP is not set
 # CONFIG_SENSORS_K10TEMP is not set
 # CONFIG_SENSORS_FAM15H_POWER is not set
-CONFIG_SENSORS_APPLESMC=m
+# CONFIG_SENSORS_APPLESMC is not set
 # CONFIG_SENSORS_ASB100 is not set
 # CONFIG_SENSORS_ASPEED is not set
 # CONFIG_SENSORS_ATXP1 is not set
@@ -3436,11 +3205,10 @@ CONFIG_SENSORS_DELL_SMM=m
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_G760A is not set
 # CONFIG_SENSORS_G762 is not set
-# CONFIG_SENSORS_GPIO_FAN is not set
 # CONFIG_SENSORS_HIH6130 is not set
-# CONFIG_SENSORS_IIO_HWMON is not set
+CONFIG_SENSORS_IIO_HWMON=y
 # CONFIG_SENSORS_I5500 is not set
-# CONFIG_SENSORS_CORETEMP is not set
+CONFIG_SENSORS_CORETEMP=y
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
 # CONFIG_SENSORS_POWR1220 is not set
@@ -3459,6 +3227,7 @@ CONFIG_SENSORS_DELL_SMM=m
 # CONFIG_SENSORS_MAX1668 is not set
 # CONFIG_SENSORS_MAX197 is not set
 # CONFIG_SENSORS_MAX31722 is not set
+# CONFIG_SENSORS_MAX6621 is not set
 # CONFIG_SENSORS_MAX6639 is not set
 # CONFIG_SENSORS_MAX6642 is not set
 # CONFIG_SENSORS_MAX6650 is not set
@@ -3466,7 +3235,6 @@ CONFIG_SENSORS_DELL_SMM=m
 # CONFIG_SENSORS_MAX31790 is not set
 # CONFIG_SENSORS_MCP3021 is not set
 # CONFIG_SENSORS_TC654 is not set
-# CONFIG_SENSORS_MENF21BMC_HWMON is not set
 # CONFIG_SENSORS_ADCXX is not set
 # CONFIG_SENSORS_LM63 is not set
 # CONFIG_SENSORS_LM70 is not set
@@ -3476,7 +3244,7 @@ CONFIG_SENSORS_DELL_SMM=m
 # CONFIG_SENSORS_LM78 is not set
 # CONFIG_SENSORS_LM80 is not set
 # CONFIG_SENSORS_LM83 is not set
-CONFIG_SENSORS_LM85=m
+# CONFIG_SENSORS_LM85 is not set
 # CONFIG_SENSORS_LM87 is not set
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
@@ -3491,9 +3259,9 @@ CONFIG_SENSORS_LM85=m
 # CONFIG_SENSORS_NCT6775 is not set
 # CONFIG_SENSORS_NCT7802 is not set
 # CONFIG_SENSORS_NCT7904 is not set
+# CONFIG_SENSORS_NPCM7XX is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_PMBUS is not set
-# CONFIG_SENSORS_PWM_FAN is not set
 # CONFIG_SENSORS_SHT15 is not set
 # CONFIG_SENSORS_SHT21 is not set
 # CONFIG_SENSORS_SHT3x is not set
@@ -3506,9 +3274,9 @@ CONFIG_SENSORS_LM85=m
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_SCH56XX_COMMON is not set
-# CONFIG_SENSORS_SCH5627 is not set
-# CONFIG_SENSORS_SCH5636 is not set
+CONFIG_SENSORS_SCH56XX_COMMON=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
 # CONFIG_SENSORS_STTS751 is not set
 # CONFIG_SENSORS_SMM665 is not set
 # CONFIG_SENSORS_ADC128D818 is not set
@@ -3530,6 +3298,7 @@ CONFIG_SENSORS_LM85=m
 # CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83773G is not set
 # CONFIG_SENSORS_W83781D is not set
 # CONFIG_SENSORS_W83791D is not set
 # CONFIG_SENSORS_W83792D is not set
@@ -3544,11 +3313,12 @@ CONFIG_SENSORS_LM85=m
 #
 # ACPI drivers
 #
-CONFIG_SENSORS_ACPI_POWER=m
+# CONFIG_SENSORS_ACPI_POWER is not set
 # CONFIG_SENSORS_ATK0110 is not set
 CONFIG_THERMAL=y
+# CONFIG_THERMAL_STATISTICS is not set
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
-CONFIG_THERMAL_OF=y
+CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
@@ -3559,24 +3329,22 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_GOV_BANG_BANG=y
 CONFIG_THERMAL_GOV_USER_SPACE=y
 # CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
-# CONFIG_CPU_THERMAL is not set
 # CONFIG_CLOCK_THERMAL is not set
 # CONFIG_DEVFREQ_THERMAL is not set
 # CONFIG_THERMAL_EMULATION is not set
-# CONFIG_QORIQ_THERMAL is not set
-CONFIG_INTEL_POWERCLAMP=m
+CONFIG_INTEL_POWERCLAMP=y
 CONFIG_X86_PKG_TEMP_THERMAL=y
-CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
+CONFIG_INTEL_SOC_DTS_IOSF_CORE=y
 CONFIG_INTEL_SOC_DTS_THERMAL=m
 
 #
 # ACPI INT340X thermal drivers
 #
-CONFIG_INT340X_THERMAL=m
-CONFIG_ACPI_THERMAL_REL=m
+CONFIG_INT340X_THERMAL=y
+CONFIG_ACPI_THERMAL_REL=y
 # CONFIG_INT3406_THERMAL is not set
 # CONFIG_INTEL_BXT_PMIC_THERMAL is not set
-CONFIG_INTEL_PCH_THERMAL=m
+# CONFIG_INTEL_PCH_THERMAL is not set
 # CONFIG_GENERIC_ADC_THERMAL is not set
 
 #
@@ -3586,7 +3354,7 @@ CONFIG_TRUSTY=y
 CONFIG_TRUSTY_LOG=y
 CONFIG_TRUSTY_VIRTIO=y
 CONFIG_TRUSTY_VIRTIO_IPC=y
-CONFIG_TRUSTY_BACKUP_TIMER=y
+CONFIG_TRUSTY_BACKUP_TIMER=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -3597,19 +3365,17 @@ CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 # Watchdog Device Drivers
 #
 # CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_GPIO_WATCHDOG is not set
-# CONFIG_MENF21BMC_WATCHDOG is not set
 # CONFIG_WDAT_WDT is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ZIIRAVE_WATCHDOG is not set
 # CONFIG_CADENCE_WATCHDOG is not set
 # CONFIG_DW_WATCHDOG is not set
-# CONFIG_RN5T618_WATCHDOG is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_ADVANTECH_WDT is not set
 # CONFIG_ALIM1535_WDT is not set
 # CONFIG_ALIM7101_WDT is not set
+# CONFIG_EBC_C384_WDT is not set
 # CONFIG_F71808E_WDT is not set
 # CONFIG_SP5100_TCO is not set
 # CONFIG_SBC_FITPC2_WATCHDOG is not set
@@ -3638,6 +3404,7 @@ CONFIG_ITCO_WDT=y
 # CONFIG_W83977F_WDT is not set
 # CONFIG_MACHZ_WDT is not set
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set
+# CONFIG_INTEL_MEI_WDT is not set
 # CONFIG_NI903X_WDT is not set
 # CONFIG_NIC7018_WDT is not set
 # CONFIG_MEN_A21_WDT is not set
@@ -3658,54 +3425,29 @@ CONFIG_ITCO_WDT=y
 #
 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
 CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-# CONFIG_SSB_PCMCIAHOST is not set
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-# CONFIG_SSB_SILENT is not set
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-# CONFIG_SSB_DRIVER_GPIO is not set
+# CONFIG_SSB is not set
 CONFIG_BCMA_POSSIBLE=y
 CONFIG_BCMA=m
-CONFIG_BCMA_BLOCKIO=y
 CONFIG_BCMA_HOST_PCI_POSSIBLE=y
 CONFIG_BCMA_HOST_PCI=y
-CONFIG_BCMA_HOST_SOC=y
+# CONFIG_BCMA_HOST_SOC is not set
 CONFIG_BCMA_DRIVER_PCI=y
-CONFIG_BCMA_SFLASH=y
-CONFIG_BCMA_DRIVER_GMAC_CMN=y
-CONFIG_BCMA_DRIVER_GPIO=y
+# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
+# CONFIG_BCMA_DRIVER_GPIO is not set
 # CONFIG_BCMA_DEBUG is not set
 
 #
 # Multifunction device drivers
 #
 CONFIG_MFD_CORE=y
-# CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_AS3711 is not set
-# CONFIG_MFD_AS3722 is not set
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_ATMEL_FLEXCOM is not set
-# CONFIG_MFD_ATMEL_HLCDC is not set
 # CONFIG_MFD_BCM590XX is not set
 # CONFIG_MFD_BD9571MWV is not set
 # CONFIG_MFD_AXP20X_I2C is not set
-CONFIG_MFD_CROS_EC=m
-CONFIG_MFD_CROS_EC_I2C=m
-# CONFIG_MFD_CROS_EC_SPI is not set
+# CONFIG_MFD_CROS_EC is not set
+# CONFIG_MFD_MADERA is not set
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_MFD_DA9052_SPI is not set
 # CONFIG_MFD_DA9052_I2C is not set
@@ -3716,55 +3458,46 @@ CONFIG_MFD_CROS_EC_I2C=m
 # CONFIG_MFD_DLN2 is not set
 # CONFIG_MFD_MC13XXX_SPI is not set
 # CONFIG_MFD_MC13XXX_I2C is not set
-# CONFIG_MFD_HI6421_PMIC is not set
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
-CONFIG_LPC_ICH=m
-CONFIG_LPC_SCH=m
+CONFIG_LPC_ICH=y
+CONFIG_LPC_SCH=y
 CONFIG_INTEL_SOC_PMIC=y
 CONFIG_INTEL_SOC_PMIC_BXTWC=y
 # CONFIG_INTEL_SOC_PMIC_CHTWC is not set
+# CONFIG_INTEL_SOC_PMIC_CHTDC_TI is not set
 CONFIG_MFD_INTEL_LPSS=y
-CONFIG_MFD_INTEL_LPSS_ACPI=m
+CONFIG_MFD_INTEL_LPSS_ACPI=y
 CONFIG_MFD_INTEL_LPSS_PCI=y
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
-CONFIG_MFD_88PM800=m
-CONFIG_MFD_88PM805=m
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_MAX14577 is not set
-# CONFIG_MFD_MAX77620 is not set
-# CONFIG_MFD_MAX77686 is not set
 # CONFIG_MFD_MAX77693 is not set
 # CONFIG_MFD_MAX77843 is not set
-CONFIG_MFD_MAX8907=m
+# CONFIG_MFD_MAX8907 is not set
 # CONFIG_MFD_MAX8925 is not set
 # CONFIG_MFD_MAX8997 is not set
 # CONFIG_MFD_MAX8998 is not set
-CONFIG_MFD_MT6397=m
-CONFIG_MFD_MENF21BMC=m
+# CONFIG_MFD_MT6397 is not set
+# CONFIG_MFD_MENF21BMC is not set
 # CONFIG_EZX_PCAP is not set
-# CONFIG_MFD_CPCAP is not set
 # CONFIG_MFD_VIPERBOARD is not set
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_PCF50633 is not set
-CONFIG_UCB1400_CORE=m
-CONFIG_MFD_RDC321X=m
-CONFIG_MFD_RTSX_PCI=y
+# CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_RT5033 is not set
-CONFIG_MFD_RTSX_USB=m
 # CONFIG_MFD_RC5T583 is not set
-# CONFIG_MFD_RK808 is not set
-CONFIG_MFD_RN5T618=m
-CONFIG_MFD_SEC_CORE=y
+# CONFIG_MFD_SEC_CORE is not set
 # CONFIG_MFD_SI476X_CORE is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_SKY81452 is not set
 # CONFIG_MFD_SMSC is not set
 # CONFIG_ABX500_CORE is not set
-# CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SYSCON=y
+# CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_LP3943 is not set
 # CONFIG_MFD_LP8788 is not set
@@ -3775,11 +3508,8 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_TPS6507X is not set
 # CONFIG_MFD_TPS65086 is not set
 # CONFIG_MFD_TPS65090 is not set
-CONFIG_MFD_TPS65217=m
 # CONFIG_MFD_TPS68470 is not set
 # CONFIG_MFD_TI_LP873X is not set
-# CONFIG_MFD_TI_LP87565 is not set
-CONFIG_MFD_TPS65218=m
 # CONFIG_MFD_TPS6586X is not set
 # CONFIG_MFD_TPS65910 is not set
 # CONFIG_MFD_TPS65912_I2C is not set
@@ -3788,18 +3518,16 @@ CONFIG_MFD_TPS65218=m
 # CONFIG_TWL4030_CORE is not set
 # CONFIG_TWL6040_CORE is not set
 # CONFIG_MFD_WL1273_CORE is not set
-CONFIG_MFD_LM3533=m
-# CONFIG_MFD_TC3589X is not set
-# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_VX855=m
+# CONFIG_MFD_LM3533 is not set
+# CONFIG_MFD_VX855 is not set
 CONFIG_MFD_ARIZONA=y
 CONFIG_MFD_ARIZONA_I2C=m
-CONFIG_MFD_ARIZONA_SPI=m
+# CONFIG_MFD_ARIZONA_SPI is not set
 # CONFIG_MFD_CS47L24 is not set
 # CONFIG_MFD_WM5102 is not set
-# CONFIG_MFD_WM5110 is not set
+CONFIG_MFD_WM5110=y
 # CONFIG_MFD_WM8997 is not set
-# CONFIG_MFD_WM8998 is not set
+CONFIG_MFD_WM8998=y
 # CONFIG_MFD_WM8400 is not set
 # CONFIG_MFD_WM831X_I2C is not set
 # CONFIG_MFD_WM831X_SPI is not set
@@ -3808,18 +3536,17 @@ CONFIG_MFD_ARIZONA_SPI=m
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
-# CONFIG_REGULATOR_88PM800 is not set
+# CONFIG_REGULATOR_88PG86X is not set
 # CONFIG_REGULATOR_ACT8865 is not set
 # CONFIG_REGULATOR_AD5398 is not set
-# CONFIG_REGULATOR_ANATOP is not set
 # CONFIG_REGULATOR_ARIZONA_LDO1 is not set
 # CONFIG_REGULATOR_ARIZONA_MICSUPP is not set
 # CONFIG_REGULATOR_DA9210 is not set
 # CONFIG_REGULATOR_DA9211 is not set
 # CONFIG_REGULATOR_FAN53555 is not set
-CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_ISL9305 is not set
 # CONFIG_REGULATOR_ISL6271A is not set
 # CONFIG_REGULATOR_LP3971 is not set
@@ -3831,79 +3558,46 @@ CONFIG_REGULATOR_GPIO=m
 # CONFIG_REGULATOR_MAX1586 is not set
 # CONFIG_REGULATOR_MAX8649 is not set
 # CONFIG_REGULATOR_MAX8660 is not set
-# CONFIG_REGULATOR_MAX8907 is not set
 # CONFIG_REGULATOR_MAX8952 is not set
-# CONFIG_REGULATOR_MAX8973 is not set
 # CONFIG_REGULATOR_MT6311 is not set
-# CONFIG_REGULATOR_MT6323 is not set
-# CONFIG_REGULATOR_MT6397 is not set
 # CONFIG_REGULATOR_PFUZE100 is not set
 # CONFIG_REGULATOR_PV88060 is not set
 # CONFIG_REGULATOR_PV88080 is not set
 # CONFIG_REGULATOR_PV88090 is not set
 # CONFIG_REGULATOR_PWM is not set
-# CONFIG_REGULATOR_RN5T618 is not set
-# CONFIG_REGULATOR_S2MPA01 is not set
-# CONFIG_REGULATOR_S2MPS11 is not set
-# CONFIG_REGULATOR_S5M8767 is not set
 # CONFIG_REGULATOR_TPS51632 is not set
-CONFIG_REGULATOR_TPS62360=m
+# CONFIG_REGULATOR_TPS62360 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
 # CONFIG_REGULATOR_TPS65132 is not set
-# CONFIG_REGULATOR_TPS65217 is not set
-# CONFIG_REGULATOR_TPS65218 is not set
 # CONFIG_REGULATOR_TPS6524X is not set
-# CONFIG_REGULATOR_VCTRL is not set
 CONFIG_RC_CORE=y
-CONFIG_RC_MAP=m
+CONFIG_RC_MAP=y
+# CONFIG_LIRC is not set
 CONFIG_RC_DECODERS=y
-CONFIG_LIRC=m
-CONFIG_IR_LIRC_CODEC=m
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_NEC_DECODER=y
+CONFIG_IR_RC5_DECODER=y
+CONFIG_IR_RC6_DECODER=y
+CONFIG_IR_JVC_DECODER=y
+CONFIG_IR_SONY_DECODER=y
+CONFIG_IR_SANYO_DECODER=y
 CONFIG_IR_SHARP_DECODER=y
-CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=y
 CONFIG_IR_XMP_DECODER=y
-CONFIG_RC_DEVICES=y
-CONFIG_RC_ATI_REMOTE=m
-CONFIG_IR_ENE=m
-# CONFIG_IR_HIX5HD2 is not set
-CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_ITE_CIR=m
-CONFIG_IR_FINTEK=m
-CONFIG_IR_NUVOTON=m
-CONFIG_IR_REDRAT3=m
-# CONFIG_IR_SPI is not set
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_WINBOND_CIR=m
-# CONFIG_IR_IGORPLUGUSB is not set
-CONFIG_IR_IGUANA=m
-CONFIG_IR_TTUSBIR=m
-CONFIG_RC_LOOPBACK=m
-CONFIG_IR_GPIO_CIR=m
-# CONFIG_IR_GPIO_TX is not set
-# CONFIG_IR_PWM_TX is not set
-# CONFIG_IR_SERIAL is not set
-# CONFIG_IR_SIR is not set
+# CONFIG_IR_IMON_DECODER is not set
+# CONFIG_RC_DEVICES is not set
 CONFIG_MEDIA_SUPPORT=y
 
 #
 # Multimedia core support
 #
 CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
+# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
 CONFIG_MEDIA_RADIO_SUPPORT=y
 # CONFIG_MEDIA_SDR_SUPPORT is not set
 # CONFIG_MEDIA_CEC_SUPPORT is not set
 CONFIG_MEDIA_CONTROLLER=y
-# CONFIG_MEDIA_CONTROLLER_DVB is not set
 CONFIG_VIDEO_DEV=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_VIDEO_V4L2=y
@@ -3939,63 +3633,12 @@ CONFIG_MEDIA_USB_SUPPORT=y
 #
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-# CONFIG_USB_GSPCA_DTCS033 is not set
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-# CONFIG_USB_GSPCA_STK1135 is not set
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-# CONFIG_USB_GSPCA_TOUPTEK is not set
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
+# CONFIG_USB_GSPCA is not set
+# CONFIG_USB_PWC is not set
 # CONFIG_VIDEO_CPIA2 is not set
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
+# CONFIG_USB_ZR364XX is not set
+# CONFIG_USB_STKWEBCAM is not set
+# CONFIG_USB_S2255 is not set
 # CONFIG_VIDEO_USBTV is not set
 
 #
@@ -4074,118 +3717,28 @@ CONFIG_DVB_AS102=m
 #
 # Webcam, TV (analog/digital) USB devices
 #
-CONFIG_VIDEO_EM28XX=m
-# CONFIG_VIDEO_EM28XX_V4L2 is not set
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=m
+# CONFIG_VIDEO_EM28XX is not set
 CONFIG_MEDIA_PCI_SUPPORT=y
 
 #
 # Media capture support
 #
-CONFIG_VIDEO_MEYE=m
 # CONFIG_VIDEO_SOLO6X10 is not set
 # CONFIG_VIDEO_TW5864 is not set
 # CONFIG_VIDEO_TW68 is not set
 # CONFIG_VIDEO_TW686X is not set
-# CONFIG_VIDEO_ZORAN is not set
-# CONFIG_VIDEO_INTEL_IPU is not set
-# CONFIG_VIDEO_INTEL_IPU_FW_LIB is not set
-# CONFIG_VIDEO_INTEL_UOS is not set
-# CONFIG_VIDEO_INTEL_IPU_ACRN is not set
-
-#
-# Media capture/analog TV support
-#
-# CONFIG_VIDEO_IVTV is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-# CONFIG_VIDEO_MXB is not set
-CONFIG_VIDEO_DT3155=m
-
-#
-# Media capture/analog/hybrid TV support
-#
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_ENABLE_VP3054=y
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_BT848=m
-CONFIG_DVB_BT8XX=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7164=m
-
-#
-# Media digital TV PCI Adapters
-#
-# CONFIG_DVB_AV7110 is not set
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
-CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_DM1105=m
-CONFIG_DVB_PT1=m
-# CONFIG_DVB_PT3 is not set
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-CONFIG_DVB_NGENE=m
-CONFIG_DVB_DDBRIDGE=m
-# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
-# CONFIG_DVB_SMIPCIE is not set
-# CONFIG_DVB_NETUP_UNIDVB is not set
+# CONFIG_VIDEO_IPU3_CIO2 is not set
 CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_VIDEO_VIA_CAMERA=m
-# CONFIG_VIDEO_MUX is not set
-# CONFIG_VIDEO_AGGREGATOR_STUB is not set
-# CONFIG_VIDEO_IRIS is not set
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_PLATFORM=m
-# CONFIG_VIDEO_XILINX is not set
-# CONFIG_INTEL_IPU4_AR023Z is not set
-# CONFIG_INTEL_IPU4_OV13860 is not set
-# CONFIG_INTEL_IPU4_OV9281 is not set
-# CONFIG_INTEL_IPU4_OV10635 is not set
-# CONFIG_INTEL_IPU4_AR0231AT is not set
-# CONFIG_INTEL_IPU4_OV10640 is not set
-# CONFIG_INTEL_IPU4_ADV7481 is not set
-CONFIG_INTEL_IPU4_ADV7481_I2C_ID=0
-# CONFIG_INTEL_IPU4_ADV7481_EVAL is not set
+# CONFIG_VIDEO_CAFE_CCIC is not set
+# CONFIG_VIDEO_CADENCE is not set
+# CONFIG_SOC_CAMERA is not set
 # CONFIG_V4L_MEM2MEM_DRIVERS is not set
-CONFIG_V4L_TEST_DRIVERS=y
-# CONFIG_VIDEO_VIMC is not set
-CONFIG_VIDEO_VIVID=m
-# CONFIG_VIDEO_VIVID_CEC is not set
-CONFIG_VIDEO_VIVID_MAX_DEVS=2
-# CONFIG_VIDEO_VIM2M is not set
-# CONFIG_DVB_PLATFORM_DRIVERS is not set
-# CONFIG_VIDEO_SENSOR_STUB is not set
-# CONFIG_I2C_ADAPTER_STUB is not set
-# CONFIG_VIDEO_SENSOR_STUB_PDATA is not set
+# CONFIG_V4L_TEST_DRIVERS is not set
 
 #
 # Supported MMC/SDIO adapters
 #
-CONFIG_SMS_SDIO_DRV=m
 CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_TEA575X=m
 # CONFIG_RADIO_SI470X is not set
 # CONFIG_RADIO_SI4713 is not set
 # CONFIG_USB_MR800 is not set
@@ -4204,22 +3757,12 @@ CONFIG_RADIO_TEA575X=m
 #
 # Texas Instruments WL128x FM driver (ST based)
 #
-# CONFIG_RADIO_WL128X is not set
-CONFIG_MEDIA_COMMON_OPTIONS=y
-
-#
-# common driver options
-#
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_CYPRESS_FIRMWARE=m
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_SMS_SIANO_MDTV=m
-CONFIG_SMS_SIANO_RC=y
-# CONFIG_SMS_SIANO_DEBUGFS is not set
-CONFIG_VIDEO_V4L2_TPG=m
+# CONFIG_CYPRESS_FIRMWARE is not set
+CONFIG_VIDEOBUF2_CORE=y
+CONFIG_VIDEOBUF2_V4L2=y
+CONFIG_VIDEOBUF2_MEMOPS=y
+CONFIG_VIDEOBUF2_VMALLOC=y
+CONFIG_VIDEOBUF2_DMA_SG=m
 
 #
 # Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
@@ -4238,6 +3781,7 @@ CONFIG_VIDEO_IR_I2C=m
 # CONFIG_VIDEO_TVAUDIO is not set
 # CONFIG_VIDEO_TDA7432 is not set
 # CONFIG_VIDEO_TDA9840 is not set
+# CONFIG_VIDEO_TDA1997X is not set
 # CONFIG_VIDEO_TEA6415C is not set
 # CONFIG_VIDEO_TEA6420 is not set
 # CONFIG_VIDEO_MSP3400 is not set
@@ -4271,6 +3815,7 @@ CONFIG_VIDEO_BT866=m
 CONFIG_VIDEO_KS0127=m
 # CONFIG_VIDEO_ML86V7667 is not set
 # CONFIG_VIDEO_AD5820 is not set
+# CONFIG_VIDEO_AK7375 is not set
 # CONFIG_VIDEO_DW9714 is not set
 CONFIG_VIDEO_SAA7110=m
 CONFIG_VIDEO_SAA711X=m
@@ -4306,30 +3851,38 @@ CONFIG_VIDEO_AK881X=m
 #
 # Camera sensor devices
 #
-CONFIG_VIDEO_APTINA_PLL=m
+CONFIG_VIDEO_SMIAPP_PLL=m
+# CONFIG_VIDEO_IMX258 is not set
+# CONFIG_VIDEO_IMX274 is not set
 # CONFIG_VIDEO_OV2640 is not set
 # CONFIG_VIDEO_OV2659 is not set
-# CONFIG_VIDEO_OV5640 is not set
-# CONFIG_VIDEO_OV5645 is not set
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
 # CONFIG_VIDEO_OV5647 is not set
 # CONFIG_VIDEO_OV6650 is not set
 # CONFIG_VIDEO_OV5670 is not set
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV7251 is not set
+# CONFIG_VIDEO_OV772X is not set
 # CONFIG_VIDEO_OV7640 is not set
-CONFIG_VIDEO_OV7670=m
+# CONFIG_VIDEO_OV7670 is not set
+# CONFIG_VIDEO_OV7740 is not set
 # CONFIG_VIDEO_OV9650 is not set
 # CONFIG_VIDEO_OV13858 is not set
-# CONFIG_VIDEO_MAX9286 is not set
-CONFIG_VIDEO_VS6624=m
-CONFIG_VIDEO_MT9M032=m
-CONFIG_VIDEO_MT9M111=m
-CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MT9V032=m
-CONFIG_VIDEO_SR030PC30=m
-CONFIG_VIDEO_NOON010PC30=m
-CONFIG_VIDEO_M5MOLS=m
-CONFIG_VIDEO_S5K6AA=m
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_MT9M032 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
+# CONFIG_VIDEO_MT9T112 is not set
+# CONFIG_VIDEO_MT9V011 is not set
+# CONFIG_VIDEO_MT9V032 is not set
+# CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_NOON010PC30 is not set
+# CONFIG_VIDEO_M5MOLS is not set
+# CONFIG_VIDEO_RJ54N1 is not set
+# CONFIG_VIDEO_S5K6AA is not set
 # CONFIG_VIDEO_S5K6A3 is not set
 CONFIG_VIDEO_S5K4ECGX=m
 # CONFIG_VIDEO_S5K5BAF is not set
@@ -4367,237 +3920,70 @@ CONFIG_VIDEO_S5K4ECGX=m
 #
 # CONFIG_VIDEO_THS7303 is not set
 # CONFIG_VIDEO_M52790 is not set
+# CONFIG_VIDEO_I2C is not set
 
 #
 # Sensors used on soc_camera driver
 #
 
 #
-# soc_camera sensor drivers
+# SPI helper chips
 #
-CONFIG_SOC_CAMERA_IMX074=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_OV5642=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_SOC_CAMERA_OV9740=m
-CONFIG_SOC_CAMERA_RJ54N1=m
-CONFIG_SOC_CAMERA_TW9910=m
-# CONFIG_VIDEO_LM3643 is not set
-# CONFIG_VIDEO_BU64295 is not set
-# CONFIG_VIDEO_AD5816G is not set
-# CONFIG_VIDEO_VCM_STUB is not set
-# CONFIG_VIDEO_TI964 is not set
-# CONFIG_VIDEO_AS3638 is not set
+# CONFIG_VIDEO_GS1662 is not set
 
 #
-# SPI helper chips
+# Media SPI Adapters
 #
-# CONFIG_VIDEO_GS1662 is not set
 CONFIG_MEDIA_TUNER=y
 
 #
 # Customize TV tuners
 #
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
+# CONFIG_MEDIA_TUNER_SIMPLE is not set
+CONFIG_MEDIA_TUNER_TDA18250=m
+# CONFIG_MEDIA_TUNER_TDA8290 is not set
+# CONFIG_MEDIA_TUNER_TDA827X is not set
+# CONFIG_MEDIA_TUNER_TDA18271 is not set
+# CONFIG_MEDIA_TUNER_TDA9887 is not set
+# CONFIG_MEDIA_TUNER_TEA5761 is not set
+# CONFIG_MEDIA_TUNER_TEA5767 is not set
 # CONFIG_MEDIA_TUNER_MSI001 is not set
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_M88RS6000T=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_SI2157=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER_R820T=m
-CONFIG_MEDIA_TUNER_MXL301RF=m
-CONFIG_MEDIA_TUNER_QM1D1C0042=m
+# CONFIG_MEDIA_TUNER_MT20XX is not set
+# CONFIG_MEDIA_TUNER_MT2060 is not set
+# CONFIG_MEDIA_TUNER_MT2063 is not set
+# CONFIG_MEDIA_TUNER_MT2266 is not set
+# CONFIG_MEDIA_TUNER_MT2131 is not set
+# CONFIG_MEDIA_TUNER_QT1010 is not set
+# CONFIG_MEDIA_TUNER_XC2028 is not set
+# CONFIG_MEDIA_TUNER_XC5000 is not set
+# CONFIG_MEDIA_TUNER_XC4000 is not set
+# CONFIG_MEDIA_TUNER_MXL5005S is not set
+# CONFIG_MEDIA_TUNER_MXL5007T is not set
+# CONFIG_MEDIA_TUNER_MC44S803 is not set
+# CONFIG_MEDIA_TUNER_MAX2165 is not set
+# CONFIG_MEDIA_TUNER_TDA18218 is not set
+# CONFIG_MEDIA_TUNER_FC0011 is not set
+# CONFIG_MEDIA_TUNER_FC0012 is not set
+# CONFIG_MEDIA_TUNER_FC0013 is not set
+# CONFIG_MEDIA_TUNER_TDA18212 is not set
+# CONFIG_MEDIA_TUNER_E4000 is not set
+# CONFIG_MEDIA_TUNER_FC2580 is not set
+# CONFIG_MEDIA_TUNER_M88RS6000T is not set
+# CONFIG_MEDIA_TUNER_TUA9001 is not set
+# CONFIG_MEDIA_TUNER_SI2157 is not set
+# CONFIG_MEDIA_TUNER_IT913X is not set
+# CONFIG_MEDIA_TUNER_R820T is not set
+# CONFIG_MEDIA_TUNER_MXL301RF is not set
+# CONFIG_MEDIA_TUNER_QM1D1C0042 is not set
+CONFIG_MEDIA_TUNER_QM1D1B0004=m
 
 #
 # Customise DVB Frontends
 #
 
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV0910=m
-CONFIG_DVB_STV6110x=m
-CONFIG_DVB_STV6111=m
-CONFIG_DVB_MXL5XX=m
-CONFIG_DVB_M88DS3103=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-CONFIG_DVB_SI2165=m
-CONFIG_DVB_MN88472=m
-CONFIG_DVB_MN88473=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_CX24117=m
-CONFIG_DVB_CX24120=m
-CONFIG_DVB_SI21XX=m
-# CONFIG_DVB_TS2020 is not set
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-CONFIG_DVB_TDA10071=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_S5H1432=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_DIB9000=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_STV0367=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_CXD2841ER=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-CONFIG_DVB_SI2168=m
-CONFIG_DVB_AS102_FE=m
-CONFIG_DVB_ZD1301_DEMOD=m
-CONFIG_DVB_GP8PSK_FE=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LGDT3306A=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_AU8522_DTV=m
-CONFIG_DVB_AU8522_V4L=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_S921=m
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_MB86A20S=m
-
-#
-# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_TC90522=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_DRX39XYJ=m
-CONFIG_DVB_LNBH25=m
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_A8293=m
-CONFIG_DVB_SP2=m
-CONFIG_DVB_LGS8GL5=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_M88RS2000=m
-CONFIG_DVB_AF9033=m
-CONFIG_DVB_HORUS3A=m
-CONFIG_DVB_ASCOT2E=m
-CONFIG_DVB_HELENE=m
-
 #
 # Tools to develop new frontends
 #
-# CONFIG_DVB_DUMMY_FE is not set
 
 #
 # Graphics support
@@ -4615,43 +4001,39 @@ CONFIG_DRM=y
 CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
 # CONFIG_DRM_DEBUG_MM is not set
-# CONFIG_DRM_DEBUG_MM_SELFTEST is not set
+# CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
-CONFIG_DRM_TTM=m
-CONFIG_DRM_VM=y
+# CONFIG_DRM_DP_CEC is not set
+CONFIG_DRM_TTM=y
 
 #
 # I2C encoder or helper chips
 #
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_I2C_NXP_TDA998X=m
+# CONFIG_DRM_I2C_CH7006 is not set
+# CONFIG_DRM_I2C_SIL164 is not set
+# CONFIG_DRM_I2C_NXP_TDA998X is not set
+# CONFIG_DRM_I2C_NXP_TDA9950 is not set
 # CONFIG_DRM_RADEON is not set
-CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
-CONFIG_DRM_AMDGPU_CIK=y
-# CONFIG_DRM_AMDGPU_USERPTR is not set
-# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
+# CONFIG_DRM_AMDGPU is not set
 
 #
 # ACP (Audio CoProcessor) Configuration
 #
-# CONFIG_DRM_AMD_ACP is not set
-CONFIG_DRM_NOUVEAU=m
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+
+#
+# AMD Library routines
+#
+# CONFIG_DRM_NOUVEAU is not set
 CONFIG_DRM_I915=y
 # CONFIG_DRM_I915_ALPHA_SUPPORT is not set
 CONFIG_DRM_I915_CAPTURE_ERROR=y
 CONFIG_DRM_I915_COMPRESS_ERROR=y
 CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_I915_GVT is not set
-# CONFIG_DRM_I915_LOAD_ASYNC_SUPPORT is not set
 
 #
 # drm/i915 Debugging
@@ -4660,40 +4042,27 @@ CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_I915_DEBUG is not set
 # CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
 # CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
+# CONFIG_DRM_I915_DEBUG_GUC is not set
 # CONFIG_DRM_I915_SELFTEST is not set
 # CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
 # CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
-CONFIG_DRM_VGEM=m
-CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_VMWGFX_FBCON=y
-CONFIG_DRM_GMA500=m
-CONFIG_DRM_GMA600=y
-CONFIG_DRM_GMA3600=y
-CONFIG_DRM_UDL=m
-CONFIG_DRM_AST=m
-CONFIG_DRM_MGAG200=m
+# CONFIG_DRM_VGEM is not set
+# CONFIG_DRM_VKMS is not set
+# CONFIG_DRM_VMWGFX is not set
+# CONFIG_DRM_GMA500 is not set
+# CONFIG_DRM_UDL is not set
+# CONFIG_DRM_AST is not set
+# CONFIG_DRM_MGAG200 is not set
 # CONFIG_DRM_CIRRUS_QEMU is not set
-# CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_QXL is not set
-CONFIG_DRM_BOCHS=m
-CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_BOCHS=y
+# CONFIG_DRM_VIRTIO_GPU is not set
 CONFIG_DRM_PANEL=y
 
 #
 # Display Panels
 #
-# CONFIG_DRM_PANEL_LVDS is not set
-# CONFIG_DRM_PANEL_SIMPLE is not set
-# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
-# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
-# CONFIG_DRM_PANEL_LG_LG4573 is not set
-# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
-# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
-# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
-# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
+# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_PANEL_BRIDGE=y
 
@@ -4701,46 +4070,28 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # Display Interface Bridges
 #
 # CONFIG_DRM_ANALOGIX_ANX78XX is not set
-# CONFIG_DRM_DUMB_VGA_DAC is not set
-# CONFIG_DRM_LVDS_ENCODER is not set
-# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
-# CONFIG_DRM_NXP_PTN3460 is not set
-# CONFIG_DRM_PARADE_PS8622 is not set
-# CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SII902X is not set
-# CONFIG_DRM_TOSHIBA_TC358767 is not set
-# CONFIG_DRM_TI_TFP410 is not set
-# CONFIG_DRM_I2C_ADV7511 is not set
-# CONFIG_DRM_ARCPGU is not set
 # CONFIG_DRM_HISI_HIBMC is not set
-# CONFIG_DRM_MXSFB is not set
 # CONFIG_DRM_TINYDRM is not set
 # CONFIG_DRM_LEGACY is not set
-# CONFIG_DRM_LIB_RANDOM is not set
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 
 #
 # Frame buffer Devices
 #
 CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
+# CONFIG_FIRMWARE_EDID is not set
 CONFIG_FB_CMDLINE=y
 CONFIG_FB_NOTIFY=y
-CONFIG_FB_DDC=m
 CONFIG_FB_BOOT_VESA_SUPPORT=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
 CONFIG_FB_SYS_FILLRECT=y
 CONFIG_FB_SYS_COPYAREA=y
 CONFIG_FB_SYS_IMAGEBLIT=y
-# CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA is not set
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_SVGALIB=m
-# CONFIG_FB_MACMODES is not set
-CONFIG_FB_BACKLIGHT=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
 
@@ -4754,7 +4105,7 @@ CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_VGA16 is not set
-CONFIG_FB_UVESA=m
+# CONFIG_FB_UVESA is not set
 CONFIG_FB_VESA=y
 CONFIG_FB_EFI=y
 # CONFIG_FB_N411 is not set
@@ -4762,106 +4113,76 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_OPENCORES is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_NVIDIA is not set
-CONFIG_FB_RIVA=m
-# CONFIG_FB_RIVA_I2C is not set
-# CONFIG_FB_RIVA_DEBUG is not set
-CONFIG_FB_RIVA_BACKLIGHT=y
+# CONFIG_FB_RIVA is not set
 # CONFIG_FB_I740 is not set
 # CONFIG_FB_LE80578 is not set
-CONFIG_FB_MATROX=m
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G=y
-CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MAVEN=m
+# CONFIG_FB_MATROX is not set
 # CONFIG_FB_RADEON is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_S3=m
-CONFIG_FB_S3_DDC=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
 # CONFIG_FB_SIS is not set
-CONFIG_FB_VIA=m
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-# CONFIG_FB_VIA_X_COMPATIBILITY is not set
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_3DFX_ACCEL=y
-CONFIG_FB_3DFX_I2C=y
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
-CONFIG_FB_TRIDENT=m
+# CONFIG_FB_VIA is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_ARK is not set
 # CONFIG_FB_PM3 is not set
 # CONFIG_FB_CARMINE is not set
 # CONFIG_FB_SMSCUFX is not set
-CONFIG_FB_UDL=m
+# CONFIG_FB_UDL is not set
 # CONFIG_FB_IBM_GXT4500 is not set
-CONFIG_FB_VIRTUAL=m
-CONFIG_FB_METRONOME=m
-CONFIG_FB_MB862XX=m
-CONFIG_FB_MB862XX_PCI_GDC=y
-CONFIG_FB_MB862XX_I2C=y
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
 # CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_AUO_K190X is not set
-# CONFIG_FB_HYPERV is not set
-# CONFIG_FB_SIMPLE is not set
-# CONFIG_FB_SSD1307 is not set
+CONFIG_FB_SIMPLE=y
 # CONFIG_FB_SM712 is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_LCD_L4F00242T03=m
-CONFIG_LCD_LMS283GF05=m
-CONFIG_LCD_LTV350QV=m
-CONFIG_LCD_ILI922X=m
-CONFIG_LCD_ILI9320=m
-CONFIG_LCD_TDO24M=m
-CONFIG_LCD_VGG2432A4=m
+CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI922X is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
 CONFIG_LCD_PLATFORM=m
-CONFIG_LCD_S6E63M0=m
-CONFIG_LCD_LD9040=m
-CONFIG_LCD_AMS369FG06=m
-CONFIG_LCD_LMS501KF03=m
-CONFIG_LCD_HX8357=m
+# CONFIG_LCD_S6E63M0 is not set
+# CONFIG_LCD_LD9040 is not set
+# CONFIG_LCD_AMS369FG06 is not set
+# CONFIG_LCD_LMS501KF03 is not set
+# CONFIG_LCD_HX8357 is not set
+# CONFIG_LCD_OTM3225A is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_LM3533=m
-CONFIG_BACKLIGHT_PWM=m
-CONFIG_BACKLIGHT_APPLE=m
+# CONFIG_BACKLIGHT_PWM is not set
+# CONFIG_BACKLIGHT_APPLE is not set
 # CONFIG_BACKLIGHT_PM8941_WLED is not set
-CONFIG_BACKLIGHT_SAHARA=m
-CONFIG_BACKLIGHT_ADP8860=m
-CONFIG_BACKLIGHT_ADP8870=m
+# CONFIG_BACKLIGHT_SAHARA is not set
+# CONFIG_BACKLIGHT_ADP8860 is not set
+# CONFIG_BACKLIGHT_ADP8870 is not set
 CONFIG_BACKLIGHT_LM3630A=m
-CONFIG_BACKLIGHT_LM3639=m
-CONFIG_BACKLIGHT_LP855X=m
-CONFIG_BACKLIGHT_TPS65217=m
+# CONFIG_BACKLIGHT_LM3639 is not set
+# CONFIG_BACKLIGHT_LP855X is not set
 CONFIG_BACKLIGHT_GPIO=m
 CONFIG_BACKLIGHT_LV5207LP=m
 CONFIG_BACKLIGHT_BD6107=m
 # CONFIG_BACKLIGHT_ARCXCNN is not set
-CONFIG_VGASTATE=m
 CONFIG_HDMI=y
 
 #
 # Console display driver support
 #
-CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+# CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 CONFIG_SOUND_OSS_CORE=y
@@ -4869,128 +4190,104 @@ CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SND=y
 CONFIG_SND_TIMER=y
 CONFIG_SND_PCM=y
-CONFIG_SND_PCM_ELD=y
-CONFIG_SND_PCM_IEC958=y
-CONFIG_SND_DMAENGINE_PCM=y
-CONFIG_SND_HWDEP=y
+CONFIG_SND_HWDEP=m
 CONFIG_SND_SEQ_DEVICE=y
 CONFIG_SND_RAWMIDI=y
-CONFIG_SND_COMPRESS_OFFLOAD=y
 CONFIG_SND_JACK=y
 CONFIG_SND_JACK_INPUT_DEV=y
 CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=y
-CONFIG_SND_PCM_OSS=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_PCM_TIMER=y
 CONFIG_SND_HRTIMER=y
 CONFIG_SND_DYNAMIC_MINORS=y
 CONFIG_SND_MAX_CARDS=32
-# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_PROC_FS=y
 CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
+CONFIG_SND_VERBOSE_PRINTK=y
 # CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
 CONFIG_SND_DMA_SGBUF=y
-CONFIG_SND_SEQUENCER=y
+CONFIG_SND_SEQUENCER=m
 # CONFIG_SND_SEQ_DUMMY is not set
 # CONFIG_SND_SEQUENCER_OSS is not set
 CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_SEQ_MIDI_EVENT=y
-CONFIG_SND_SEQ_MIDI=y
-CONFIG_SND_SEQ_MIDI_EMUL=m
-CONFIG_SND_SEQ_VIRMIDI=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-# CONFIG_SND_OPL4_LIB_SEQ is not set
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
 CONFIG_SND_DRIVERS=y
 # CONFIG_SND_PCSP is not set
 CONFIG_SND_DUMMY=m
 # CONFIG_SND_ALOOP is not set
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-# CONFIG_SND_MTS64 is not set
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_SB_COMMON=m
+# CONFIG_SND_VIRMIDI is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
 CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ASIHPI=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_ES1968_INPUT=y
-# CONFIG_SND_ES1968_RADIO is not set
-CONFIG_SND_FM801=m
-# CONFIG_SND_FM801_TEA575X_BOOL is not set
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ASIHPI is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_OXYGEN is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CTXFI is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGOIOX is not set
+# CONFIG_SND_INDIGODJX is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
 # CONFIG_SND_KORG1212 is not set
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
+# CONFIG_SND_LOLA is not set
+# CONFIG_SND_LX6464ES is not set
 # CONFIG_SND_MAESTRO3 is not set
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_SE6X is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VIRTUOSO is not set
+# CONFIG_SND_VX222 is not set
 # CONFIG_SND_YMFPCI is not set
 
 #
@@ -5031,25 +4328,15 @@ CONFIG_SND_USB_CAIAQ=m
 CONFIG_SND_USB_US122L=y
 CONFIG_SND_USB_6FIRE=m
 CONFIG_SND_USB_HIFACE=m
-CONFIG_SND_BCD2000=m
-CONFIG_SND_USB_LINE6=m
-CONFIG_SND_USB_POD=m
-CONFIG_SND_USB_PODHD=m
-CONFIG_SND_USB_TONEPORT=m
-CONFIG_SND_USB_VARIAX=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
+# CONFIG_SND_BCD2000 is not set
+# CONFIG_SND_USB_POD is not set
+# CONFIG_SND_USB_PODHD is not set
+# CONFIG_SND_USB_TONEPORT is not set
+# CONFIG_SND_USB_VARIAX is not set
 CONFIG_SND_SOC=y
-CONFIG_SND_SOC_AC97_BUS=y
-CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
-CONFIG_SND_SOC_COMPRESS=y
-CONFIG_SND_SOC_TOPOLOGY=y
-CONFIG_SND_SOC_ACPI=y
 # CONFIG_SND_SOC_AMD_ACP is not set
-CONFIG_SND_ATMEL_SOC=m
-CONFIG_SND_DESIGNWARE_I2S=m
-# CONFIG_SND_DESIGNWARE_PCM is not set
+# CONFIG_SND_ATMEL_SOC is not set
+# CONFIG_SND_DESIGNWARE_I2S is not set
 
 #
 # SoC Audio for Freescale CPUs
@@ -5066,54 +4353,7 @@ CONFIG_SND_DESIGNWARE_I2S=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_I2S_HI6210_I2S is not set
 # CONFIG_SND_SOC_IMG is not set
-CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
-CONFIG_SND_SST_IPC=y
-CONFIG_SND_SST_IPC_ACPI=y
-CONFIG_SND_SOC_INTEL_SST_ACPI=m
-CONFIG_SND_SOC_INTEL_SST=m
-CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m
-CONFIG_SND_SOC_INTEL_HASWELL=m
-CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=y
-# CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI is not set
-CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=y
-CONFIG_SND_SOC_INTEL_SKYLAKE=m
-CONFIG_SND_SOC_ACPI_INTEL_MATCH=y
-CONFIG_SND_SOC_INTEL_MACH=y
-CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
-# CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
-CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
-CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
-# CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH is not set
-CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
-CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
-CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
-# CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH is not set
-# CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH is not set
-# CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set
-CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
-# CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH is not set
-# CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXT_PCM512x_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXT_TDF8532_MACH is not set
-# CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH is not set
-# CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH is not set
-# CONFIG_SND_SOC_INTEL_CNL_FPGA is not set
-# CONFIG_SND_SOC_INTEL_CNL_CS42L42_MACH is not set
-# CONFIG_SND_SOC_INTEL_CNL_RT700_MACH is not set
-# CONFIG_SND_SOC_INTEL_CNL_SVFPGA_MACH is not set
-# CONFIG_SND_SOC_INTEL_CNL_RT274_MACH is not set
-# CONFIG_SND_SOC_SDW_AGGM1M2 is not set
-# CONFIG_SND_SOC_INTEL_BXT_ULL_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXTP_IVI_RSE_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXTP_IVI_HU_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXTP_IVI_M3_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXTP_IVI_GENERIC_MACH is not set
-CONFIG_SND_SOC_SOF=m
-# CONFIG_SND_SOC_SOF_NOCODEC is not set
-# CONFIG_SND_SOC_SOF_DEBUG is not set
-# CONFIG_SND_SOC_SOF_INTEL is not set
+# CONFIG_SND_SOC_INTEL_SST_TOPLEVEL is not set
 
 #
 # STMicroelectronics STM32 SOC audio support
@@ -5130,129 +4370,117 @@ CONFIG_SND_SOC_ADAU1701=m
 # CONFIG_SND_SOC_ADAU1761_I2C is not set
 # CONFIG_SND_SOC_ADAU1761_SPI is not set
 # CONFIG_SND_SOC_ADAU7002 is not set
-CONFIG_SND_SOC_AK4104=m
-CONFIG_SND_SOC_AK4554=m
-CONFIG_SND_SOC_AK4613=m
-CONFIG_SND_SOC_AK4642=m
-CONFIG_SND_SOC_AK5386=m
-CONFIG_SND_SOC_ALC5623=m
+# CONFIG_SND_SOC_AK4104 is not set
+# CONFIG_SND_SOC_AK4458 is not set
+# CONFIG_SND_SOC_AK4554 is not set
+# CONFIG_SND_SOC_AK4613 is not set
+# CONFIG_SND_SOC_AK4642 is not set
+# CONFIG_SND_SOC_AK5386 is not set
+# CONFIG_SND_SOC_AK5558 is not set
+# CONFIG_SND_SOC_ALC5623 is not set
+# CONFIG_SND_SOC_BD28623 is not set
 # CONFIG_SND_SOC_BT_SCO is not set
-CONFIG_SND_SOC_CS35L32=m
+# CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 # CONFIG_SND_SOC_CS35L34 is not set
 # CONFIG_SND_SOC_CS35L35 is not set
 # CONFIG_SND_SOC_CS42L42 is not set
-# CONFIG_SND_SOC_SVFPGA is not set
-# CONFIG_SND_SOC_SVFPGA_SDW is not set
-# CONFIG_SND_SOC_SVFPGA_I2C is not set
-CONFIG_SND_SOC_CS42L51=m
-CONFIG_SND_SOC_CS42L51_I2C=m
-CONFIG_SND_SOC_CS42L52=m
-CONFIG_SND_SOC_CS42L56=m
-CONFIG_SND_SOC_CS42L73=m
-CONFIG_SND_SOC_CS4265=m
-CONFIG_SND_SOC_CS4270=m
-CONFIG_SND_SOC_CS4271=m
-CONFIG_SND_SOC_CS4271_I2C=m
-CONFIG_SND_SOC_CS4271_SPI=m
-CONFIG_SND_SOC_CS42XX8=m
-CONFIG_SND_SOC_CS42XX8_I2C=m
+# CONFIG_SND_SOC_CS42L51_I2C is not set
+# CONFIG_SND_SOC_CS42L52 is not set
+# CONFIG_SND_SOC_CS42L56 is not set
+# CONFIG_SND_SOC_CS42L73 is not set
+# CONFIG_SND_SOC_CS4265 is not set
+# CONFIG_SND_SOC_CS4270 is not set
+# CONFIG_SND_SOC_CS4271_I2C is not set
+# CONFIG_SND_SOC_CS4271_SPI is not set
+# CONFIG_SND_SOC_CS42XX8_I2C is not set
 # CONFIG_SND_SOC_CS43130 is not set
-CONFIG_SND_SOC_CS4349=m
+# CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
-# CONFIG_SND_SOC_DIO2125 is not set
-CONFIG_SND_SOC_DMIC=m
-CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_ES7134 is not set
+# CONFIG_SND_SOC_ES7241 is not set
 # CONFIG_SND_SOC_ES8316 is not set
 # CONFIG_SND_SOC_ES8328_I2C is not set
 # CONFIG_SND_SOC_ES8328_SPI is not set
 # CONFIG_SND_SOC_GTM601 is not set
-CONFIG_SND_SOC_HDAC_HDMI=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-CONFIG_SND_SOC_MAX98090=m
 # CONFIG_SND_SOC_MAX98504 is not set
+# CONFIG_SND_SOC_MAX9867 is not set
 # CONFIG_SND_SOC_MAX98927 is not set
+# CONFIG_SND_SOC_MAX98373 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
-CONFIG_SND_SOC_PCM1681=m
+# CONFIG_SND_SOC_PCM1681 is not set
+# CONFIG_SND_SOC_PCM1789_I2C is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X_SPI is not set
+# CONFIG_SND_SOC_PCM186X_I2C is not set
+# CONFIG_SND_SOC_PCM186X_SPI is not set
 # CONFIG_SND_SOC_PCM3168A_I2C is not set
 # CONFIG_SND_SOC_PCM3168A_SPI is not set
-CONFIG_SND_SOC_PCM512x=m
-CONFIG_SND_SOC_PCM512x_I2C=m
-CONFIG_SND_SOC_PCM512x_SPI=m
-CONFIG_SND_SOC_RL6231=m
-CONFIG_SND_SOC_RL6347A=m
-CONFIG_SND_SOC_RT286=m
+# CONFIG_SND_SOC_PCM512x_I2C is not set
+# CONFIG_SND_SOC_PCM512x_SPI is not set
 # CONFIG_SND_SOC_RT5616 is not set
-CONFIG_SND_SOC_RT5631=m
-CONFIG_SND_SOC_RT5640=m
-CONFIG_SND_SOC_RT5645=m
-CONFIG_SND_SOC_RT5670=m
-# CONFIG_SND_SOC_RT5677_SPI is not set
-# CONFIG_SND_SOC_RT700 is not set
-# CONFIG_SND_SOC_RT700_SDW is not set
-CONFIG_SND_SOC_SGTL5000=m
-CONFIG_SND_SOC_SIGMADSP=m
-CONFIG_SND_SOC_SIGMADSP_I2C=m
-CONFIG_SND_SOC_SIRF_AUDIO_CODEC=m
-CONFIG_SND_SOC_SPDIF=m
-CONFIG_SND_SOC_SSM2602=m
-CONFIG_SND_SOC_SSM2602_SPI=m
-CONFIG_SND_SOC_SSM2602_I2C=m
-CONFIG_SND_SOC_SSM4567=m
-CONFIG_SND_SOC_STA32X=m
-CONFIG_SND_SOC_STA350=m
-CONFIG_SND_SOC_STI_SAS=m
-CONFIG_SND_SOC_TAS2552=m
-CONFIG_SND_SOC_TAS5086=m
-CONFIG_SND_SOC_TAS571X=m
+# CONFIG_SND_SOC_RT5631 is not set
+# CONFIG_SND_SOC_SGTL5000 is not set
+# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
+# CONFIG_SND_SOC_SPDIF is not set
+# CONFIG_SND_SOC_SSM2305 is not set
+# CONFIG_SND_SOC_SSM2602_SPI is not set
+# CONFIG_SND_SOC_SSM2602_I2C is not set
+# CONFIG_SND_SOC_SSM4567 is not set
+# CONFIG_SND_SOC_STA32X is not set
+# CONFIG_SND_SOC_STA350 is not set
+# CONFIG_SND_SOC_STI_SAS is not set
+# CONFIG_SND_SOC_TAS2552 is not set
+# CONFIG_SND_SOC_TAS5086 is not set
+# CONFIG_SND_SOC_TAS571X is not set
 # CONFIG_SND_SOC_TAS5720 is not set
-CONFIG_SND_SOC_TFA9879=m
-CONFIG_SND_SOC_TLV320AIC23=m
-CONFIG_SND_SOC_TLV320AIC23_I2C=m
-CONFIG_SND_SOC_TLV320AIC23_SPI=m
-CONFIG_SND_SOC_TLV320AIC31XX=m
-CONFIG_SND_SOC_TLV320AIC3X=m
-CONFIG_SND_SOC_TS3A227E=m
-CONFIG_SND_SOC_WM8510=m
-CONFIG_SND_SOC_WM8523=m
+# CONFIG_SND_SOC_TAS6424 is not set
+# CONFIG_SND_SOC_TDA7419 is not set
+# CONFIG_SND_SOC_TFA9879 is not set
+# CONFIG_SND_SOC_TLV320AIC23_I2C is not set
+# CONFIG_SND_SOC_TLV320AIC23_SPI is not set
+# CONFIG_SND_SOC_TLV320AIC31XX is not set
+# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set
+# CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set
+# CONFIG_SND_SOC_TLV320AIC3X is not set
+# CONFIG_SND_SOC_TS3A227E is not set
+# CONFIG_SND_SOC_TSCS42XX is not set
+# CONFIG_SND_SOC_TSCS454 is not set
+# CONFIG_SND_SOC_WM8510 is not set
+# CONFIG_SND_SOC_WM8523 is not set
 # CONFIG_SND_SOC_WM8524 is not set
-CONFIG_SND_SOC_WM8580=m
-CONFIG_SND_SOC_WM8711=m
-CONFIG_SND_SOC_WM8728=m
-CONFIG_SND_SOC_WM8731=m
-CONFIG_SND_SOC_WM8737=m
-CONFIG_SND_SOC_WM8741=m
-CONFIG_SND_SOC_WM8750=m
-CONFIG_SND_SOC_WM8753=m
-CONFIG_SND_SOC_WM8770=m
-CONFIG_SND_SOC_WM8776=m
-CONFIG_SND_SOC_WM8804=m
-CONFIG_SND_SOC_WM8804_I2C=m
-CONFIG_SND_SOC_WM8804_SPI=m
-CONFIG_SND_SOC_WM8903=m
+# CONFIG_SND_SOC_WM8580 is not set
+# CONFIG_SND_SOC_WM8711 is not set
+# CONFIG_SND_SOC_WM8728 is not set
+# CONFIG_SND_SOC_WM8731 is not set
+# CONFIG_SND_SOC_WM8737 is not set
+# CONFIG_SND_SOC_WM8741 is not set
+# CONFIG_SND_SOC_WM8750 is not set
+# CONFIG_SND_SOC_WM8753 is not set
+# CONFIG_SND_SOC_WM8770 is not set
+# CONFIG_SND_SOC_WM8776 is not set
+# CONFIG_SND_SOC_WM8782 is not set
+# CONFIG_SND_SOC_WM8804_I2C is not set
+# CONFIG_SND_SOC_WM8804_SPI is not set
+# CONFIG_SND_SOC_WM8903 is not set
 # CONFIG_SND_SOC_WM8960 is not set
-CONFIG_SND_SOC_WM8962=m
+# CONFIG_SND_SOC_WM8962 is not set
 # CONFIG_SND_SOC_WM8974 is not set
-CONFIG_SND_SOC_WM8978=m
+# CONFIG_SND_SOC_WM8978 is not set
 # CONFIG_SND_SOC_WM8985 is not set
 # CONFIG_SND_SOC_ZX_AUD96P22 is not set
+# CONFIG_SND_SOC_MAX9759 is not set
+# CONFIG_SND_SOC_MT6351 is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
 # CONFIG_SND_SOC_NAU8824 is not set
-CONFIG_SND_SOC_TPA6130A2=m
-CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SIMPLE_CARD=m
-# CONFIG_SND_SIMPLE_SCU_CARD is not set
-# CONFIG_SND_AUDIO_GRAPH_CARD is not set
-# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
+# CONFIG_SND_SOC_TPA6130A2 is not set
+# CONFIG_SND_SIMPLE_CARD is not set
 CONFIG_SND_X86=y
 # CONFIG_HDMI_LPE_AUDIO is not set
-CONFIG_SND_SYNTH_EMUX=m
-CONFIG_AC97_BUS=y
 
 #
 # HID support
@@ -5266,102 +4494,93 @@ CONFIG_HID_GENERIC=y
 #
 # Special HID drivers
 #
-CONFIG_HID_A4TECH=m
+CONFIG_HID_A4TECH=y
 # CONFIG_HID_ACCUTOUCH is not set
-CONFIG_HID_ACRUX=m
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_APPLE=m
-CONFIG_HID_APPLEIR=m
+# CONFIG_HID_ACRUX is not set
+CONFIG_HID_APPLE=y
+# CONFIG_HID_APPLEIR is not set
 # CONFIG_HID_ASUS is not set
-CONFIG_HID_AUREAL=m
-CONFIG_HID_BELKIN=m
+# CONFIG_HID_AUREAL is not set
+CONFIG_HID_BELKIN=y
 # CONFIG_HID_BETOP_FF is not set
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
+CONFIG_HID_CHERRY=y
+CONFIG_HID_CHICONY=y
 # CONFIG_HID_CORSAIR is not set
-CONFIG_HID_PRODIKEYS=m
+# CONFIG_HID_COUGAR is not set
+# CONFIG_HID_PRODIKEYS is not set
 # CONFIG_HID_CMEDIA is not set
-CONFIG_HID_CP2112=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_ELECOM=m
+# CONFIG_HID_CP2112 is not set
+CONFIG_HID_CYPRESS=y
+# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_EMS_FF is not set
+# CONFIG_HID_ELAN is not set
+# CONFIG_HID_ELECOM is not set
 CONFIG_HID_ELO=m
-CONFIG_HID_EZKEY=m
+CONFIG_HID_EZKEY=y
 # CONFIG_HID_GEMBIRD is not set
 # CONFIG_HID_GFRM is not set
-CONFIG_HID_HOLTEK=m
-CONFIG_HOLTEK_FF=y
-CONFIG_HID_GT683R=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_ICADE=m
+# CONFIG_HID_HOLTEK is not set
+# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GT683R is not set
+# CONFIG_HID_KEYTOUCH is not set
+# CONFIG_HID_KYE is not set
+# CONFIG_HID_UCLOGIC is not set
+# CONFIG_HID_WALTOP is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID_ICADE is not set
 # CONFIG_HID_ITE is not set
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LED=m
-CONFIG_HID_LENOVO=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_LOGITECH_HIDPP=m
+# CONFIG_HID_JABRA is not set
+# CONFIG_HID_TWINHAN is not set
+CONFIG_HID_KENSINGTON=y
+# CONFIG_HID_LCPOWER is not set
+# CONFIG_HID_LED is not set
+# CONFIG_HID_LENOVO is not set
+CONFIG_HID_LOGITECH=y
+# CONFIG_HID_LOGITECH_DJ is not set
+# CONFIG_HID_LOGITECH_HIDPP is not set
 CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
+# CONFIG_LOGIRUMBLEPAD2_FF is not set
+# CONFIG_LOGIG940_FF is not set
 CONFIG_LOGIWHEELS_FF=y
 CONFIG_HID_MAGICMOUSE=m
 # CONFIG_HID_MAYFLASH is not set
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
+# CONFIG_HID_REDRAGON is not set
+CONFIG_HID_MICROSOFT=y
+CONFIG_HID_MONTEREY=y
 CONFIG_HID_MULTITOUCH=y
 # CONFIG_HID_NTI is not set
 CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_PANTHERLORD_FF=y
-CONFIG_HID_PENMOUNT=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD_CIR=y
-CONFIG_HID_PLANTRONICS=m
-CONFIG_HID_PRIMAX=m
+# CONFIG_HID_ORTEK is not set
+# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PENMOUNT is not set
+# CONFIG_HID_PETALYNX is not set
+# CONFIG_HID_PICOLCD is not set
+# CONFIG_HID_PLANTRONICS is not set
+# CONFIG_HID_PRIMAX is not set
 # CONFIG_HID_RETRODE is not set
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAITEK=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SONY=m
-# CONFIG_SONY_FF is not set
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_STEELSERIES=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_RMI=m
-CONFIG_HID_GREENASIA=m
-CONFIG_GREENASIA_FF=y
-CONFIG_HID_HYPERV_MOUSE=m
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_HID_TIVO=m
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_THINGM=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_THRUSTMASTER_FF=y
+# CONFIG_HID_ROCCAT is not set
+# CONFIG_HID_SAITEK is not set
+# CONFIG_HID_SAMSUNG is not set
+# CONFIG_HID_SONY is not set
+# CONFIG_HID_SPEEDLINK is not set
+# CONFIG_HID_STEAM is not set
+# CONFIG_HID_STEELSERIES is not set
+# CONFIG_HID_SUNPLUS is not set
+# CONFIG_HID_RMI is not set
+# CONFIG_HID_GREENASIA is not set
+# CONFIG_HID_SMARTJOYPLUS is not set
+# CONFIG_HID_TIVO is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_HID_THINGM is not set
+# CONFIG_HID_THRUSTMASTER is not set
 # CONFIG_HID_UDRAW_PS3 is not set
-CONFIG_HID_WACOM=m
-CONFIG_HID_WIIMOTE=m
+# CONFIG_HID_WACOM is not set
+# CONFIG_HID_WIIMOTE is not set
 CONFIG_HID_XINMO=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_HID_ZYDACRON=m
+# CONFIG_HID_ZEROPLUS is not set
+# CONFIG_HID_ZYDACRON is not set
 CONFIG_HID_SENSOR_HUB=m
-CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
+# CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set
 # CONFIG_HID_ALPS is not set
 
 #
@@ -5380,7 +4599,6 @@ CONFIG_I2C_HID=m
 # Intel ISH HID support
 #
 # CONFIG_INTEL_ISH_HID is not set
-# CONFIG_INTEL_ISH_UART_INTERFACE is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
@@ -5407,6 +4625,7 @@ CONFIG_USB_MON=y
 #
 # CONFIG_USB_C67X00_HCD is not set
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DBGCAP=y
 CONFIG_USB_XHCI_PCI=y
 CONFIG_USB_XHCI_PLATFORM=y
 CONFIG_USB_EHCI_HCD=y
@@ -5416,9 +4635,8 @@ CONFIG_USB_EHCI_PCI=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_OXU210HP_HCD=y
 CONFIG_USB_ISP116X_HCD=y
-CONFIG_USB_ISP1362_HCD=y
-# CONFIG_USB_FOTG210_HCD is not set
-CONFIG_USB_MAX3421_HCD=y
+CONFIG_USB_FOTG210_HCD=m
+# CONFIG_USB_MAX3421_HCD is not set
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PCI=y
 CONFIG_USB_OHCI_HCD_PLATFORM=y
@@ -5608,6 +4826,7 @@ CONFIG_USB_GADGET_DEBUG_FILES=y
 CONFIG_USB_GADGET_DEBUG_FS=y
 CONFIG_USB_GADGET_VBUS_DRAW=500
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+# CONFIG_U_SERIAL_CONSOLE is not set
 
 #
 # USB Peripheral Controller
@@ -5629,8 +4848,11 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_GADGET_XILINX is not set
 # CONFIG_USB_DUMMY_HCD is not set
 CONFIG_USB_LIBCOMPOSITE=y
+CONFIG_USB_U_SERIAL=y
 CONFIG_USB_U_ETHER=y
+CONFIG_USB_F_SERIAL=y
 CONFIG_USB_F_RNDIS=y
+CONFIG_USB_F_MASS_STORAGE=y
 CONFIG_USB_F_FS=y
 CONFIG_USB_F_UVC=m
 CONFIG_USB_F_MIDI=y
@@ -5710,45 +4932,21 @@ CONFIG_SDIO_UART=m
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PCI=y
-CONFIG_MMC_RICOH_MMC=y
+# CONFIG_MMC_RICOH_MMC is not set
 CONFIG_MMC_SDHCI_ACPI=y
-CONFIG_MMC_SDHCI_PLTFM=y
-# CONFIG_MMC_SDHCI_OF_ARASAN is not set
-# CONFIG_MMC_SDHCI_OF_AT91 is not set
-# CONFIG_MMC_SDHCI_CADENCE is not set
-CONFIG_MMC_SDHCI_F_SDH30=m
-CONFIG_MMC_WBSD=m
-CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_SPI=m
-CONFIG_MMC_SDRICOH_CS=m
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_USHC=m
-CONFIG_MMC_USDHI6ROL0=m
-CONFIG_MMC_REALTEK_PCI=y
-CONFIG_MMC_REALTEK_USB=m
-CONFIG_MMC_TOSHIBA_PCI=m
-CONFIG_MMC_MTK=m
-# CONFIG_MMC_SDHCI_XENON is not set
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-CONFIG_MS_BLOCK=m
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_TIFM_MS=m
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_PCI=m
-CONFIG_MEMSTICK_REALTEK_USB=m
+# CONFIG_MMC_SDHCI_PLTFM is not set
+# CONFIG_MMC_WBSD is not set
+# CONFIG_MMC_TIFM_SD is not set
+# CONFIG_MMC_SPI is not set
+# CONFIG_MMC_CB710 is not set
+# CONFIG_MMC_VIA_SDMMC is not set
+# CONFIG_MMC_VUB300 is not set
+# CONFIG_MMC_USHC is not set
+# CONFIG_MMC_USDHI6ROL0 is not set
+CONFIG_MMC_CQHCI=y
+# CONFIG_MMC_TOSHIBA_PCI is not set
+# CONFIG_MMC_MTK is not set
+# CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_CLASS_FLASH is not set
@@ -5757,22 +4955,17 @@ CONFIG_LEDS_CLASS=y
 #
 # LED drivers
 #
-# CONFIG_LEDS_BCM6328 is not set
-# CONFIG_LEDS_BCM6358 is not set
+# CONFIG_LEDS_APU is not set
 # CONFIG_LEDS_LM3530 is not set
-# CONFIG_LEDS_LM3533 is not set
 # CONFIG_LEDS_LM3642 is not set
-# CONFIG_LEDS_MT6323 is not set
 # CONFIG_LEDS_PCA9532 is not set
-CONFIG_LEDS_GPIO=m
+# CONFIG_LEDS_GPIO is not set
 # CONFIG_LEDS_LP3944 is not set
 # CONFIG_LEDS_LP3952 is not set
 # CONFIG_LEDS_LP5521 is not set
 # CONFIG_LEDS_LP5523 is not set
 # CONFIG_LEDS_LP5562 is not set
 # CONFIG_LEDS_LP8501 is not set
-# CONFIG_LEDS_LP8860 is not set
-# CONFIG_LEDS_CLEVO_MAIL is not set
 # CONFIG_LEDS_PCA955X is not set
 # CONFIG_LEDS_PCA963X is not set
 # CONFIG_LEDS_DAC124S085 is not set
@@ -5784,16 +4977,13 @@ CONFIG_LEDS_GPIO=m
 # CONFIG_LEDS_TCA6507 is not set
 # CONFIG_LEDS_TLC591XX is not set
 # CONFIG_LEDS_LM355x is not set
-# CONFIG_LEDS_MENF21BMC is not set
-# CONFIG_LEDS_IS31FL319X is not set
-# CONFIG_LEDS_IS31FL32XX is not set
 
 #
 # LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
 #
 # CONFIG_LEDS_BLINKM is not set
-# CONFIG_LEDS_SYSCON is not set
 # CONFIG_LEDS_MLXCPLD is not set
+# CONFIG_LEDS_MLXREG is not set
 # CONFIG_LEDS_USER is not set
 # CONFIG_LEDS_NIC78BX is not set
 
@@ -5801,13 +4991,13 @@ CONFIG_LEDS_GPIO=m
 # LED Triggers
 #
 CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
+# CONFIG_LEDS_TRIGGER_TIMER is not set
 # CONFIG_LEDS_TRIGGER_ONESHOT is not set
 # CONFIG_LEDS_TRIGGER_DISK is not set
-# CONFIG_LEDS_TRIGGER_MTD is not set
 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
 # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
 # CONFIG_LEDS_TRIGGER_CPU is not set
+# CONFIG_LEDS_TRIGGER_ACTIVITY is not set
 # CONFIG_LEDS_TRIGGER_GPIO is not set
 # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
 
@@ -5817,6 +5007,7 @@ CONFIG_LEDS_TRIGGER_TIMER=y
 # CONFIG_LEDS_TRIGGER_TRANSIENT is not set
 # CONFIG_LEDS_TRIGGER_CAMERA is not set
 # CONFIG_LEDS_TRIGGER_PANIC is not set
+# CONFIG_LEDS_TRIGGER_NETDEV is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 CONFIG_EDAC_ATOMIC_SCRUB=y
@@ -5829,7 +5020,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
-CONFIG_RTC_DEBUG=y
+# CONFIG_RTC_DEBUG is not set
 CONFIG_RTC_NVMEM=y
 
 #
@@ -5844,37 +5035,30 @@ CONFIG_RTC_INTF_DEV=y
 #
 # I2C RTC drivers
 #
-CONFIG_RTC_DRV_88PM80X=m
-CONFIG_RTC_DRV_ABB5ZES3=m
+# CONFIG_RTC_DRV_ABB5ZES3 is not set
 # CONFIG_RTC_DRV_ABX80X is not set
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1307_HWMON=y
-# CONFIG_RTC_DRV_DS1307_CENTURY is not set
-CONFIG_RTC_DRV_DS1374=m
-# CONFIG_RTC_DRV_DS1374_WDT is not set
-CONFIG_RTC_DRV_DS1672=m
-# CONFIG_RTC_DRV_HYM8563 is not set
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_MAX8907=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_ISL12022=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF8523=m
-CONFIG_RTC_DRV_PCF85063=m
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_ISL12022 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8523 is not set
+# CONFIG_RTC_DRV_PCF85063 is not set
+# CONFIG_RTC_DRV_PCF85363 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_BQ32K is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
 # CONFIG_RTC_DRV_RX8010 is not set
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-CONFIG_RTC_DRV_EM3027=m
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
 # CONFIG_RTC_DRV_RV8803 is not set
-CONFIG_RTC_DRV_S5M=m
 
 #
 # SPI RTC drivers
@@ -5899,51 +5083,38 @@ CONFIG_RTC_I2C_AND_SPI=y
 #
 # SPI and I2C RTC drivers
 #
-CONFIG_RTC_DRV_DS3232=m
-CONFIG_RTC_DRV_DS3232_HWMON=y
-CONFIG_RTC_DRV_PCF2127=m
-CONFIG_RTC_DRV_RV3029C2=m
-CONFIG_RTC_DRV_RV3029_HWMON=y
+# CONFIG_RTC_DRV_DS3232 is not set
+# CONFIG_RTC_DRV_PCF2127 is not set
+# CONFIG_RTC_DRV_RV3029C2 is not set
 
 #
 # Platform RTC drivers
 #
 CONFIG_RTC_DRV_CMOS=y
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1685_FAMILY=m
-CONFIG_RTC_DRV_DS1685=y
-# CONFIG_RTC_DRV_DS1689 is not set
-# CONFIG_RTC_DRV_DS17285 is not set
-# CONFIG_RTC_DRV_DS17485 is not set
-# CONFIG_RTC_DRV_DS17885 is not set
-# CONFIG_RTC_DS1685_PROC_REGS is not set
-# CONFIG_RTC_DS1685_SYSFS_REGS is not set
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_DS2404=m
-CONFIG_RTC_DRV_STK17TA8=m
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1685_FAMILY is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_DS2404 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-# CONFIG_RTC_DRV_ZYNQMP is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_V3020 is not set
 
 #
 # on-CPU RTC drivers
 #
 # CONFIG_RTC_DRV_FTRTC010 is not set
-# CONFIG_RTC_DRV_SNVS is not set
-# CONFIG_RTC_DRV_MT6397 is not set
-# CONFIG_RTC_DRV_R7301 is not set
 
 #
 # HID Sensor RTC drivers
 #
-CONFIG_RTC_DRV_HID_SENSOR_TIME=m
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
 
@@ -5951,104 +5122,61 @@ CONFIG_DMADEVICES=y
 # DMA Devices
 #
 CONFIG_DMA_ENGINE=y
+CONFIG_DMA_VIRTUAL_CHANNELS=y
 CONFIG_DMA_ACPI=y
-CONFIG_DMA_OF=y
 # CONFIG_ALTERA_MSGDMA is not set
-# CONFIG_FSL_EDMA is not set
-# CONFIG_INTEL_IDMA64 is not set
-CONFIG_INTEL_IOATDMA=m
+CONFIG_INTEL_IDMA64=y
+# CONFIG_INTEL_IOATDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_HIDMA is not set
 CONFIG_DW_DMAC_CORE=y
-CONFIG_DW_DMAC=m
+CONFIG_DW_DMAC=y
 CONFIG_DW_DMAC_PCI=y
+CONFIG_HSU_DMA=y
 
 #
 # DMA Clients
 #
 # CONFIG_ASYNC_TX_DMA is not set
 # CONFIG_DMATEST is not set
-CONFIG_DMA_ENGINE_RAID=y
 
 #
 # DMABUF options
 #
 CONFIG_SYNC_FILE=y
-CONFIG_SW_SYNC=y
-
-#
-# hyper_dmabuf options
-#
-CONFIG_HYPER_DMABUF=y
-CONFIG_HYPER_DMABUF_SYSFS=y
-# CONFIG_HYPER_DMABUF_EVENT_GEN is not set
-CONFIG_DCA=m
+# CONFIG_SW_SYNC is not set
 # CONFIG_AUXDISPLAY is not set
-CONFIG_PANEL=m
-CONFIG_PANEL_PARPORT=0
-CONFIG_PANEL_PROFILE=5
-# CONFIG_PANEL_CHANGE_MESSAGE is not set
-CONFIG_CHARLCD=m
-CONFIG_UIO=m
-# CONFIG_UIO_CIF is not set
-# CONFIG_UIO_PDRV_GENIRQ is not set
-# CONFIG_UIO_DMEM_GENIRQ is not set
-# CONFIG_UIO_AEC is not set
-# CONFIG_UIO_SERCOS3 is not set
-# CONFIG_UIO_PCI_GENERIC is not set
-# CONFIG_UIO_NETX is not set
-# CONFIG_UIO_PRUSS is not set
-# CONFIG_UIO_MF624 is not set
-# CONFIG_UIO_HV_GENERIC is not set
+# CONFIG_UIO is not set
+# CONFIG_VFIO is not set
 CONFIG_VIRT_DRIVERS=y
+# CONFIG_VBOXGUEST is not set
 CONFIG_VIRTIO=y
-
-#
-# Virtio drivers
-#
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO_MMIO=m
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-# CONFIG_ACRN_VIRTIO_DEVICES is not set
+CONFIG_VIRTIO_MENU=y
+# CONFIG_VIRTIO_PCI is not set
+# CONFIG_VIRTIO_BALLOON is not set
+# CONFIG_VIRTIO_INPUT is not set
+# CONFIG_VIRTIO_MMIO is not set
 
 #
 # Microsoft Hyper-V guest support
 #
-CONFIG_HYPERV=y
-CONFIG_HYPERV_TSCPAGE=y
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_BALLOON=m
+# CONFIG_HYPERV is not set
 CONFIG_STAGING=y
-# CONFIG_IRDA is not set
-CONFIG_PRISM2_USB=m
-CONFIG_COMEDI=m
-# CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
-CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
-# CONFIG_COMEDI_MISC_DRIVERS is not set
-# CONFIG_COMEDI_ISA_DRIVERS is not set
-# CONFIG_COMEDI_PCI_DRIVERS is not set
-# CONFIG_COMEDI_PCMCIA_DRIVERS is not set
-# CONFIG_COMEDI_USB_DRIVERS is not set
-# CONFIG_COMEDI_8255_SA is not set
-# CONFIG_COMEDI_KCOMEDILIB is not set
+# CONFIG_PRISM2_USB is not set
+# CONFIG_COMEDI is not set
 CONFIG_RTL8192U=m
 CONFIG_RTLLIB=m
 CONFIG_RTLLIB_CRYPTO_CCMP=m
 CONFIG_RTLLIB_CRYPTO_TKIP=m
 CONFIG_RTLLIB_CRYPTO_WEP=m
 CONFIG_RTL8192E=m
-CONFIG_RTL8723BS=m
+# CONFIG_RTL8723BS is not set
 CONFIG_R8712U=m
-CONFIG_R8188EU=m
-CONFIG_88EU_AP_MODE=y
+# CONFIG_R8188EU is not set
 # CONFIG_R8822BE is not set
-CONFIG_RTS5208=m
-CONFIG_VT6655=m
-CONFIG_VT6656=m
+# CONFIG_RTS5208 is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
 
 #
 # IIO staging drivers
@@ -6057,21 +5185,17 @@ CONFIG_VT6656=m
 #
 # Accelerometers
 #
-CONFIG_ADIS16201=m
-CONFIG_ADIS16203=m
-CONFIG_ADIS16209=m
-CONFIG_ADIS16240=m
+# CONFIG_ADIS16203 is not set
+# CONFIG_ADIS16240 is not set
 
 #
 # Analog to digital converters
 #
-CONFIG_AD7606=m
-CONFIG_AD7606_IFACE_PARALLEL=m
-CONFIG_AD7606_IFACE_SPI=m
-CONFIG_AD7780=m
-CONFIG_AD7816=m
-CONFIG_AD7192=m
-CONFIG_AD7280=m
+# CONFIG_AD7606 is not set
+# CONFIG_AD7780 is not set
+# CONFIG_AD7816 is not set
+# CONFIG_AD7192 is not set
+# CONFIG_AD7280 is not set
 
 #
 # Analog digital bi-direction converters
@@ -6091,130 +5215,80 @@ CONFIG_AD7280=m
 # CONFIG_AD9832 is not set
 # CONFIG_AD9834 is not set
 
-#
-# Digital gyroscope sensors
-#
-CONFIG_ADIS16060=m
-
 #
 # Network Analyzer, Impedance Converters
 #
 # CONFIG_AD5933 is not set
 
-#
-# Light sensors
-#
-CONFIG_TSL2x7x=m
-
 #
 # Active energy metering IC
 #
-# CONFIG_ADE7753 is not set
-# CONFIG_ADE7754 is not set
-# CONFIG_ADE7758 is not set
-# CONFIG_ADE7759 is not set
 # CONFIG_ADE7854 is not set
 
 #
 # Resolver to digital converters
 #
 # CONFIG_AD2S90 is not set
-# CONFIG_AD2S1200 is not set
 # CONFIG_AD2S1210 is not set
-
-#
-# Triggers - standalone
-#
 # CONFIG_FB_SM750 is not set
-CONFIG_FB_XGI=m
+# CONFIG_FB_XGI is not set
 
 #
 # Speakup console speech
 #
 # CONFIG_SPEAKUP is not set
-CONFIG_STAGING_MEDIA=y
-# CONFIG_INTEL_ATOMISP is not set
-# CONFIG_I2C_BCM2048 is not set
-CONFIG_DVB_CXD2099=m
-# CONFIG_LIRC_STAGING is not set
+# CONFIG_STAGING_MEDIA is not set
 
 #
 # Android
 #
 CONFIG_ASHMEM=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
-CONFIG_SYNC=y
-# CONFIG_ANDROID_FWDATA is not set
 # CONFIG_ANDROID_VSOC is not set
-CONFIG_ION=y
-# CONFIG_ION_SYSTEM_HEAP is not set
-# CONFIG_ION_CARVEOUT_HEAP is not set
-# CONFIG_ION_CHUNK_HEAP is not set
+CONFIG_SYNC=y
+CONFIG_ANDROID_FWDATA=y
+# CONFIG_ION is not set
 # CONFIG_ABL_BOOTLOADER_CONTROL is not set
 # CONFIG_SEND_SLCAN_ENABLE is not set
 # CONFIG_SBL_BOOTLOADER_CONTROL is not set
 # CONFIG_VSBL_BOOTLOADER_CONTROL is not set
-# CONFIG_FIQ_WATCHDOG is not set
-# CONFIG_STAGING_BOARD is not set
-# CONFIG_LTE_GDM724X is not set
-# CONFIG_MTD_SPINAND_MT29F is not set
-# CONFIG_LNET is not set
+CONFIG_LTE_GDM724X=m
 # CONFIG_DGNC is not set
 # CONFIG_GS_FPGABOOT is not set
-# CONFIG_CRYPTO_SKEIN is not set
 # CONFIG_UNISYSSPAR is not set
-# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 # CONFIG_FB_TFT is not set
 # CONFIG_WILC1000_SDIO is not set
 # CONFIG_WILC1000_SPI is not set
 # CONFIG_MOST is not set
 # CONFIG_KS7010 is not set
 # CONFIG_GREYBUS is not set
+# CONFIG_DRM_VBOXVIDEO is not set
+# CONFIG_PI433 is not set
+# CONFIG_MTK_MMC is not set
 
 #
-# USB Power Delivery and Type-C drivers
+# Gasket devices
 #
 # CONFIG_TYPEC_TCPM is not set
 # CONFIG_DRM_VBOXVIDEO is not set
 # CONFIG_PI433 is not set
 CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_ACER_WMI=m
-CONFIG_ACERHDF=m
-CONFIG_ALIENWARE_WMI=m
-CONFIG_ASUS_LAPTOP=m
-# CONFIG_DELL_LAPTOP is not set
-# CONFIG_DELL_WMI is not set
-CONFIG_DELL_WMI_AIO=m
-# CONFIG_DELL_WMI_LED is not set
-CONFIG_DELL_SMO8800=m
-CONFIG_DELL_RBTN=m
-CONFIG_FUJITSU_LAPTOP=m
-CONFIG_FUJITSU_TABLET=m
-CONFIG_AMILO_RFKILL=m
-CONFIG_HP_ACCEL=m
-CONFIG_HP_WIRELESS=m
-CONFIG_HP_WMI=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-CONFIG_SONYPI_COMPAT=y
-CONFIG_IDEAPAD_LAPTOP=m
-# CONFIG_SURFACE3_WMI is not set
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-CONFIG_THINKPAD_ACPI_UNSAFE_LEDS=y
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_SENSORS_HDAPS=m
-CONFIG_INTEL_MENLOW=m
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_EEEPC_WMI=m
+# CONFIG_ACER_WIRELESS is not set
+# CONFIG_ACERHDF is not set
+# CONFIG_ASUS_LAPTOP is not set
+# CONFIG_DELL_SMBIOS is not set
+# CONFIG_DELL_SMO8800 is not set
+# CONFIG_DELL_RBTN is not set
+# CONFIG_FUJITSU_LAPTOP is not set
+# CONFIG_FUJITSU_TABLET is not set
+# CONFIG_GPD_POCKET_FAN is not set
+# CONFIG_HP_WIRELESS is not set
+# CONFIG_PANASONIC_LAPTOP is not set
+# CONFIG_COMPAL_LAPTOP is not set
+# CONFIG_SONY_LAPTOP is not set
+# CONFIG_THINKPAD_ACPI is not set
+# CONFIG_SENSORS_HDAPS is not set
+# CONFIG_INTEL_MENLOW is not set
+# CONFIG_EEEPC_LAPTOP is not set
 # CONFIG_ASUS_WIRELESS is not set
 CONFIG_ACPI_WMI=m
 CONFIG_WMI_BMOF=m
@@ -6243,23 +5317,17 @@ CONFIG_INTEL_SMARTCONNECT=m
 CONFIG_PVPANIC=m
 CONFIG_INTEL_PMC_IPC=y
 # CONFIG_INTEL_BXTWC_PMIC_TMU is not set
-CONFIG_SURFACE_PRO3_BUTTON=m
+# CONFIG_SURFACE_PRO3_BUTTON is not set
 # CONFIG_SURFACE_3_BUTTON is not set
 CONFIG_INTEL_PUNIT_IPC=y
 CONFIG_INTEL_TELEMETRY=y
 # CONFIG_MLX_PLATFORM is not set
-# CONFIG_MLX_CPLD_PLATFORM is not set
 # CONFIG_INTEL_TURBO_MAX_3 is not set
-# CONFIG_SILEAD_DMI is not set
+# CONFIG_I2C_MULTI_INSTANTIATE is not set
 # CONFIG_INTEL_PSTORE_PRAM is not set
 CONFIG_PMC_ATOM=y
-CONFIG_CHROME_PLATFORMS=y
-CONFIG_CHROMEOS_LAPTOP=m
-# CONFIG_CHROMEOS_PSTORE is not set
-CONFIG_CROS_EC_CHARDEV=m
-# CONFIG_CROS_EC_LPC is not set
-CONFIG_CROS_EC_PROTO=y
-# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+# CONFIG_CHROME_PLATFORMS is not set
+# CONFIG_MELLANOX_PLATFORM is not set
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -6267,19 +5335,12 @@ CONFIG_COMMON_CLK=y
 #
 # Common Clock Framework
 #
-# CONFIG_CLK_HSDK is not set
+# CONFIG_COMMON_CLK_MAX9485 is not set
 # CONFIG_COMMON_CLK_SI5351 is not set
-# CONFIG_COMMON_CLK_SI514 is not set
-# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_SI544 is not set
 # CONFIG_COMMON_CLK_CDCE706 is not set
-# CONFIG_COMMON_CLK_CDCE925 is not set
 # CONFIG_COMMON_CLK_CS2000_CP is not set
-# CONFIG_COMMON_CLK_S2MPS11 is not set
-# CONFIG_COMMON_CLK_NXP is not set
 # CONFIG_COMMON_CLK_PWM is not set
-# CONFIG_COMMON_CLK_PXA is not set
-# CONFIG_COMMON_CLK_PIC32 is not set
-# CONFIG_COMMON_CLK_VC5 is not set
 # CONFIG_HWSPINLOCK is not set
 
 #
@@ -6288,23 +5349,24 @@ CONFIG_COMMON_CLK=y
 CONFIG_CLKEVT_I8253=y
 CONFIG_I8253_LOCK=y
 CONFIG_CLKBLD_I8253=y
-# CONFIG_ATMEL_PIT is not set
-# CONFIG_SH_TIMER_CMT is not set
-# CONFIG_SH_TIMER_MTU2 is not set
-# CONFIG_SH_TIMER_TMU is not set
-# CONFIG_EM_TIMER_STI is not set
 CONFIG_MAILBOX=y
-# CONFIG_PLATFORM_MHU is not set
 CONFIG_PCC=y
 # CONFIG_ALTERA_MBOX is not set
-# CONFIG_MAILBOX_TEST is not set
+CONFIG_IOMMU_API=y
 CONFIG_IOMMU_SUPPORT=y
 
 #
 # Generic IOMMU Pagetable Support
 #
+# CONFIG_IOMMU_DEBUGFS is not set
+# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
+CONFIG_IOMMU_IOVA=y
 # CONFIG_AMD_IOMMU is not set
-# CONFIG_INTEL_IOMMU is not set
+CONFIG_DMAR_TABLE=y
+CONFIG_INTEL_IOMMU=y
+# CONFIG_INTEL_IOMMU_SVM is not set
+CONFIG_INTEL_IOMMU_DEFAULT_ON=y
+CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 # CONFIG_IRQ_REMAP is not set
 
 #
@@ -6316,6 +5378,8 @@ CONFIG_IOMMU_SUPPORT=y
 # Rpmsg drivers
 #
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
+# CONFIG_RPMSG_VIRTIO is not set
+# CONFIG_SOUNDWIRE is not set
 
 #
 # SOC (System On Chip) specific Drivers
@@ -6329,6 +5393,10 @@ CONFIG_IOMMU_SUPPORT=y
 # Broadcom SoC drivers
 #
 
+#
+# NXP/Freescale QorIQ SoC drivers
+#
+
 #
 # i.MX SoC drivers
 #
@@ -6336,8 +5404,12 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # Qualcomm SoC drivers
 #
-# CONFIG_SUNXI_SRAM is not set
 # CONFIG_SOC_TI is not set
+
+#
+# Xilinx SoC drivers
+#
+# CONFIG_XILINX_VCU is not set
 CONFIG_PM_DEVFREQ=y
 
 #
@@ -6345,7 +5417,7 @@ CONFIG_PM_DEVFREQ=y
 #
 CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
 # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
-CONFIG_DEVFREQ_GOV_POWERSAVE=m
+# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
 # CONFIG_DEVFREQ_GOV_USERSPACE is not set
 # CONFIG_DEVFREQ_GOV_PASSIVE is not set
 
@@ -6358,21 +5430,21 @@ CONFIG_EXTCON=y
 #
 # Extcon Device Drivers
 #
-CONFIG_EXTCON_ADC_JACK=m
-CONFIG_EXTCON_ARIZONA=m
-CONFIG_EXTCON_GPIO=m
+# CONFIG_EXTCON_ADC_JACK is not set
+CONFIG_EXTCON_ARIZONA=y
+CONFIG_EXTCON_GPIO=y
 # CONFIG_EXTCON_INTEL_INT3496 is not set
 # CONFIG_EXTCON_MAX3355 is not set
-CONFIG_EXTCON_RT8973A=m
-CONFIG_EXTCON_SM5502=m
-CONFIG_EXTCON_USB_GPIO=m
-# CONFIG_EXTCON_USBC_CROS_EC is not set
+# CONFIG_EXTCON_RT8973A is not set
+# CONFIG_EXTCON_SM5502 is not set
+# CONFIG_EXTCON_USB_GPIO is not set
 # CONFIG_MEMORY is not set
-CONFIG_IIO=m
+CONFIG_IIO=y
 CONFIG_IIO_BUFFER=y
 # CONFIG_IIO_BUFFER_CB is not set
-CONFIG_IIO_KFIFO_BUF=m
-CONFIG_IIO_TRIGGERED_BUFFER=m
+# CONFIG_IIO_BUFFER_HW_CONSUMER is not set
+CONFIG_IIO_KFIFO_BUF=y
+CONFIG_IIO_TRIGGERED_BUFFER=y
 # CONFIG_IIO_CONFIGFS is not set
 CONFIG_IIO_TRIGGER=y
 CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
@@ -6382,42 +5454,42 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 #
 # Accelerometers
 #
+# CONFIG_ADIS16201 is not set
+# CONFIG_ADIS16209 is not set
+# CONFIG_ADXL345_I2C is not set
+# CONFIG_ADXL345_SPI is not set
 CONFIG_BMA180=m
 # CONFIG_BMA220 is not set
-CONFIG_BMC150_ACCEL=m
-CONFIG_BMC150_ACCEL_I2C=m
-CONFIG_BMC150_ACCEL_SPI=m
+CONFIG_BMC150_ACCEL=y
+CONFIG_BMC150_ACCEL_I2C=y
+CONFIG_BMC150_ACCEL_SPI=y
 # CONFIG_DA280 is not set
 # CONFIG_DA311 is not set
-# CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
 # CONFIG_DMARD10 is not set
 CONFIG_HID_SENSOR_ACCEL_3D=m
-CONFIG_IIO_ST_ACCEL_3AXIS=m
-CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
-CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
-CONFIG_KXSD9=m
-CONFIG_KXSD9_SPI=m
-CONFIG_KXSD9_I2C=m
-CONFIG_KXCJK1013=m
+# CONFIG_IIO_CROS_EC_ACCEL_LEGACY is not set
+CONFIG_IIO_ST_ACCEL_3AXIS=y
+CONFIG_IIO_ST_ACCEL_I2C_3AXIS=y
+CONFIG_IIO_ST_ACCEL_SPI_3AXIS=y
+# CONFIG_KXSD9 is not set
+CONFIG_KXCJK1013=y
 # CONFIG_MC3230 is not set
 # CONFIG_MMA7455_I2C is not set
 # CONFIG_MMA7455_SPI is not set
 # CONFIG_MMA7660 is not set
-CONFIG_MMA8452=m
-CONFIG_MMA9551_CORE=m
-CONFIG_MMA9551=m
-CONFIG_MMA9553=m
-CONFIG_MXC4005=m
+# CONFIG_MMA8452 is not set
+# CONFIG_MMA9551 is not set
+# CONFIG_MMA9553 is not set
+# CONFIG_MXC4005 is not set
 # CONFIG_MXC6255 is not set
-CONFIG_SCA3000=m
-CONFIG_STK8312=m
-CONFIG_STK8BA50=m
+# CONFIG_SCA3000 is not set
+# CONFIG_STK8312 is not set
+# CONFIG_STK8BA50 is not set
 
 #
 # Analog to digital converters
 #
-CONFIG_AD_SIGMA_DELTA=m
 # CONFIG_AD7266 is not set
 # CONFIG_AD7291 is not set
 # CONFIG_AD7298 is not set
@@ -6429,7 +5501,6 @@ CONFIG_AD_SIGMA_DELTA=m
 # CONFIG_AD7923 is not set
 # CONFIG_AD799X is not set
 # CONFIG_CC10001_ADC is not set
-# CONFIG_ENVELOPE_DETECTOR is not set
 # CONFIG_HI8435 is not set
 # CONFIG_HX711 is not set
 # CONFIG_INA2XX_ADC is not set
@@ -6441,9 +5512,9 @@ CONFIG_AD_SIGMA_DELTA=m
 # CONFIG_MAX1118 is not set
 # CONFIG_MAX1363 is not set
 # CONFIG_MAX9611 is not set
-# CONFIG_MCP320X is not set
+CONFIG_MCP320X=m
 # CONFIG_MCP3422 is not set
-# CONFIG_NAU7802 is not set
+CONFIG_NAU7802=m
 # CONFIG_TI_ADC081C is not set
 # CONFIG_TI_ADC0832 is not set
 # CONFIG_TI_ADC084S021 is not set
@@ -6453,9 +5524,11 @@ CONFIG_AD_SIGMA_DELTA=m
 # CONFIG_TI_ADC161S626 is not set
 # CONFIG_TI_ADS1015 is not set
 # CONFIG_TI_ADS7950 is not set
-# CONFIG_TI_ADS8688 is not set
 # CONFIG_TI_TLC4541 is not set
-# CONFIG_VF610_ADC is not set
+
+#
+# Analog Front Ends
+#
 
 #
 # Amplifiers
@@ -6466,26 +5539,24 @@ CONFIG_AD_SIGMA_DELTA=m
 # Chemical Sensors
 #
 # CONFIG_ATLAS_PH_SENSOR is not set
+# CONFIG_BME680 is not set
 # CONFIG_CCS811 is not set
 # CONFIG_IAQCORE is not set
 # CONFIG_VZ89X is not set
-# CONFIG_IIO_CROS_EC_SENSORS_CORE is not set
 
 #
 # Hid Sensor IIO Common
 #
 CONFIG_HID_SENSOR_IIO_COMMON=m
 CONFIG_HID_SENSOR_IIO_TRIGGER=m
-CONFIG_IIO_MS_SENSORS_I2C=m
 
 #
 # SSP Sensor Common
 #
-CONFIG_IIO_SSP_SENSORS_COMMONS=m
-CONFIG_IIO_SSP_SENSORHUB=m
-CONFIG_IIO_ST_SENSORS_I2C=m
-CONFIG_IIO_ST_SENSORS_SPI=m
-CONFIG_IIO_ST_SENSORS_CORE=m
+# CONFIG_IIO_SSP_SENSORHUB is not set
+CONFIG_IIO_ST_SENSORS_I2C=y
+CONFIG_IIO_ST_SENSORS_SPI=y
+CONFIG_IIO_ST_SENSORS_CORE=y
 
 #
 # Counters
@@ -6505,20 +5576,22 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_AD5504 is not set
 # CONFIG_AD5624R_SPI is not set
 # CONFIG_LTC2632 is not set
-# CONFIG_AD5686 is not set
+# CONFIG_AD5686_SPI is not set
+# CONFIG_AD5696_I2C is not set
 # CONFIG_AD5755 is not set
+# CONFIG_AD5758 is not set
 # CONFIG_AD5761 is not set
 # CONFIG_AD5764 is not set
 # CONFIG_AD5791 is not set
 # CONFIG_AD7303 is not set
 # CONFIG_AD8801 is not set
-# CONFIG_DPOT_DAC is not set
+# CONFIG_DS4424 is not set
 # CONFIG_M62332 is not set
 # CONFIG_MAX517 is not set
-# CONFIG_MAX5821 is not set
 # CONFIG_MCP4725 is not set
 # CONFIG_MCP4922 is not set
-# CONFIG_VF610_DAC is not set
+# CONFIG_TI_DAC082S085 is not set
+# CONFIG_TI_DAC5571 is not set
 
 #
 # IIO dummy driver
@@ -6541,20 +5614,20 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 #
 # Digital gyroscope sensors
 #
-CONFIG_ADIS16080=m
-CONFIG_ADIS16130=m
-CONFIG_ADIS16136=m
-CONFIG_ADIS16260=m
-CONFIG_ADXRS450=m
-CONFIG_BMG160=m
-CONFIG_BMG160_I2C=m
-CONFIG_BMG160_SPI=m
+# CONFIG_ADIS16080 is not set
+# CONFIG_ADIS16130 is not set
+# CONFIG_ADIS16136 is not set
+# CONFIG_ADIS16260 is not set
+# CONFIG_ADXRS450 is not set
+CONFIG_BMG160=y
+CONFIG_BMG160_I2C=y
+CONFIG_BMG160_SPI=y
 CONFIG_HID_SENSOR_GYRO_3D=m
 # CONFIG_MPU3050_I2C is not set
-CONFIG_IIO_ST_GYRO_3AXIS=m
-CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
-CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
-CONFIG_ITG3200=m
+CONFIG_IIO_ST_GYRO_3AXIS=y
+CONFIG_IIO_ST_GYRO_I2C_3AXIS=y
+CONFIG_IIO_ST_GYRO_SPI_3AXIS=y
+# CONFIG_ITG3200 is not set
 
 #
 # Health Sensors
@@ -6572,109 +5645,109 @@ CONFIG_ITG3200=m
 # Humidity sensors
 #
 # CONFIG_AM2315 is not set
-CONFIG_DHT11=m
-CONFIG_HDC100X=m
+# CONFIG_DHT11 is not set
+# CONFIG_HDC100X is not set
 # CONFIG_HID_SENSOR_HUMIDITY is not set
 # CONFIG_HTS221 is not set
-CONFIG_HTU21=m
-CONFIG_SI7005=m
-CONFIG_SI7020=m
+# CONFIG_HTU21 is not set
+# CONFIG_SI7005 is not set
+# CONFIG_SI7020 is not set
 
 #
 # Inertial measurement units
 #
-CONFIG_ADIS16400=m
-CONFIG_ADIS16480=m
+# CONFIG_ADIS16400 is not set
+# CONFIG_ADIS16480 is not set
 # CONFIG_BMI160_I2C is not set
 # CONFIG_BMI160_SPI is not set
-CONFIG_KMX61=m
+CONFIG_KMX61=y
 # CONFIG_INV_MPU6050_I2C is not set
 # CONFIG_INV_MPU6050_SPI is not set
 # CONFIG_IIO_ST_LSM6DSX is not set
-CONFIG_IIO_ADIS_LIB=m
-CONFIG_IIO_ADIS_LIB_BUFFER=y
 
 #
 # Light sensors
 #
-# CONFIG_ACPI_ALS is not set
-CONFIG_ADJD_S311=m
-CONFIG_AL3320A=m
-CONFIG_APDS9300=m
-CONFIG_APDS9960=m
-CONFIG_BH1750=m
+CONFIG_ACPI_ALS=y
+# CONFIG_ADJD_S311 is not set
+# CONFIG_AL3320A is not set
+# CONFIG_APDS9300 is not set
+# CONFIG_APDS9960 is not set
+# CONFIG_BH1750 is not set
 # CONFIG_BH1780 is not set
-CONFIG_CM32181=m
-CONFIG_CM3232=m
-CONFIG_CM3323=m
-# CONFIG_CM3605 is not set
+CONFIG_CM32181=y
+CONFIG_CM3232=y
+# CONFIG_CM3323 is not set
 CONFIG_CM36651=m
-CONFIG_GP2AP020A00F=m
-CONFIG_SENSORS_ISL29018=m
-CONFIG_SENSORS_ISL29028=m
-CONFIG_ISL29125=m
+# CONFIG_GP2AP020A00F is not set
+# CONFIG_SENSORS_ISL29018 is not set
+# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_ISL29125 is not set
 CONFIG_HID_SENSOR_ALS=m
-CONFIG_HID_SENSOR_PROX=m
+# CONFIG_HID_SENSOR_PROX is not set
 CONFIG_JSA1212=m
-CONFIG_RPR0521=m
-CONFIG_SENSORS_LM3533=m
-CONFIG_LTR501=m
+# CONFIG_RPR0521 is not set
+# CONFIG_LTR501 is not set
+# CONFIG_LV0104CS is not set
 # CONFIG_MAX44000 is not set
-CONFIG_OPT3001=m
-CONFIG_PA12203001=m
+# CONFIG_OPT3001 is not set
+# CONFIG_PA12203001 is not set
+# CONFIG_SI1133 is not set
 # CONFIG_SI1145 is not set
-CONFIG_STK3310=m
-CONFIG_TCS3414=m
-CONFIG_TCS3472=m
-CONFIG_SENSORS_TSL2563=m
-CONFIG_TSL2583=m
-CONFIG_TSL4531=m
-CONFIG_US5182D=m
-CONFIG_VCNL4000=m
+# CONFIG_STK3310 is not set
+# CONFIG_ST_UVIS25 is not set
+# CONFIG_TCS3414 is not set
+# CONFIG_TCS3472 is not set
+# CONFIG_SENSORS_TSL2563 is not set
+# CONFIG_TSL2583 is not set
+# CONFIG_TSL2772 is not set
+# CONFIG_TSL4531 is not set
+# CONFIG_US5182D is not set
+# CONFIG_VCNL4000 is not set
 # CONFIG_VEML6070 is not set
 # CONFIG_VL6180 is not set
+# CONFIG_ZOPT2201 is not set
 
 #
 # Magnetometer sensors
 #
-# CONFIG_AK8974 is not set
 CONFIG_AK8975=m
 CONFIG_AK09911=m
 # CONFIG_BMC150_MAGN_I2C is not set
 # CONFIG_BMC150_MAGN_SPI is not set
-CONFIG_MAG3110=m
+# CONFIG_MAG3110 is not set
 CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
-CONFIG_MMC35240=m
-CONFIG_IIO_ST_MAGN_3AXIS=m
-CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
-CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
-CONFIG_SENSORS_HMC5843=m
-CONFIG_SENSORS_HMC5843_I2C=m
-CONFIG_SENSORS_HMC5843_SPI=m
+# CONFIG_MMC35240 is not set
+CONFIG_IIO_ST_MAGN_3AXIS=y
+CONFIG_IIO_ST_MAGN_I2C_3AXIS=y
+CONFIG_IIO_ST_MAGN_SPI_3AXIS=y
+# CONFIG_SENSORS_HMC5843_I2C is not set
+# CONFIG_SENSORS_HMC5843_SPI is not set
 
 #
 # Multiplexers
 #
-# CONFIG_IIO_MUX is not set
 
 #
 # Inclinometer sensors
 #
 CONFIG_HID_SENSOR_INCLINOMETER_3D=m
-CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+# CONFIG_HID_SENSOR_DEVICE_ROTATION is not set
 
 #
 # Triggers - standalone
 #
-CONFIG_IIO_INTERRUPT_TRIGGER=m
-CONFIG_IIO_SYSFS_TRIGGER=m
+CONFIG_IIO_INTERRUPT_TRIGGER=y
+CONFIG_IIO_SYSFS_TRIGGER=y
 
 #
 # Digital potentiometers
 #
+# CONFIG_AD5272 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_MAX5481 is not set
 # CONFIG_MAX5487 is not set
+# CONFIG_MCP4018 is not set
 # CONFIG_MCP4131 is not set
 # CONFIG_MCP4531 is not set
 # CONFIG_TPL0102 is not set
@@ -6689,96 +5762,91 @@ CONFIG_IIO_SYSFS_TRIGGER=m
 #
 # CONFIG_ABP060MG is not set
 # CONFIG_BMP280 is not set
-CONFIG_HID_SENSOR_PRESS=m
+# CONFIG_HID_SENSOR_PRESS is not set
 # CONFIG_HP03 is not set
 # CONFIG_MPL115_I2C is not set
 # CONFIG_MPL115_SPI is not set
-CONFIG_MPL3115=m
-CONFIG_MS5611=m
-CONFIG_MS5611_I2C=m
-CONFIG_MS5611_SPI=m
-CONFIG_MS5637=m
-CONFIG_IIO_ST_PRESS=m
-CONFIG_IIO_ST_PRESS_I2C=m
-CONFIG_IIO_ST_PRESS_SPI=m
-CONFIG_T5403=m
+# CONFIG_MPL3115 is not set
+# CONFIG_MS5611 is not set
+# CONFIG_MS5637 is not set
+CONFIG_IIO_ST_PRESS=y
+CONFIG_IIO_ST_PRESS_I2C=y
+CONFIG_IIO_ST_PRESS_SPI=y
+# CONFIG_T5403 is not set
 # CONFIG_HP206C is not set
 # CONFIG_ZPA2326 is not set
 
 #
 # Lightning sensors
 #
-CONFIG_AS3935=m
+# CONFIG_AS3935 is not set
 
 #
 # Proximity and distance sensors
 #
-CONFIG_LIDAR_LITE_V2=m
+# CONFIG_ISL29501 is not set
+# CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_RFD77402 is not set
 # CONFIG_SRF04 is not set
-CONFIG_SX9500=m
+# CONFIG_SX9500 is not set
 # CONFIG_SRF08 is not set
 
+#
+# Resolver to digital converters
+#
+# CONFIG_AD2S1200 is not set
+
 #
 # Temperature sensors
 #
 # CONFIG_MAXIM_THERMOCOUPLE is not set
 # CONFIG_HID_SENSOR_TEMP is not set
-CONFIG_MLX90614=m
+# CONFIG_MLX90614 is not set
+# CONFIG_MLX90632 is not set
 CONFIG_TMP006=m
 # CONFIG_TMP007 is not set
-CONFIG_TSYS01=m
-CONFIG_TSYS02D=m
+# CONFIG_TSYS01 is not set
+# CONFIG_TSYS02D is not set
 # CONFIG_NTB is not set
 # CONFIG_VME_BUS is not set
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
-CONFIG_PWM_CRC=y
-# CONFIG_PWM_CROS_EC is not set
-# CONFIG_PWM_FSL_FTM is not set
-CONFIG_PWM_LPSS=m
-CONFIG_PWM_LPSS_PCI=m
-CONFIG_PWM_LPSS_PLATFORM=m
+# CONFIG_PWM_CRC is not set
+CONFIG_PWM_LPSS=y
+CONFIG_PWM_LPSS_PCI=y
+# CONFIG_PWM_LPSS_PLATFORM is not set
 # CONFIG_PWM_PCA9685 is not set
-CONFIG_IRQCHIP=y
+
+#
+# IRQ chip support
+#
 CONFIG_ARM_GIC_MAX_NR=1
 # CONFIG_IPACK_BUS is not set
-CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_ATH79 is not set
-# CONFIG_RESET_BERLIN is not set
-# CONFIG_RESET_IMX7 is not set
-# CONFIG_RESET_LANTIQ is not set
-# CONFIG_RESET_LPC18XX is not set
-# CONFIG_RESET_MESON is not set
-# CONFIG_RESET_PISTACHIO is not set
-# CONFIG_RESET_SOCFPGA is not set
-# CONFIG_RESET_STM32 is not set
-# CONFIG_RESET_SUNXI is not set
-# CONFIG_RESET_TI_SYSCON is not set
-# CONFIG_RESET_ZYNQ is not set
-# CONFIG_RESET_TEGRA_BPMP is not set
+# CONFIG_RESET_CONTROLLER is not set
 # CONFIG_FMC is not set
 
 #
 # PHY Subsystem
 #
 CONFIG_GENERIC_PHY=y
-CONFIG_BCM_KONA_USB2_PHY=m
-CONFIG_PHY_PXA_28NM_HSIC=m
-CONFIG_PHY_PXA_28NM_USB2=m
+# CONFIG_BCM_KONA_USB2_PHY is not set
+# CONFIG_PHY_PXA_28NM_HSIC is not set
+# CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_CPCAP_USB is not set
-CONFIG_PHY_SAMSUNG_USB2=m
-# CONFIG_PHY_EXYNOS4210_USB2 is not set
-# CONFIG_PHY_EXYNOS4X12_USB2 is not set
-# CONFIG_PHY_EXYNOS5250_USB2 is not set
+# CONFIG_PHY_QCOM_USB_HS is not set
+# CONFIG_PHY_QCOM_USB_HSIC is not set
+# CONFIG_PHY_SAMSUNG_USB2 is not set
+# CONFIG_PHY_TUSB1210 is not set
 CONFIG_POWERCAP=y
 CONFIG_INTEL_RAPL=y
+# CONFIG_IDLE_INJECT is not set
 # CONFIG_MCB is not set
 
 #
 # Performance monitor support
 #
 CONFIG_RAS=y
-CONFIG_THUNDERBOLT=m
+# CONFIG_THUNDERBOLT is not set
 
 #
 # Android
@@ -6789,68 +5857,33 @@ CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 # CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # CONFIG_LIBNVDIMM is not set
 CONFIG_DAX=y
+# CONFIG_DEV_DAX is not set
 CONFIG_NVMEM=y
-# CONFIG_STM is not set
-# CONFIG_INTEL_TH is not set
-# CONFIG_FPGA is not set
-
-#
-# FSI support
-#
-# CONFIG_FSI is not set
-CONFIG_SDW=m
-CONFIG_SDW_CNL=m
-# CONFIG_SDW_MAXIM_SLAVE is not set
-CONFIG_PM_OPP=y
-
-#
-# Firmware Drivers
-#
-# CONFIG_EDD is not set
-CONFIG_FIRMWARE_MEMMAP=y
-# CONFIG_DELL_RBU is not set
-CONFIG_DCDBAS=m
-CONFIG_DMIID=y
-CONFIG_DMI_SYSFS=y
-CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
-# CONFIG_ISCSI_IBFT_FIND is not set
-# CONFIG_FW_CFG_SYSFS is not set
-# CONFIG_GOOGLE_FIRMWARE is not set
 
 #
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_EFI_VARS=y
-CONFIG_EFI_ESRT=y
-CONFIG_EFI_VARS_PSTORE=m
-# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
-# CONFIG_EFI_FAKE_MEMMAP is not set
-CONFIG_EFI_RUNTIME_WRAPPERS=y
-CONFIG_EFI_BOOTLOADER_CONTROL=y
-# CONFIG_EFI_CAPSULE_LOADER is not set
-# CONFIG_EFI_TEST is not set
-CONFIG_APPLE_PROPERTIES=y
-# CONFIG_RESET_ATTACK_MITIGATION is not set
-CONFIG_UEFI_CPER=y
-CONFIG_EFI_DEV_PATH_PARSER=y
-
-#
-# Tegra firmware driver
+# HW tracing support
 #
+CONFIG_STM=y
+# CONFIG_STM_DUMMY is not set
+CONFIG_STM_SOURCE_CONSOLE=y
+# CONFIG_STM_SOURCE_HEARTBEAT is not set
+# CONFIG_STM_SOURCE_FTRACE is not set
+# CONFIG_INTEL_TH is not set
+# CONFIG_FPGA is not set
+CONFIG_PM_OPP=y
+# CONFIG_UNISYS_VISORBUS is not set
+# CONFIG_SIOX is not set
+# CONFIG_SLIMBUS is not set
 
 #
 # File systems
 #
 CONFIG_DCACHE_WORD_ACCESS=y
 CONFIG_FS_IOMAP=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
 CONFIG_EXT4_FS=y
+CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_ENCRYPTION=y
@@ -6859,53 +5892,28 @@ CONFIG_EXT4_FS_ENCRYPTION=y
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_FS_MBCACHE=y
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_REISERFS_FS_XATTR is not set
-CONFIG_JFS_FS=m
-# CONFIG_JFS_POSIX_ACL is not set
-# CONFIG_JFS_SECURITY is not set
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_XFS_FS=m
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_XFS_FS is not set
 # CONFIG_GFS2_FS is not set
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_STATS=y
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-# CONFIG_BTRFS_FS_POSIX_ACL is not set
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
 # CONFIG_NILFS2_FS is not set
-CONFIG_F2FS_FS=y
-CONFIG_F2FS_STAT_FS=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-CONFIG_F2FS_FS_SECURITY=y
+# CONFIG_F2FS_FS is not set
 # CONFIG_FS_DAX is not set
 CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=m
 # CONFIG_EXPORTFS_BLOCK_OPS is not set
 CONFIG_FILE_LOCKING=y
 CONFIG_MANDATORY_FILE_LOCKING=y
 CONFIG_FS_ENCRYPTION=y
 CONFIG_FSNOTIFY=y
-# CONFIG_DNOTIFY is not set
+CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
-# CONFIG_FANOTIFY is not set
+CONFIG_FANOTIFY=y
+# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
 CONFIG_QUOTA=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
-CONFIG_PRINT_QUOTA_WARNING=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
 # CONFIG_QUOTA_DEBUG is not set
 CONFIG_QUOTA_TREE=y
 # CONFIG_QFMT_V1 is not set
@@ -6913,6 +5921,7 @@ CONFIG_QFMT_V2=y
 CONFIG_QUOTACTL=y
 CONFIG_QUOTACTL_COMPAT=y
 # CONFIG_AUTOFS4_FS is not set
+# CONFIG_AUTOFS_FS is not set
 CONFIG_FUSE_FS=y
 # CONFIG_CUSE is not set
 # CONFIG_OVERLAY_FS is not set
@@ -6925,11 +5934,8 @@ CONFIG_FUSE_FS=y
 #
 # CD-ROM/DVD Filesystems
 #
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-# CONFIG_ZISOFS is not set
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
 
 #
 # DOS/FAT/NT Filesystems
@@ -6956,10 +5962,11 @@ CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_MEMFD_CREATE=y
 CONFIG_CONFIGFS_FS=y
-CONFIG_EFIVAR_FS=m
+CONFIG_EFIVAR_FS=y
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ORANGEFS_FS is not set
 # CONFIG_ADFS_FS is not set
@@ -6975,6 +5982,8 @@ CONFIG_SDCARD_FS=y
 # CONFIG_UBIFS_FS is not set
 # CONFIG_CRAMFS is not set
 CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_FILE_CACHE=y
+# CONFIG_SQUASHFS_FILE_DIRECT is not set
 # CONFIG_SQUASHFS_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
@@ -6998,6 +6007,12 @@ CONFIG_PSTORE=y
 CONFIG_PSTORE_ZLIB_COMPRESS=y
 # CONFIG_PSTORE_LZO_COMPRESS is not set
 # CONFIG_PSTORE_LZ4_COMPRESS is not set
+# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
+# CONFIG_PSTORE_842_COMPRESS is not set
+# CONFIG_PSTORE_ZSTD_COMPRESS is not set
+CONFIG_PSTORE_COMPRESS=y
+CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
+CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 CONFIG_PSTORE_CONSOLE=y
 # CONFIG_PSTORE_PMSG is not set
 CONFIG_PSTORE_FTRACE=y
@@ -7032,308 +6047,60 @@ CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_SMB311 is not set
 # CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-# CONFIG_NLS_MAC_ROMAN is not set
-# CONFIG_NLS_MAC_CELTIC is not set
-# CONFIG_NLS_MAC_CENTEURO is not set
-# CONFIG_NLS_MAC_CROATIAN is not set
-# CONFIG_NLS_MAC_CYRILLIC is not set
-# CONFIG_NLS_MAC_GAELIC is not set
-# CONFIG_NLS_MAC_GREEK is not set
-# CONFIG_NLS_MAC_ICELAND is not set
-# CONFIG_NLS_MAC_INUIT is not set
-# CONFIG_NLS_MAC_ROMANIAN is not set
-# CONFIG_NLS_MAC_TURKISH is not set
-CONFIG_NLS_UTF8=m
-# CONFIG_DLM is not set
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-
-#
-# printk and dmesg options
-#
-CONFIG_PRINTK_TIME=y
-CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
-CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
-CONFIG_DYNAMIC_DEBUG=y
-
-#
-# Compile-time checks and compiler options
-#
-# CONFIG_DEBUG_INFO is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_FRAME_WARN=1024
-# CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_READABLE_ASM is not set
-CONFIG_UNUSED_SYMBOLS=y
-# CONFIG_PAGE_OWNER is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-CONFIG_STACK_VALIDATION=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
-CONFIG_MAGIC_SYSRQ_SERIAL=y
-CONFIG_DEBUG_KERNEL=y
-
-#
-# Memory Debugging
-#
-# CONFIG_PAGE_EXTENSION is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_PAGE_POISONING is not set
-# CONFIG_DEBUG_PAGE_REF is not set
-CONFIG_DEBUG_RODATA_TEST=y
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_SLAB is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-CONFIG_DEBUG_KMEMLEAK=y
-CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=4000
-# CONFIG_DEBUG_KMEMLEAK_TEST is not set
-CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set
-CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
-# CONFIG_DEBUG_VIRTUAL is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-CONFIG_HAVE_ARCH_KASAN=y
-# CONFIG_KASAN is not set
-CONFIG_ARCH_HAS_KCOV=y
-# CONFIG_KCOV is not set
-# CONFIG_DEBUG_SHIRQ is not set
-
-#
-# Debug Lockups and Hangs
-#
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_SOFTLOCKUP_DETECTOR=y
-CONFIG_HARDLOCKUP_DETECTOR_PERF=y
-CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
-CONFIG_HARDLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_WQ_WATCHDOG is not set
-CONFIG_PANIC_ON_OOPS=y
-CONFIG_PANIC_ON_OOPS_VALUE=1
-CONFIG_PANIC_TIMEOUT=5
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHED_INFO=y
-CONFIG_SCHEDSTATS=y
-# CONFIG_SCHED_STACK_END_CHECK is not set
-# CONFIG_DEBUG_TIMEKEEPING is not set
-# CONFIG_DEBUG_PREEMPT is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
-# CONFIG_WW_MUTEX_SELFTEST is not set
-CONFIG_STACKTRACE=y
-# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_PI_LIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-CONFIG_DEBUG_CREDENTIALS=y
-
-#
-# RCU Debugging
-#
-# CONFIG_PROVE_RCU is not set
-# CONFIG_TORTURE_TEST is not set
-# CONFIG_RCU_PERF_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RCU_EQS_DEBUG is not set
-# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_FENTRY=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_PREEMPTIRQ_EVENTS is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_HWLAT_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_UPROBE_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
-# CONFIG_FUNCTION_PROFILER is not set
-CONFIG_FTRACE_MCOUNT_RECORD=y
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_MMIOTRACE is not set
-# CONFIG_HIST_TRIGGERS is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-CONFIG_TRACING_EVENTS_GPIO=y
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_DMA_API_DEBUG is not set
-
-#
-# Runtime Testing
-#
-# CONFIG_LKDTM is not set
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_TEST_SORT is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_RBTREE_TEST is not set
-# CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_PERCPU_TEST is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-# CONFIG_TEST_HEXDUMP is not set
-# CONFIG_TEST_STRING_HELPERS is not set
-# CONFIG_TEST_KSTRTOX is not set
-# CONFIG_TEST_PRINTF is not set
-# CONFIG_TEST_BITMAP is not set
-# CONFIG_TEST_UUID is not set
-# CONFIG_TEST_RHASHTABLE is not set
-# CONFIG_TEST_HASH is not set
-# CONFIG_TEST_LKM is not set
-# CONFIG_TEST_USER_COPY is not set
-# CONFIG_TEST_BPF is not set
-# CONFIG_TEST_FIRMWARE is not set
-# CONFIG_TEST_SYSCTL is not set
-# CONFIG_TEST_UDELAY is not set
-# CONFIG_TEST_STATIC_KEYS is not set
-# CONFIG_TEST_KMOD is not set
-# CONFIG_MEMTEST is not set
-# CONFIG_BUG_ON_DATA_CORRUPTION is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
-# CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set
-# CONFIG_UBSAN is not set
-CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
-CONFIG_X86_VERBOSE_BOOTUP=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_EARLY_PRINTK_EFI is not set
-# CONFIG_EARLY_PRINTK_USB_XDBC is not set
-# CONFIG_X86_PTDUMP_CORE is not set
-# CONFIG_X86_PTDUMP is not set
-# CONFIG_EFI_PGT_DUMP is not set
-# CONFIG_DEBUG_WX is not set
-CONFIG_DOUBLEFAULT=y
-# CONFIG_DEBUG_TLBFLUSH is not set
-# CONFIG_IOMMU_STRESS is not set
-CONFIG_HAVE_MMIOTRACE_SUPPORT=y
-CONFIG_IO_DELAY_TYPE_0X80=0
-CONFIG_IO_DELAY_TYPE_0XED=1
-CONFIG_IO_DELAY_TYPE_UDELAY=2
-CONFIG_IO_DELAY_TYPE_NONE=3
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IO_DELAY_NONE is not set
-CONFIG_DEFAULT_IO_DELAY_TYPE=0
-# CONFIG_DEBUG_BOOT_PARAMS is not set
-# CONFIG_CPA_DEBUG is not set
-# CONFIG_OPTIMIZE_INLINING is not set
-# CONFIG_DEBUG_ENTRY is not set
-# CONFIG_DEBUG_NMI_SELFTEST is not set
-CONFIG_X86_DEBUG_FPU=y
-# CONFIG_PUNIT_ATOM_DEBUG is not set
-CONFIG_UNWINDER_ORC=y
-# CONFIG_UNWINDER_FRAME_POINTER is not set
-# CONFIG_UNWINDER_GUESS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+# CONFIG_NLS_MAC_ROMAN is not set
+# CONFIG_NLS_MAC_CELTIC is not set
+# CONFIG_NLS_MAC_CENTEURO is not set
+# CONFIG_NLS_MAC_CROATIAN is not set
+# CONFIG_NLS_MAC_CYRILLIC is not set
+# CONFIG_NLS_MAC_GAELIC is not set
+# CONFIG_NLS_MAC_GREEK is not set
+# CONFIG_NLS_MAC_ICELAND is not set
+# CONFIG_NLS_MAC_INUIT is not set
+# CONFIG_NLS_MAC_ROMANIAN is not set
+# CONFIG_NLS_MAC_TURKISH is not set
+CONFIG_NLS_UTF8=m
+# CONFIG_DLM is not set
 
 #
 # Security options
@@ -7341,7 +6108,8 @@ CONFIG_UNWINDER_ORC=y
 CONFIG_KEYS=y
 CONFIG_KEYS_COMPAT=y
 # CONFIG_PERSISTENT_KEYRINGS is not set
-# CONFIG_BIG_KEYS is not set
+CONFIG_BIG_KEYS=y
+# CONFIG_TRUSTED_KEYS is not set
 # CONFIG_ENCRYPTED_KEYS is not set
 # CONFIG_KEY_DH_OPERATIONS is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
@@ -7350,12 +6118,14 @@ CONFIG_SECURITY=y
 CONFIG_SECURITY_WRITABLE_HOOKS=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
-CONFIG_PAGE_TABLE_ISOLATION=y
+# CONFIG_PAGE_TABLE_ISOLATION is not set
 # CONFIG_SECURITY_NETWORK_XFRM is not set
-CONFIG_SECURITY_PATH=y
+# CONFIG_SECURITY_PATH is not set
+# CONFIG_INTEL_TXT is not set
 CONFIG_LSM_MMAP_MIN_ADDR=65536
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 CONFIG_HARDENED_USERCOPY=y
+CONFIG_HARDENED_USERCOPY_FALLBACK=y
 # CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
 # CONFIG_FORTIFY_SOURCE is not set
 # CONFIG_STATIC_USERMODEHELPER is not set
@@ -7371,15 +6141,10 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 # CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_SECURITY_LOADPIN is not set
 # CONFIG_SECURITY_YAMA is not set
-CONFIG_INTEGRITY=y
-# CONFIG_INTEGRITY_SIGNATURE is not set
-CONFIG_INTEGRITY_AUDIT=y
-# CONFIG_IMA is not set
-# CONFIG_EVM is not set
+# CONFIG_INTEGRITY is not set
 CONFIG_DEFAULT_SECURITY_SELINUX=y
 # CONFIG_DEFAULT_SECURITY_DAC is not set
 CONFIG_DEFAULT_SECURITY="selinux"
-CONFIG_XOR_BLOCKS=m
 CONFIG_CRYPTO=y
 
 #
@@ -7416,17 +6181,28 @@ CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=y
 # CONFIG_CRYPTO_MCRYPTD is not set
 CONFIG_CRYPTO_AUTHENC=y
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ABLK_HELPER=y
+# CONFIG_CRYPTO_TEST is not set
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_GLUE_HELPER_X86=y
+CONFIG_CRYPTO_ENGINE=m
 
 #
 # Authenticated Encryption with Associated Data
 #
 CONFIG_CRYPTO_CCM=y
-CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_GCM=y
 # CONFIG_CRYPTO_CHACHA20POLY1305 is not set
+# CONFIG_CRYPTO_AEGIS128 is not set
+# CONFIG_CRYPTO_AEGIS128L is not set
+# CONFIG_CRYPTO_AEGIS256 is not set
+# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_MORUS640 is not set
+# CONFIG_CRYPTO_MORUS640_SSE2 is not set
+# CONFIG_CRYPTO_MORUS1280 is not set
+# CONFIG_CRYPTO_MORUS1280_SSE2 is not set
+# CONFIG_CRYPTO_MORUS1280_AVX2 is not set
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_ECHAINIV=y
 
@@ -7434,11 +6210,12 @@ CONFIG_CRYPTO_ECHAINIV=y
 # Block modes
 #
 CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CFB is not set
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_LRW=y
-CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_PCBC is not set
 CONFIG_CRYPTO_XTS=y
 # CONFIG_CRYPTO_KEYWRAP is not set
 
@@ -7447,7 +6224,7 @@ CONFIG_CRYPTO_XTS=y
 #
 CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
+# CONFIG_CRYPTO_XCBC is not set
 # CONFIG_CRYPTO_VMAC is not set
 
 #
@@ -7457,29 +6234,31 @@ CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32C_INTEL=y
 CONFIG_CRYPTO_CRC32=y
 # CONFIG_CRYPTO_CRC32_PCLMUL is not set
-# CONFIG_CRYPTO_CRCT10DIF is not set
-CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_CRCT10DIF_PCLMUL=y
+CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_POLY1305 is not set
 # CONFIG_CRYPTO_POLY1305_X86_64 is not set
-CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD4=y
 CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_RMD128 is not set
 # CONFIG_CRYPTO_RMD160 is not set
 # CONFIG_CRYPTO_RMD256 is not set
 # CONFIG_CRYPTO_RMD320 is not set
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA1_SSSE3=y
-CONFIG_CRYPTO_SHA256_SSSE3=y
-CONFIG_CRYPTO_SHA512_SSSE3=y
+# CONFIG_CRYPTO_SHA256_SSSE3 is not set
+# CONFIG_CRYPTO_SHA512_SSSE3 is not set
 # CONFIG_CRYPTO_SHA1_MB is not set
 # CONFIG_CRYPTO_SHA256_MB is not set
 # CONFIG_CRYPTO_SHA512_MB is not set
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SHA3 is not set
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
+# CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
 
 #
@@ -7489,34 +6268,34 @@ CONFIG_CRYPTO_AES=y
 # CONFIG_CRYPTO_AES_TI is not set
 CONFIG_CRYPTO_AES_X86_64=y
 CONFIG_CRYPTO_AES_NI_INTEL=y
-CONFIG_CRYPTO_ANUBIS=m
+# CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH=y
 CONFIG_CRYPTO_BLOWFISH_COMMON=y
 CONFIG_CRYPTO_BLOWFISH_X86_64=y
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAMELLIA_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
-CONFIG_CRYPTO_CAST_COMMON=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST5_AVX_X86_64=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_CAST6_AVX_X86_64=m
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAMELLIA_X86_64 is not set
+# CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64 is not set
+# CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST5_AVX_X86_64 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_CAST6_AVX_X86_64 is not set
 CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_DES3_EDE_X86_64 is not set
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_SALSA20 is not set
 # CONFIG_CRYPTO_CHACHA20 is not set
 # CONFIG_CRYPTO_CHACHA20_X86_64 is not set
 # CONFIG_CRYPTO_SEED is not set
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_SERPENT_SSE2_X86_64 is not set
+# CONFIG_CRYPTO_SERPENT_AVX_X86_64 is not set
+# CONFIG_CRYPTO_SERPENT_AVX2_X86_64 is not set
+# CONFIG_CRYPTO_SM4 is not set
 # CONFIG_CRYPTO_SPECK is not set
-CONFIG_CRYPTO_TEA=m
+# CONFIG_CRYPTO_TEA is not set
 CONFIG_CRYPTO_TWOFISH=y
 CONFIG_CRYPTO_TWOFISH_COMMON=y
 CONFIG_CRYPTO_TWOFISH_X86_64=y
@@ -7527,10 +6306,11 @@ CONFIG_CRYPTO_TWOFISH_AVX_X86_64=y
 # Compression
 #
 CONFIG_CRYPTO_DEFLATE=y
-# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_842 is not set
-# CONFIG_CRYPTO_LZ4 is not set
-# CONFIG_CRYPTO_LZ4HC is not set
+CONFIG_CRYPTO_LZ4=y
+CONFIG_CRYPTO_LZ4HC=y
+# CONFIG_CRYPTO_ZSTD is not set
 
 #
 # Random Number Generation
@@ -7542,18 +6322,27 @@ CONFIG_CRYPTO_DRBG_HMAC=y
 # CONFIG_CRYPTO_DRBG_CTR is not set
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_JITTERENTROPY=y
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
+# CONFIG_CRYPTO_USER_API_HASH is not set
+# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
 # CONFIG_CRYPTO_USER_API_RNG is not set
 # CONFIG_CRYPTO_USER_API_AEAD is not set
 CONFIG_CRYPTO_HASH_INFO=y
-# CONFIG_CRYPTO_HW is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_PADLOCK is not set
+# CONFIG_CRYPTO_DEV_CCP is not set
+# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set
+# CONFIG_CRYPTO_DEV_QAT_C3XXX is not set
+# CONFIG_CRYPTO_DEV_QAT_C62X is not set
+# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
+# CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set
+# CONFIG_CRYPTO_DEV_QAT_C62XVF is not set
+# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
+CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
 CONFIG_X509_CERTIFICATE_PARSER=y
 CONFIG_PKCS7_MESSAGE_PARSER=y
-# CONFIG_PKCS7_TEST_KEY is not set
+CONFIG_PKCS7_TEST_KEY=y
 # CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
 
 #
@@ -7565,16 +6354,12 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SECONDARY_TRUSTED_KEYRING is not set
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
-CONFIG_HAVE_KVM=y
-# CONFIG_VIRTUALIZATION is not set
 CONFIG_BINARY_PRINTF=y
 
 #
 # Library routines
 #
-CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
-# CONFIG_HAVE_ARCH_BITREVERSE is not set
 CONFIG_RATIONAL=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
@@ -7582,43 +6367,46 @@ CONFIG_GENERIC_NET_UTILS=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_IO=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
-# CONFIG_CRC_T10DIF is not set
-CONFIG_CRC_ITU_T=m
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=y
 CONFIG_CRC32=y
 # CONFIG_CRC32_SELFTEST is not set
 CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SLICEBY4 is not set
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
+CONFIG_CRC64=m
 # CONFIG_CRC4 is not set
-CONFIG_CRC7=m
+# CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=y
 CONFIG_CRC8=y
-CONFIG_XXHASH=m
-# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
 # CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=m
+CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=y
+CONFIG_LZ4HC_COMPRESS=y
 CONFIG_LZ4_DECOMPRESS=y
-CONFIG_ZSTD_COMPRESS=m
-CONFIG_ZSTD_DECOMPRESS=m
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_SPARC=y
+# CONFIG_XZ_DEC_POWERPC is not set
+# CONFIG_XZ_DEC_IA64 is not set
+# CONFIG_XZ_DEC_ARM is not set
+# CONFIG_XZ_DEC_ARMTHUMB is not set
+# CONFIG_XZ_DEC_SPARC is not set
 CONFIG_XZ_DEC_BCJ=y
 # CONFIG_XZ_DEC_TEST is not set
 CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=y
 CONFIG_REED_SOLOMON_ENC8=y
@@ -7628,12 +6416,18 @@ CONFIG_TEXTSEARCH_KMP=y
 CONFIG_TEXTSEARCH_BM=y
 CONFIG_TEXTSEARCH_FSM=y
 CONFIG_INTERVAL_TREE=y
+CONFIG_RADIX_TREE_MULTIORDER=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
-# CONFIG_DMA_NOOP_OPS is not set
-# CONFIG_DMA_VIRT_OPS is not set
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_DMA_DIRECT_OPS=y
+CONFIG_SWIOTLB=y
+CONFIG_SGL_ALLOC=y
+CONFIG_IOMMU_HELPER=y
 CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
@@ -7648,23 +6442,263 @@ CONFIG_MPILIB=y
 CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
 CONFIG_FONT_SUPPORT=y
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
 CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_6x10 is not set
-# CONFIG_FONT_10x18 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
 CONFIG_FONT_AUTOSELECT=y
-# CONFIG_SG_SPLIT is not set
 CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
+CONFIG_ARCH_HAS_UACCESS_MCSAFE=y
 CONFIG_SBITMAP=y
 # CONFIG_STRING_SELFTEST is not set
+
+#
+# Kernel hacking
+#
+
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
+CONFIG_CONSOLE_LOGLEVEL_QUIET=4
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_DYNAMIC_DEBUG=y
+
+#
+# Compile-time checks and compiler options
+#
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_INFO_REDUCED is not set
+# CONFIG_DEBUG_INFO_SPLIT is not set
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_GDB_SCRIPTS is not set
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=2048
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_READABLE_ASM is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_PAGE_OWNER is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+CONFIG_STACK_VALIDATION=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
+CONFIG_MAGIC_SYSRQ_SERIAL=y
+CONFIG_DEBUG_KERNEL=y
+
+#
+# Memory Debugging
+#
+# CONFIG_PAGE_EXTENSION is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_PAGE_POISONING is not set
+# CONFIG_DEBUG_PAGE_REF is not set
+# CONFIG_DEBUG_RODATA_TEST is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_DEBUG_SLAB is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_VM is not set
+CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+CONFIG_DEBUG_STACKOVERFLOW=y
+CONFIG_HAVE_ARCH_KASAN=y
+# CONFIG_KASAN is not set
+CONFIG_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_KCOV is not set
+# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Lockups and Hangs
+#
+# CONFIG_SOFTLOCKUP_DETECTOR is not set
+CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
+# CONFIG_HARDLOCKUP_DETECTOR is not set
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_WQ_WATCHDOG is not set
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_TIMEOUT=10
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHED_INFO=y
+CONFIG_SCHEDSTATS=y
+# CONFIG_SCHED_STACK_END_CHECK is not set
+# CONFIG_DEBUG_TIMEKEEPING is not set
+CONFIG_DEBUG_PREEMPT=y
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+CONFIG_LOCK_DEBUGGING_SUPPORT=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+CONFIG_DEBUG_ATOMIC_SLEEP=y
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
+# CONFIG_WW_MUTEX_SELFTEST is not set
+CONFIG_TRACE_IRQFLAGS=y
+CONFIG_STACKTRACE=y
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_LIST=y
+# CONFIG_DEBUG_PI_LIST is not set
+# CONFIG_DEBUG_SG is not set
+CONFIG_DEBUG_NOTIFIERS=y
+# CONFIG_DEBUG_CREDENTIALS is not set
+
+#
+# RCU Debugging
+#
+# CONFIG_RCU_PERF_TEST is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=21
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_EQS_DEBUG is not set
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_FAULT_INJECTION is not set
+CONFIG_LATENCYTOP=y
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_FENTRY=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_PREEMPTIRQ_TRACEPOINTS=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_PREEMPTIRQ_EVENTS is not set
+CONFIG_IRQSOFF_TRACER=y
+# CONFIG_PREEMPT_TRACER is not set
+CONFIG_SCHED_TRACER=y
+# CONFIG_HWLAT_TRACER is not set
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_STACK_TRACER is not set
+CONFIG_BLK_DEV_IO_TRACE=y
+# CONFIG_UPROBE_EVENTS is not set
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+# CONFIG_FUNCTION_PROFILER is not set
+CONFIG_FTRACE_MCOUNT_RECORD=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_MMIOTRACE is not set
+# CONFIG_HIST_TRIGGERS is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
+CONFIG_TRACING_EVENTS_GPIO=y
+CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
+# CONFIG_DMA_API_DEBUG is not set
+CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_LKDTM is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_TEST_SORT is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_PERCPU_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_TEST_PRINTF is not set
+# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_BITFIELD is not set
+# CONFIG_TEST_UUID is not set
+# CONFIG_TEST_OVERFLOW is not set
+# CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_TEST_HASH is not set
+# CONFIG_TEST_IDA is not set
+# CONFIG_TEST_LKM is not set
+# CONFIG_TEST_USER_COPY is not set
+# CONFIG_TEST_BPF is not set
+# CONFIG_FIND_BIT_BENCHMARK is not set
+# CONFIG_TEST_FIRMWARE is not set
+# CONFIG_TEST_SYSCTL is not set
+# CONFIG_TEST_UDELAY is not set
+# CONFIG_TEST_STATIC_KEYS is not set
+# CONFIG_TEST_KMOD is not set
+# CONFIG_MEMTEST is not set
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+# CONFIG_UBSAN is not set
+CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_EARLY_PRINTK_USB=y
+CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_EARLY_PRINTK_DBGP=y
+CONFIG_EARLY_PRINTK_EFI=y
+# CONFIG_EARLY_PRINTK_USB_XDBC is not set
+# CONFIG_X86_PTDUMP is not set
+# CONFIG_EFI_PGT_DUMP is not set
+# CONFIG_DEBUG_WX is not set
+CONFIG_DOUBLEFAULT=y
+# CONFIG_DEBUG_TLBFLUSH is not set
+# CONFIG_IOMMU_DEBUG is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+CONFIG_DEBUG_BOOT_PARAMS=y
+# CONFIG_CPA_DEBUG is not set
+CONFIG_OPTIMIZE_INLINING=y
+# CONFIG_DEBUG_ENTRY is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
+CONFIG_X86_DEBUG_FPU=y
+# CONFIG_PUNIT_ATOM_DEBUG is not set
+CONFIG_UNWINDER_ORC=y
+# CONFIG_UNWINDER_FRAME_POINTER is not set
+# CONFIG_UNWINDER_GUESS is not set

From d432c1b52a9a593cfa3587173f11296e57a8fef1 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Mon, 29 Oct 2018 16:15:50 +0530
Subject: [PATCH 353/427] [CELADON] Removed perftools since after rebase of
 4.19 kernel issue was seen

Tracked-On: None
---
 cel_apl/AndroidBoard.mk | 2 --
 cel_apl/mixins.spec     | 2 +-
 celadon/AndroidBoard.mk | 2 --
 celadon/mixins.spec     | 2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/cel_apl/AndroidBoard.mk b/cel_apl/AndroidBoard.mk
index b0e1c209d..60fa24ad9 100644
--- a/cel_apl/AndroidBoard.mk
+++ b/cel_apl/AndroidBoard.mk
@@ -63,8 +63,6 @@ $(PRODUCT_OUT)/kernel: $(KERNEL_CONFIG) | $(ACP)
 	$(hide) $(ACP) -fp $(KERNEL_BIN) $@
 
 EXTMOD_SRC := ../../../../../..
-TARGET_EXTRA_KERNEL_MODULES := $(EXTMOD_SRC)/kernel/modules/perftools-external/soc_perf_driver/src
-TARGET_EXTRA_KERNEL_MODULES += $(EXTMOD_SRC)/kernel/modules/perftools-external/socwatch_driver
 
 ALL_EXTRA_MODULES := $(patsubst %,$(TARGET_OUT_INTERMEDIATES)/kmodule/%,$(TARGET_EXTRA_KERNEL_MODULES))
 $(ALL_EXTRA_MODULES): $(TARGET_OUT_INTERMEDIATES)/kmodule/%: $(PRODUCT_OUT)/kernel
diff --git a/cel_apl/mixins.spec b/cel_apl/mixins.spec
index 5f28df107..b4ce62de1 100644
--- a/cel_apl/mixins.spec
+++ b/cel_apl/mixins.spec
@@ -16,7 +16,7 @@ storage: sdcard-mmc0-usb-sd(adoptablesd=true,adoptableusb=false)
 display-density: default
 usb-gadget: g_ffs
 adb_net: true
-kernel: project-celadon(loglevel=3, disable_cpuidle_on_boot=true, external_modules=perftools-external/soc_perf_driver/src perftools-external/socwatch_driver)
+kernel: project-celadon(loglevel=3, disable_cpuidle_on_boot=true)
 bluetooth: btusb (ivi=true)
 boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true,ignore_not_applicable_reset=true)
 audio: project-celadon
diff --git a/celadon/AndroidBoard.mk b/celadon/AndroidBoard.mk
index 3275f7089..4a32cebb1 100644
--- a/celadon/AndroidBoard.mk
+++ b/celadon/AndroidBoard.mk
@@ -63,8 +63,6 @@ $(PRODUCT_OUT)/kernel: $(KERNEL_CONFIG) | $(ACP)
 	$(hide) $(ACP) -fp $(KERNEL_BIN) $@
 
 EXTMOD_SRC := ../../../../../..
-TARGET_EXTRA_KERNEL_MODULES := $(EXTMOD_SRC)/kernel/modules/perftools-external/soc_perf_driver/src
-TARGET_EXTRA_KERNEL_MODULES += $(EXTMOD_SRC)/kernel/modules/perftools-external/socwatch_driver
 
 ALL_EXTRA_MODULES := $(patsubst %,$(TARGET_OUT_INTERMEDIATES)/kmodule/%,$(TARGET_EXTRA_KERNEL_MODULES))
 $(ALL_EXTRA_MODULES): $(TARGET_OUT_INTERMEDIATES)/kmodule/%: $(PRODUCT_OUT)/kernel
diff --git a/celadon/mixins.spec b/celadon/mixins.spec
index fac1cf3c5..adeb81bbe 100644
--- a/celadon/mixins.spec
+++ b/celadon/mixins.spec
@@ -17,7 +17,7 @@ storage: sdcard-mmc0-usb-sd(adoptablesd=true,adoptableusb=false)
 display-density: default
 usb-gadget: g_ffs
 adb_net: true
-kernel: project-celadon(loglevel=3, disable_cpuidle_on_boot=true, external_modules=perftools-external/soc_perf_driver/src perftools-external/socwatch_driver)
+kernel: project-celadon(loglevel=3, disable_cpuidle_on_boot=true)
 bluetooth: btusb
 boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true,ignore_not_applicable_reset=true)
 audio: project-celadon

From c69532bfe4467cff7d2a5a6b59e74036ad729ff3 Mon Sep 17 00:00:00 2001
From: "Regnier, Philippe" <philippe.regnier@intel.com>
Date: Fri, 26 Oct 2018 13:52:11 +0800
Subject: [PATCH 354/427] ota: update sepolicy partition names for slot ab

Tracked-On: OAM-70601
Signed-off-by: phireg <philippe.regnier@intel.com>
---
 .../project-celadon/cel_apl/file_contexts     | 21 ++++++++++++-------
 .../project-celadon/celadon/file_contexts     | 21 ++++++++++++-------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/sepolicy/boot-arch/project-celadon/cel_apl/file_contexts b/sepolicy/boot-arch/project-celadon/cel_apl/file_contexts
index 753fe9e85..156b0127b 100644
--- a/sepolicy/boot-arch/project-celadon/cel_apl/file_contexts
+++ b/sepolicy/boot-arch/project-celadon/cel_apl/file_contexts
@@ -2,14 +2,19 @@
 # Block Devices
 #
 
-/dev/block/(pci|platform)(/.*)?/.*/by-name/boot       u:object_r:boot_block_device:s0
-/dev/block/(pci|platform)(/.*)?/.*/by-name/persistent u:object_r:frp_block_device:s0
-/dev/block/(pci|platform)(/.*)?/.*/by-name/recovery   u:object_r:recovery_block_device:s0
-/dev/block/(pci|platform)(/.*)?/.*/by-name/metadata   u:object_r:metadata_block_device:s0
-/dev/block/(pci|platform)(/.*)?/.*/by-name/cache      u:object_r:cache_block_device:s0
-/dev/block/(pci|platform)(/.*)?/.*/by-name/data       u:object_r:userdata_block_device:s0
-/dev/block/(pci|platform)(/.*)?/.*/by-name/misc       u:object_r:misc_block_device:s0
-/dev/block/(pci|platform)(/.*)?/.*/by-name/teedata    u:object_r:tee_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/boot(_(a|b))?	u:object_r:boot_block_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/bootloader(_(a|b))?	u:object_r:boot_block_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/system(_(a|b))?	u:object_r:system_block_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/vendor(_(a|b))?	u:object_r:vendor_block_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/vbmeta(_(a|b))?	u:object_r:boot_block_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/tos(_(a|b))?		u:object_r:boot_block_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/persistent		u:object_r:frp_block_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/recovery		u:object_r:recovery_block_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/metadata		u:object_r:metadata_block_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/cache		u:object_r:cache_block_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/data			u:object_r:userdata_block_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/misc			u:object_r:misc_block_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/teedata		u:object_r:tee_device:s0
 
 /file_contexts.bin           u:object_r:rootfs:s0
 /metadata                    u:object_r:rootfs:s0
diff --git a/sepolicy/boot-arch/project-celadon/celadon/file_contexts b/sepolicy/boot-arch/project-celadon/celadon/file_contexts
index e6e10f988..1f9fb4c17 100644
--- a/sepolicy/boot-arch/project-celadon/celadon/file_contexts
+++ b/sepolicy/boot-arch/project-celadon/celadon/file_contexts
@@ -2,14 +2,19 @@
 # Block Devices
 #
 
-/dev/block/(pci|platform)(/.*)?/.*/by-name/boot       u:object_r:boot_block_device:s0
-/dev/block/(pci|platform)(/.*)?/.*/by-name/persistent u:object_r:frp_block_device:s0
-/dev/block/(pci|platform)(/.*)?/.*/by-name/recovery   u:object_r:recovery_block_device:s0
-/dev/block/(pci|platform)(/.*)?/.*/by-name/metadata   u:object_r:metadata_block_device:s0
-/dev/block/(pci|platform)(/.*)?/.*/by-name/cache      u:object_r:cache_block_device:s0
-/dev/block/(pci|platform)(/.*)?/.*/by-name/data       u:object_r:userdata_block_device:s0
-/dev/block/(pci|platform)(/.*)?/.*/by-name/misc       u:object_r:misc_block_device:s0
-/dev/block/(pci|platform)(/.*)?/.*/by-name/teedata    u:object_r:tee_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/boot(_(a|b))?	u:object_r:boot_block_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/bootloader(_(a|b))?	u:object_r:boot_block_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/system(_(a|b))?	u:object_r:system_block_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/vendor(_(a|b))?	u:object_r:vendor_block_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/vbmeta(_(a|b))?	u:object_r:boot_block_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/tos(_(a|b))?		u:object_r:boot_block_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/persistent		u:object_r:frp_block_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/recovery		u:object_r:recovery_block_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/metadata		u:object_r:metadata_block_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/cache		u:object_r:cache_block_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/data			u:object_r:userdata_block_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/misc			u:object_r:misc_block_device:s0
+/dev/block/(pci|platform|vbd)(/.*)?/.*/by-name/teedata		u:object_r:tee_device:s0
 
 /file_contexts.bin           u:object_r:rootfs:s0
 /metadata                    u:object_r:rootfs:s0

From e17fbf4c2ea3a9627bd37d729bafb8e68a5cd4da Mon Sep 17 00:00:00 2001
From: "Regnier, Philippe" <philippe.regnier@intel.com>
Date: Thu, 25 Oct 2018 20:03:33 +0800
Subject: [PATCH 355/427] ota: add required partitions for slotab

Test: boot ok after ota

Tracked-On: https://jira01.devtools.intel.com/browse/OAM-70545

Signed-off-by: phireg <philippe.regnier@intel.com>
---
 cel_apl/BoardConfig.mk | 5 +++--
 celadon/BoardConfig.mk | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index 88d34bf55..ec0b6be37 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -141,8 +141,6 @@ BOARD_FLASHFILES += $(PRODUCT_OUT)/vbmeta.img
 
 # Now use AVB to support A/B slot
 PRODUCT_STATIC_BOOT_CONTROL_HAL := bootctrl.avb libavb_user
-
-AB_OTA_PARTITIONS += vbmeta
 ##############################################################
 # Source: device/intel/mixins/groups/vendor-partition/true/BoardConfig.mk
 ##############################################################
@@ -243,6 +241,9 @@ KERNELFLINGER_ASSUME_BIOS_SECURE_BOOT := true
 
 KERNELFLINGER_USE_RPMB_SIMULATE := true
 
+AB_OTA_PARTITIONS += vbmeta
+AB_OTA_PARTITIONS += tos
+
 AB_OTA_POSTINSTALL_CONFIG += \
     RUN_POSTINSTALL_vendor=true \
     POSTINSTALL_PATH_vendor=bin/updater_ab_esp \
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index 259efedf7..5c00f9da5 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -151,8 +151,6 @@ BOARD_FLASHFILES += $(PRODUCT_OUT)/vbmeta.img
 
 # Now use AVB to support A/B slot
 PRODUCT_STATIC_BOOT_CONTROL_HAL := bootctrl.avb libavb_user
-
-AB_OTA_PARTITIONS += vbmeta
 ##############################################################
 # Source: device/intel/mixins/groups/vendor-partition/true/BoardConfig.mk
 ##############################################################
@@ -253,6 +251,9 @@ KERNELFLINGER_ASSUME_BIOS_SECURE_BOOT := true
 
 KERNELFLINGER_USE_RPMB_SIMULATE := true
 
+AB_OTA_PARTITIONS += vbmeta
+AB_OTA_PARTITIONS += tos
+
 AB_OTA_POSTINSTALL_CONFIG += \
     RUN_POSTINSTALL_vendor=true \
     POSTINSTALL_PATH_vendor=bin/updater_ab_esp \

From c77b98df954d7ce250b846a4b4055f1bf14baf78 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Mon, 5 Nov 2018 15:19:24 +0530
Subject: [PATCH 356/427] [CELADON] Enable CONFIG_TYPEC_TCPM to support
 USB_ROLE_SWITCH

Tracked-On: None
Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 kernel_config/kernel_64_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index f1f5c7bbc..8a4f66eb2 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -6702,3 +6702,5 @@ CONFIG_X86_DEBUG_FPU=y
 CONFIG_UNWINDER_ORC=y
 # CONFIG_UNWINDER_FRAME_POINTER is not set
 # CONFIG_UNWINDER_GUESS is not set
+
+CONFIG_TYPEC_TCPM=y

From 2f9d7b016cacbd123eaad149b7b8ade87474a453 Mon Sep 17 00:00:00 2001
From: swei22 <w.sheng@intel.com>
Date: Fri, 2 Nov 2018 16:36:17 +0800
Subject: [PATCH 357/427] Set CONFIG_TRUSTY_BACKUP_TIMER to builtin mode in
 kernel_config

Tracked-On: None
Signed-off-by: swei22 <w.sheng@intel.com>
---
 kernel_config/kernel_64_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 8a4f66eb2..958334873 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -3354,7 +3354,7 @@ CONFIG_TRUSTY=y
 CONFIG_TRUSTY_LOG=y
 CONFIG_TRUSTY_VIRTIO=y
 CONFIG_TRUSTY_VIRTIO_IPC=y
-CONFIG_TRUSTY_BACKUP_TIMER=m
+CONFIG_TRUSTY_BACKUP_TIMER=y
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set

From 8b6ee0024ade6935e6ec0021c71a13673dce4d24 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Tue, 6 Nov 2018 14:40:48 +0530
Subject: [PATCH 358/427] Enabled NVME flag in kernel4.19

Tracked-On:None
Signed-off-by: Swaroop Balan <swaroop.balan@intel.com>
---
 kernel_config/kernel_64_defconfig | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 958334873..c153bce80 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -1528,11 +1528,8 @@ CONFIG_BLK_DEV_RAM_SIZE=16384
 # CONFIG_VIRTIO_BLK is not set
 # CONFIG_BLK_DEV_RBD is not set
 # CONFIG_BLK_DEV_RSXX is not set
-
-#
-# NVME Support
-#
-# CONFIG_BLK_DEV_NVME is not set
+CONFIG_NVME_CORE=y
+CONFIG_BLK_DEV_NVME=y
 # CONFIG_NVME_FC is not set
 # CONFIG_NVME_TARGET is not set
 
@@ -5020,8 +5017,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
-CONFIG_RTC_NVMEM=y
+#CONFIG_RTC_DEBUG=y
 
 #
 # RTC interfaces

From 57823967cea4881887d8dd99c7c62fc97fdc7028 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Fri, 2 Nov 2018 15:40:42 +0530
Subject: [PATCH 359/427] [CELADON]f2fs filesystem support enabled   f2fs
 filesystem support is enabled for using in adoptable storage   as per google
 AOSP CDD adoptable storage shall use both ext4 and f2fs. so enabling f2fs

Tracked-On: None
Test: mount cmd
          1. create a storage volume with mkfs.f2fs utility
          2. mount -t f2fs <dev entry> <mount point>
          3. check mount cmd output and check for mount type as f2fs

Signed-off-by: shyjumon <shyjumon.n@intel.com>
---
 kernel_config/kernel_64_defconfig | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index c153bce80..705b9f275 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -5896,6 +5896,11 @@ CONFIG_FS_MBCACHE=y
 # CONFIG_BTRFS_FS is not set
 # CONFIG_NILFS2_FS is not set
 # CONFIG_F2FS_FS is not set
+CONFIG_F2FS_FS=y
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
 # CONFIG_FS_DAX is not set
 CONFIG_FS_POSIX_ACL=y
 # CONFIG_EXPORTFS_BLOCK_OPS is not set

From 4b4c0ba1b174f5fedebd57874e314dd27f19b63e Mon Sep 17 00:00:00 2001
From: Madhusudhan S <madhusudhan.s@intel.com>
Date: Wed, 31 Oct 2018 15:21:12 +0530
Subject: [PATCH 360/427] [CELADON]SELinux:remove dedicated sepolicy
 configuration for /sys/power/state

Adding car service to access /sys/power/state to enable IVI to go for
suspend.

Tracked-on: OAM-56502
Signed-off-by: Madhusudhan S <madhusudhan.s@intel.com>
---
 sepolicy/car/file.te          | 2 +-
 sepolicy/car/file_contexts    | 1 -
 sepolicy/car/system_app.te    | 3 ++-
 sepolicy/car/system_server.te | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/sepolicy/car/file.te b/sepolicy/car/file.te
index 1e3ef6fb9..02eb9ed09 100644
--- a/sepolicy/car/file.te
+++ b/sepolicy/car/file.te
@@ -3,5 +3,5 @@
 # when system is going to suspend, by press ignition button, Carservice needs to write
 # /sys/power/state to put system to suspend
 #
-type sysfs_power_state, fs_type, sysfs_type;
+#type sysfs_power_state, fs_type, sysfs_type;
 type sysfs_early_evs, fs_type, sysfs_type;
diff --git a/sepolicy/car/file_contexts b/sepolicy/car/file_contexts
index 66fd766c9..589ff440d 100644
--- a/sepolicy/car/file_contexts
+++ b/sepolicy/car/file_contexts
@@ -1,5 +1,4 @@
 /(vendor|system/vendor)/bin/hw/android\.hardware\.automotive\.vehicle\.intel@2\.0-service  u:object_r:hal_vehicle_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.automotive\.vehicle\.intel@2\.1-service  u:object_r:hal_vehicle_default_exec:s0
-/sys/power/state u:object_r:sysfs_power_state:s0
 
 /vendor/bin/hw/android.hardware.broadcastradio@intel-service u:object_r:hal_broadcastradio_default_exec:s0
diff --git a/sepolicy/car/system_app.te b/sepolicy/car/system_app.te
index 9a4a4f335..267e3d2f7 100644
--- a/sepolicy/car/system_app.te
+++ b/sepolicy/car/system_app.te
@@ -1,2 +1,3 @@
 # allow CarService to write /sys/power/state to enter deep sleep.
-allow system_app sysfs_power_state:file rw_file_perms;
+allow carservice_app sysfs_power:file rw_file_perms;
+
diff --git a/sepolicy/car/system_server.te b/sepolicy/car/system_server.te
index 2ad5fe21e..e69de29bb 100644
--- a/sepolicy/car/system_server.te
+++ b/sepolicy/car/system_server.te
@@ -1 +0,0 @@
-allow system_server sysfs_power_state:file rw_file_perms;

From 76bba7462f43bd5ba26e8699c335777990db4880 Mon Sep 17 00:00:00 2001
From: Madhusudhan S <madhusudhan.s@intel.com>
Date: Tue, 6 Nov 2018 10:56:46 +0530
Subject: [PATCH 361/427] [CELADON] Enabling
 CONFIG_ANDROID_AUTO_SUSPEND_BEHAVIOR

Enabling CONFIG_ANDROID_AUTO_SUSPEND_BEHAVIOR
to bypass the alarmtimer during suspend flow.

Tracked-On: OAM-56502
Signed-off-by: Madhusudhan S <madhusudhan.s@intel.com>
---
 kernel_config/kernel_64_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 705b9f275..3561166b5 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -6705,3 +6705,4 @@ CONFIG_UNWINDER_ORC=y
 # CONFIG_UNWINDER_GUESS is not set
 
 CONFIG_TYPEC_TCPM=y
+CONFIG_ANDROID_AUTO_SUSPEND_BEHAVIOR=y

From 2d43769fbcc99637ce7cc5db51f926973530d5ce Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Thu, 8 Nov 2018 08:59:47 +0530
Subject: [PATCH 362/427] [MIXINUP] Set overlay-car package for IVI

Tracked-On: OAM-70153
---
 cel_apl/device.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 7930ff649..6ce3a185a 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -347,7 +347,7 @@ PRODUCT_PACKAGES += \
   android.hardware.bluetooth@1.0-service \
   libbt-vendor
 
-PRODUCT_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/bluetooth/overlay-car-disablehfp
+PRODUCT_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/bluetooth/overlay-car
 
 ##############################################################
 # Source: device/intel/mixins/groups/disk-bus/auto/product.mk

From 8cb0b1dd893d287e36275c12c4ca4f07a6bab695 Mon Sep 17 00:00:00 2001
From: "Meng, KangX" <kangx.meng@intel.com>
Date: Thu, 1 Nov 2018 10:53:18 +0800
Subject: [PATCH 363/427] [MIXINUP] Change the vendor partition size from
 1500MB to 1800MB. In order to the kernel add debug info.

Tracked-On: OAM-71088
Signed-off-by: Meng, KangX <kangx.meng@intel.com>
---
 cel_apl/BoardConfig.mk | 2 +-
 cel_apl/gpt.ini        | 2 +-
 celadon/BoardConfig.mk | 2 +-
 celadon/gpt.ini        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index ec0b6be37..e9a32bd7d 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -147,7 +147,7 @@ PRODUCT_STATIC_BOOT_CONTROL_HAL := bootctrl.avb libavb_user
 # Those 3 lines are required to enable vendor image generation.
 # Remove them if vendor partition is not used.
 TARGET_COPY_OUT_VENDOR := vendor
-BOARD_VENDORIMAGE_PARTITION_SIZE := 1572864000
+BOARD_VENDORIMAGE_PARTITION_SIZE := 1887436800
 ifeq ($(SPARSE_IMG),true)
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 else
diff --git a/cel_apl/gpt.ini b/cel_apl/gpt.ini
index 10f6ab812..49d370a6f 100644
--- a/cel_apl/gpt.ini
+++ b/cel_apl/gpt.ini
@@ -65,7 +65,7 @@ guid = ebc597d0-2053-4b15-8b64-e0aac75f4db1
 
 [partition.vendor]
 label = vendor
-len = 1500
+len = 1800
 type = linux
 has_slot = true
 guid = c5a0aeec-13ea-11e5-a1b1-001e67ca0c3c
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index 5c00f9da5..7be8ff79b 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -157,7 +157,7 @@ PRODUCT_STATIC_BOOT_CONTROL_HAL := bootctrl.avb libavb_user
 # Those 3 lines are required to enable vendor image generation.
 # Remove them if vendor partition is not used.
 TARGET_COPY_OUT_VENDOR := vendor
-BOARD_VENDORIMAGE_PARTITION_SIZE := 1572864000
+BOARD_VENDORIMAGE_PARTITION_SIZE := 1887436800
 ifeq ($(SPARSE_IMG),true)
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 else
diff --git a/celadon/gpt.ini b/celadon/gpt.ini
index 10f6ab812..49d370a6f 100644
--- a/celadon/gpt.ini
+++ b/celadon/gpt.ini
@@ -65,7 +65,7 @@ guid = ebc597d0-2053-4b15-8b64-e0aac75f4db1
 
 [partition.vendor]
 label = vendor
-len = 1500
+len = 1800
 type = linux
 has_slot = true
 guid = c5a0aeec-13ea-11e5-a1b1-001e67ca0c3c

From b1549b5f410fbebdf75dd6fae983ce964febfc03 Mon Sep 17 00:00:00 2001
From: "Meng, KangX" <kangx.meng@intel.com>
Date: Thu, 1 Nov 2018 14:14:30 +0800
Subject: [PATCH 364/427] Change the timeout of fastboot from 1 minutes to 20
 minutes. if the storage speed is slow,then erase data partition maybe need
 cost long time.

Tracked-On: OAM-70451

Signed-off-by: Meng, KangX <kangx.meng@intel.com>
---
 cel_apl/mixins.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cel_apl/mixins.spec b/cel_apl/mixins.spec
index b4ce62de1..a54ae5a0c 100644
--- a/cel_apl/mixins.spec
+++ b/cel_apl/mixins.spec
@@ -38,7 +38,7 @@ debug-logs: true
 debug-coredump: true
 debug-phonedoctor: true
 debug-tools: true
-flashfiles: ini(oemvars=false,version=3.0,fastboot_min_battery_level=false,installer=true)
+flashfiles: ini(oemvars=false,version=3.0,fastboot_min_battery_level=false,installer=true,timeout=1200000)
 midi: true
 trusty: true(enable_hw_sec=true,enable_storage_proxyd=true,ref_target=project-celadon_64)
 slcan: default

From ec907b5eef6e9a9a55358dda0f23a0072313ec55 Mon Sep 17 00:00:00 2001
From: "Meng, KangX" <kangx.meng@intel.com>
Date: Thu, 1 Nov 2018 14:17:10 +0800
Subject: [PATCH 365/427] [MIXINUP] Change the timeout of fastboot from 1
 minutes to 20 minutes. if the storage speed is slow,then erase data partition
 maybe need cost long time.

Tracked-On: OAM-70451
Signed-off-by: Meng, KangX <kangx.meng@intel.com>
---
 cel_apl/flashfiles.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cel_apl/flashfiles.ini b/cel_apl/flashfiles.ini
index 2e74fb37b..d5434dbd5 100644
--- a/cel_apl/flashfiles.ini
+++ b/cel_apl/flashfiles.ini
@@ -30,7 +30,7 @@
 # additional-files += radio:dediprog.bin
 
 [output.flash.json]
-fastboot-command-options += timeout=60000 retry=1 mandatory=true
+fastboot-command-options += timeout=1200000 retry=1 mandatory=true
 enable = true
 version = 3.0
 configurations += update blank

From 8f96061584a989cbfea8254b65e36bb97ac9b951 Mon Sep 17 00:00:00 2001
From: Ming Tan <ming.tan@intel.com>
Date: Wed, 7 Nov 2018 09:57:38 +0800
Subject: [PATCH 366/427] Sepolicy: add set_storage to coredomain.

The old code will cause CTS report following error:
junit.framework.AssertionFailedError: The following domain(s) must be
associated with the "coredomain" attribute because they are executed off
of /system:
This patch will add set_storage to codedomain.
After enable the treble, will move the set_storage to /vendor/bin.

Jira: OAM-71287
Test: Pass the CtsSecurityHostTestCases testing case.

Signed-off-by: Ming Tan <ming.tan@intel.com>
---
 sepolicy/set_storage/set_storage.te | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sepolicy/set_storage/set_storage.te b/sepolicy/set_storage/set_storage.te
index 891351f73..1409a98d0 100644
--- a/sepolicy/set_storage/set_storage.te
+++ b/sepolicy/set_storage/set_storage.te
@@ -2,7 +2,7 @@
 # set_storage - set symlink on /dev/block/by-name
 #
 
-type set_storage, domain;
+type set_storage, domain, coredomain;
 
 allow set_storage self:capability { fsetid };
 

From aa416e340573b43468668f613114be98a9bd55c9 Mon Sep 17 00:00:00 2001
From: yayongdx <35451658+yayongdx@users.noreply.github.com>
Date: Tue, 6 Nov 2018 14:21:01 +0800
Subject: [PATCH 367/427] Debug: remove logd.te file

Because logd is not in whitelist of acquiring dac_override permission. remove logd dac_override permission for itself to fix SELinuxNeverallowRulesTest error in CtsSecurityHostTestCases Module.

Jira: https://jira01.devtools.intel.com/browse/OAM-71343
Test: None
Signed-off-by: Duan, YayongX <yayongx.duan@intel.com>
---
 sepolicy/logd.te | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 sepolicy/logd.te

diff --git a/sepolicy/logd.te b/sepolicy/logd.te
deleted file mode 100644
index 46482b45b..000000000
--- a/sepolicy/logd.te
+++ /dev/null
@@ -1 +0,0 @@
-allow logd logd:capability dac_override;

From 6f455281866e3c5ce6d85f542343db1cf1fc938d Mon Sep 17 00:00:00 2001
From: ops <ramya.v.naidu@intel.com>
Date: Mon, 5 Nov 2018 05:54:56 -0500
Subject: [PATCH 368/427] Fix for the test InstallDexMetadataHostTest failed in
 CtsDexMetadataHostTestCases Module

Tracked-On: OAM-71315
Signed-off-by: rnaidu <ramya.v.naidu@intel.com>
---
 sepolicy/kernel/profman.te | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 sepolicy/kernel/profman.te

diff --git a/sepolicy/kernel/profman.te b/sepolicy/kernel/profman.te
new file mode 100644
index 000000000..7bb2320ec
--- /dev/null
+++ b/sepolicy/kernel/profman.te
@@ -0,0 +1 @@
+allow profman apk_data_file:file map;

From d55db7a7990ada720b84bcd3edab4cb00efea9e5 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Fri, 9 Nov 2018 13:52:01 +0530
Subject: [PATCH 369/427] [CELADON] Made seplociy as enforcing for celadon
 tablet

Tracked-On: None
Signed-off-by: Swaroop Balan <swaroop.balan@intel.com>
---
 celadon/mixins.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/celadon/mixins.spec b/celadon/mixins.spec
index adeb81bbe..ed4d3c1ef 100644
--- a/celadon/mixins.spec
+++ b/celadon/mixins.spec
@@ -7,7 +7,7 @@ product.mk: device.mk
 [groups]
 2ndstage: oemvars
 project-celadon: default
-sepolicy: permissive
+sepolicy: enforcing
 graphics: project-celadon(gen9+=true,hwc2=true,vulkan=false,drmhwc=false,minigbm=true,gralloc1=true)
 media: project-celadon(mediasdk=false,media_sdk_source=false)
 device-type: tablet

From 0c86e398e61c364f01e4dbda79528259b75c9037 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Fri, 9 Nov 2018 13:53:38 +0530
Subject: [PATCH 370/427] [MIXINUP] CELADON enforcing done for celadon tablet

Tracked-On: None
Signed-off-by: Swaroop Balan <swaroop.balan@intel.com>
---
 celadon/BoardConfig.mk | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index 7be8ff79b..514ee9b71 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -10,13 +10,7 @@ BOARD_OEM_VARS += $(TARGET_DEVICE_DIR)/oemvars.txt
 ##############################################################
 KERNEL_CROSS_COMPILE_WRAPPER := x86_64-linux-android-
 ##############################################################
-# Source: device/intel/mixins/groups/sepolicy/permissive/BoardConfig.mk.1
-##############################################################
-# start kernel in permissive mode, this way we don't
-# need 'setenforce 0' from init.rc files
-BOARD_KERNEL_CMDLINE += enforcing=0 androidboot.selinux=permissive
-##############################################################
-# Source: device/intel/mixins/groups/sepolicy/permissive/BoardConfig.mk
+# Source: device/intel/mixins/groups/sepolicy/enforcing/BoardConfig.mk
 ##############################################################
 # SELinux Policy
 BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy

From 5c93759f9cbd91dfb95afb509fb55beced033b9e Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Fri, 9 Nov 2018 13:57:55 +0530
Subject: [PATCH 371/427] Revert "[CELADON] Enabling
 CONFIG_ANDROID_AUTO_SUSPEND_BEHAVIOR"

This reverts commit 76bba7462f43bd5ba26e8699c335777990db4880.
---
 kernel_config/kernel_64_defconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 3561166b5..705b9f275 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -6705,4 +6705,3 @@ CONFIG_UNWINDER_ORC=y
 # CONFIG_UNWINDER_GUESS is not set
 
 CONFIG_TYPEC_TCPM=y
-CONFIG_ANDROID_AUTO_SUSPEND_BEHAVIOR=y

From 26d136174b9026acb434a1ef8fd73e6c156d2fef Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Fri, 9 Nov 2018 13:58:07 +0530
Subject: [PATCH 372/427] Revert "[CELADON]SELinux:remove dedicated sepolicy
 configuration for /sys/power/state"

This reverts commit 4b4c0ba1b174f5fedebd57874e314dd27f19b63e.
---
 sepolicy/car/file.te          | 2 +-
 sepolicy/car/file_contexts    | 1 +
 sepolicy/car/system_app.te    | 3 +--
 sepolicy/car/system_server.te | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sepolicy/car/file.te b/sepolicy/car/file.te
index 02eb9ed09..1e3ef6fb9 100644
--- a/sepolicy/car/file.te
+++ b/sepolicy/car/file.te
@@ -3,5 +3,5 @@
 # when system is going to suspend, by press ignition button, Carservice needs to write
 # /sys/power/state to put system to suspend
 #
-#type sysfs_power_state, fs_type, sysfs_type;
+type sysfs_power_state, fs_type, sysfs_type;
 type sysfs_early_evs, fs_type, sysfs_type;
diff --git a/sepolicy/car/file_contexts b/sepolicy/car/file_contexts
index 589ff440d..66fd766c9 100644
--- a/sepolicy/car/file_contexts
+++ b/sepolicy/car/file_contexts
@@ -1,4 +1,5 @@
 /(vendor|system/vendor)/bin/hw/android\.hardware\.automotive\.vehicle\.intel@2\.0-service  u:object_r:hal_vehicle_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.automotive\.vehicle\.intel@2\.1-service  u:object_r:hal_vehicle_default_exec:s0
+/sys/power/state u:object_r:sysfs_power_state:s0
 
 /vendor/bin/hw/android.hardware.broadcastradio@intel-service u:object_r:hal_broadcastradio_default_exec:s0
diff --git a/sepolicy/car/system_app.te b/sepolicy/car/system_app.te
index 267e3d2f7..9a4a4f335 100644
--- a/sepolicy/car/system_app.te
+++ b/sepolicy/car/system_app.te
@@ -1,3 +1,2 @@
 # allow CarService to write /sys/power/state to enter deep sleep.
-allow carservice_app sysfs_power:file rw_file_perms;
-
+allow system_app sysfs_power_state:file rw_file_perms;
diff --git a/sepolicy/car/system_server.te b/sepolicy/car/system_server.te
index e69de29bb..2ad5fe21e 100644
--- a/sepolicy/car/system_server.te
+++ b/sepolicy/car/system_server.te
@@ -0,0 +1 @@
+allow system_server sysfs_power_state:file rw_file_perms;

From 9dbb253447fbfd511b546a653b9bcc761af32e07 Mon Sep 17 00:00:00 2001
From: Meng Xianglin <xianglinx.meng@intel.com>
Date: Thu, 8 Nov 2018 13:10:31 +0800
Subject: [PATCH 373/427] Enable self implemented usb device mode protocol in
 kernelflinger.

Track-On: OAM-70520
Signed-off-by: Meng Xianglin <xianglinx.meng@intel.com>
---
 cel_apl/mixins.spec | 2 +-
 celadon/mixins.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cel_apl/mixins.spec b/cel_apl/mixins.spec
index a54ae5a0c..580013f23 100644
--- a/cel_apl/mixins.spec
+++ b/cel_apl/mixins.spec
@@ -18,7 +18,7 @@ usb-gadget: g_ffs
 adb_net: true
 kernel: project-celadon(loglevel=3, disable_cpuidle_on_boot=true)
 bluetooth: btusb (ivi=true)
-boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true,ignore_not_applicable_reset=true)
+boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true,ignore_not_applicable_reset=true,self_usb_device_mode_protocol=true)
 audio: project-celadon
 wlan: iwlwifi
 cpu-arch: skl
diff --git a/celadon/mixins.spec b/celadon/mixins.spec
index ed4d3c1ef..a2efdef6e 100644
--- a/celadon/mixins.spec
+++ b/celadon/mixins.spec
@@ -19,7 +19,7 @@ usb-gadget: g_ffs
 adb_net: true
 kernel: project-celadon(loglevel=3, disable_cpuidle_on_boot=true)
 bluetooth: btusb
-boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true,ignore_not_applicable_reset=true)
+boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true,ignore_not_applicable_reset=true,self_usb_device_mode_protocol=true)
 audio: project-celadon
 wlan: iwlwifi
 cpu-arch: skl

From c5c7c240e7ad9d3ecf60dbd346d00d7808aaa9cd Mon Sep 17 00:00:00 2001
From: Meng Xianglin <xianglinx.meng@intel.com>
Date: Thu, 8 Nov 2018 13:22:48 +0800
Subject: [PATCH 374/427] [MIXINUP] Enable self implemented usb device mode
 protocol

Track-On: OAM-70520
Signed-off-by: Meng Xianglin <xianglinx.meng@intel.com>
---
 cel_apl/device.mk | 2 ++
 celadon/device.mk | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 6ce3a185a..5bf4fa83a 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -430,6 +430,8 @@ ifeq ($(TARGET_BOOTLOADER_POLICY),$(filter $(TARGET_BOOTLOADER_POLICY),static ex
 endif
 
 
+
+KERNELFLINGER_SUPPORT_SELF_USB_DEVICE_MODE_PROTOCOL := true
 ##############################################################
 # Source: device/intel/mixins/groups/audio/project-celadon/product.mk
 ##############################################################
diff --git a/celadon/device.mk b/celadon/device.mk
index 19d289c65..995030fe7 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -430,6 +430,8 @@ ifeq ($(TARGET_BOOTLOADER_POLICY),$(filter $(TARGET_BOOTLOADER_POLICY),static ex
 endif
 
 
+
+KERNELFLINGER_SUPPORT_SELF_USB_DEVICE_MODE_PROTOCOL := true
 ##############################################################
 # Source: device/intel/mixins/groups/audio/project-celadon/product.mk
 ##############################################################

From 18ecc0b6042777f3b04a29736295ca06e878f738 Mon Sep 17 00:00:00 2001
From: Zhiwei Li <zhiwei.li@intel.com>
Date: Wed, 24 Oct 2018 10:37:05 +0800
Subject: [PATCH 375/427] [MIXINUP]set filenames_mode to cts, for heh is not be
 supported

Tracked-On: https://jira01.devtools.intel.com/browse/OAM-70236
Signed-off-by: Zhiwei Li zhiwei.li@intel.com
---
 cel_apl/device.mk | 4 ++++
 celadon/device.mk | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 5bf4fa83a..edf2f9b1c 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -77,6 +77,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.hwui.text_large_cache_width=2048 \
     ro.hwui.text_large_cache_height=512
 
+# Set filenames_mode to cts, for heh is not available
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.crypto.volume.filenames_mode=aes-256-cts
+
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     persist.rtc_local_time=1 \
 
diff --git a/celadon/device.mk b/celadon/device.mk
index 995030fe7..0b381a0b5 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -77,6 +77,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.hwui.text_large_cache_width=2048 \
     ro.hwui.text_large_cache_height=512
 
+# Set filenames_mode to cts, for heh is not available
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.crypto.volume.filenames_mode=aes-256-cts
+
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     persist.rtc_local_time=1 \
 

From 82206480a07045ead22db1ab9e6a374bccb89904 Mon Sep 17 00:00:00 2001
From: ysiyer <yegnesh.s.iyer@intel.com>
Date: Tue, 6 Nov 2018 06:57:47 +0530
Subject: [PATCH 376/427] thermal-daemon: Enable thermal daemon for all builds

thermal-daemon was a recipe for celadon builds only.
This change would make thermal-daemon a recipe for cel_apl
builds as well.

Tracked-On: OAM-71333
Signed-off-by: ysiyer <yegnesh.s.iyer@intel.com>
---
 cel_apl/mixins.spec                                    | 2 +-
 {celadon => common/thermal}/thermal-conf.xml           | 0
 {celadon => common/thermal}/thermal-cpu-cdev-order.xml | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename {celadon => common/thermal}/thermal-conf.xml (100%)
 rename {celadon => common/thermal}/thermal-cpu-cdev-order.xml (100%)

diff --git a/cel_apl/mixins.spec b/cel_apl/mixins.spec
index 580013f23..d8c89af23 100644
--- a/cel_apl/mixins.spec
+++ b/cel_apl/mixins.spec
@@ -28,7 +28,7 @@ dexpreopt: enabled
 disk-bus: auto
 usb: host+acc
 lights: true
-thermal: dptf(intel_modem=true)
+thermal: thermal-daemon
 config-partition: enabled
 vendor-partition: true
 factory-partition: true
diff --git a/celadon/thermal-conf.xml b/common/thermal/thermal-conf.xml
similarity index 100%
rename from celadon/thermal-conf.xml
rename to common/thermal/thermal-conf.xml
diff --git a/celadon/thermal-cpu-cdev-order.xml b/common/thermal/thermal-cpu-cdev-order.xml
similarity index 100%
rename from celadon/thermal-cpu-cdev-order.xml
rename to common/thermal/thermal-cpu-cdev-order.xml

From 50e65c2ae167e91c703552f048e88a5ee5711337 Mon Sep 17 00:00:00 2001
From: ysiyer <yegnesh.s.iyer@intel.com>
Date: Tue, 6 Nov 2018 07:08:11 +0530
Subject: [PATCH 377/427] thermal-daemon: Enable thermal policy for KBL
 NUC7i5DNHE devices

Tracked-On: OAM-71333
Signed-off-by: ysiyer <yegnesh.s.iyer@intel.com>
---
 common/thermal/thermal-conf.xml | 56 +++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/common/thermal/thermal-conf.xml b/common/thermal/thermal-conf.xml
index aa0f4fdad..fe23a906e 100644
--- a/common/thermal/thermal-conf.xml
+++ b/common/thermal/thermal-conf.xml
@@ -57,5 +57,61 @@
 			</CoolingDevice>
 		</CoolingDevices>
 	</Platform>
+	<Platform>
+		<Name> KBL-NUC-D </Name>
+		<ProductName>NUC7i5DNHE</ProductName>
+		<Preference>QUIET</Preference>
+		<ThermalZones>
+			<ThermalZone>
+				<Type>cpu_passive</Type>
+				<TripPoints>
+					<TripPoint>
+						<SensorType>x86_pkg_temp</SensorType>
+						<Temperature>90000</Temperature>
+						<Type>Passive</Type>
+						<CoolingDevice>
+							<Type>rapl_limit_1</Type>
+						</CoolingDevice>
+					</TripPoint>
+					<TripPoint>
+						<SensorType>x86_pkg_temp</SensorType>
+						<Temperature>105000</Temperature>
+						<Type>Passive</Type>
+						<CoolingDevice>
+							<Type>rapl_limit_2</Type>
+						</CoolingDevice>
+					</TripPoint>
+				</TripPoints>
+			</ThermalZone>
+			<ThermalZone>
+				<Type>cpu_critical</Type>
+				<TripPoints>
+					<TripPoint>
+						<SensorType>x86_pkg_temp</SensorType>
+						<Temperature>110000</Temperature>
+						<Type>Critical</Type>
+					</TripPoint>
+				</TripPoints>
+			</ThermalZone>
+		</ThermalZones>
+		<CoolingDevices>
+			<CoolingDevice>
+				<Type>rapl_limit_1</Type>
+				<Path>/sys/devices/virtual/powercap/intel-rapl/intel-rapl:0/constraint_0_power_limit_uw</Path>
+				<MinState>20000000</MinState>
+				<ReadBack>0</ReadBack>
+				<MaxState>14000000</MaxState>
+				<IncDecStep>-200000</IncDecStep>
+			</CoolingDevice>
+			<CoolingDevice>
+				<Type>rapl_limit_2</Type>
+				<Path>/sys/devices/virtual/powercap/intel-rapl/intel-rapl:0/constraint_0_power_limit_uw</Path>
+				<MinState>14000000</MinState>
+				<ReadBack>0</ReadBack>
+				<MaxState>6000000</MaxState>
+				<IncDecStep>-200000</IncDecStep>
+			</CoolingDevice>
+		</CoolingDevices>
+	</Platform>
 </ThermalConfiguration>
 <!-- END -->

From 42cd1e91c5b29db31b244c71f2367b8d067e8bd3 Mon Sep 17 00:00:00 2001
From: ysiyer <yegnesh.s.iyer@intel.com>
Date: Tue, 6 Nov 2018 07:11:44 +0530
Subject: [PATCH 378/427] thermal-daemon: Enable thermal policy for APL
 NUC6CAYH devices

Tracked-On: OAM-71333
Signed-off-by: ysiyer <yegnesh.s.iyer@intel.com>
---
 common/thermal/thermal-conf.xml | 56 +++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/common/thermal/thermal-conf.xml b/common/thermal/thermal-conf.xml
index fe23a906e..fb57dc34c 100644
--- a/common/thermal/thermal-conf.xml
+++ b/common/thermal/thermal-conf.xml
@@ -113,5 +113,61 @@
 			</CoolingDevice>
 		</CoolingDevices>
 	</Platform>
+	<Platform>
+		<Name> APL-NUC </Name>
+		<ProductName>NUC6CAYH</ProductName>
+		<Preference>QUIET</Preference>
+		<ThermalZones>
+			<ThermalZone>
+				<Type>cpu_passive</Type>
+				<TripPoints>
+					<TripPoint>
+						<SensorType>x86_pkg_temp</SensorType>
+						<Temperature>90000</Temperature>
+						<Type>Passive</Type>
+						<CoolingDevice>
+							<Type>rapl_limit_1</Type>
+						</CoolingDevice>
+					</TripPoint>
+					<TripPoint>
+						<SensorType>x86_pkg_temp</SensorType>
+						<Temperature>105000</Temperature>
+						<Type>Passive</Type>
+						<CoolingDevice>
+							<Type>rapl_limit_2</Type>
+						</CoolingDevice>
+					</TripPoint>
+				</TripPoints>
+			</ThermalZone>
+			<ThermalZone>
+				<Type>cpu_critical</Type>
+				<TripPoints>
+					<TripPoint>
+						<SensorType>x86_pkg_temp</SensorType>
+						<Temperature>110000</Temperature>
+						<Type>Critical</Type>
+					</TripPoint>
+				</TripPoints>
+			</ThermalZone>
+		</ThermalZones>
+		<CoolingDevices>
+			<CoolingDevice>
+				<Type>rapl_limit_1</Type>
+				<Path>/sys/devices/virtual/powercap/intel-rapl/intel-rapl:0/constraint_0_power_limit_uw</Path>
+				<MinState>12000000</MinState>
+				<ReadBack>0</ReadBack>
+				<MaxState>8000000</MaxState>
+				<IncDecStep>-200000</IncDecStep>
+			</CoolingDevice>
+			<CoolingDevice>
+				<Type>rapl_limit_2</Type>
+				<Path>/sys/devices/virtual/powercap/intel-rapl/intel-rapl:0/constraint_0_power_limit_uw</Path>
+				<MinState>8000000</MinState>
+				<ReadBack>0</ReadBack>
+				<MaxState>6000000</MaxState>
+				<IncDecStep>-200000</IncDecStep>
+			</CoolingDevice>
+		</CoolingDevices>
+	</Platform>
 </ThermalConfiguration>
 <!-- END -->

From f95494d18c60f0a94f5436d0bfb41d09d63867aa Mon Sep 17 00:00:00 2001
From: ysiyer <yegnesh.s.iyer@intel.com>
Date: Wed, 7 Nov 2018 15:39:10 +0530
Subject: [PATCH 379/427] thermal-daemon: Fix appropriate permission for init

In sepolicy 'enforcing' mode, the ownership changes for the files
were not set appropriately and 'init' was not given the permissions
to do the same.

This change would give appropriate permissions to 'init' to modify
the permissions of sysfs files accessed by thermal-daemon.

Tracked-On: OAM-71333
Signed-off-by: ysiyer <yegnesh.s.iyer@intel.com>
---
 sepolicy/thermal/thermal-daemon/init.te | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 sepolicy/thermal/thermal-daemon/init.te

diff --git a/sepolicy/thermal/thermal-daemon/init.te b/sepolicy/thermal/thermal-daemon/init.te
new file mode 100644
index 000000000..1a014d449
--- /dev/null
+++ b/sepolicy/thermal/thermal-daemon/init.te
@@ -0,0 +1,8 @@
+allow init sysfs_powercap:dir { read open };
+allow init sysfs_powercap:file { read setattr };
+allow init thermal-daemon_data_file: dir { read open };
+allow init thermal-daemon_data_file: file { read setattr };
+allow init thermal-daemon_run_dir: dir { create read open };
+allow init thermal-daemon_run_dir: file { create read write setattr };
+allow init sysfs_dmi_id: file { read setattr };
+allow init sysfs_backlight_thermal: file { read write setattr };

From 111c23fc5db21ab001f0d34f82ef6bba4d670c6a Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Wed, 14 Nov 2018 17:20:25 +0530
Subject: [PATCH 380/427] [CELADON] thermal-daemon: Update the path for the
 thermal config files #101

Tracked-On: OAM-71333
Signed-off-by: Swaroop Balan <swaroop.balan@intel.com>
---
 cel_apl/BoardConfig.mk |  5 ++---
 cel_apl/device.mk      | 26 +++++++-------------------
 cel_apl/init.rc        | 23 +++++++++++++----------
 celadon/device.mk      |  4 ++--
 celadon/init.rc        |  2 +-
 5 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index e9a32bd7d..a4ea431cd 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -356,11 +356,10 @@ BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/rfkill
 WITH_DEXPREOPT := true
 WITH_DEXPREOPT_PIC := true
 ##############################################################
-# Source: device/intel/mixins/groups/thermal/dptf/BoardConfig.mk
+# Source: device/intel/mixins/groups/thermal/thermal-daemon/BoardConfig.mk
 ##############################################################
 BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/thermal
-BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/thermal/dptf
-BOARD_KERNEL_CMDLINE += thermal.off=1
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/thermal/thermal-daemon
 ##############################################################
 # Source: device/intel/mixins/groups/pstore/ram_dummy/BoardConfig.mk.1
 ##############################################################
diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index edf2f9b1c..d9a59f6f5 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -528,25 +528,13 @@ PRODUCT_PACKAGES += lights.project-celadon \
     android.hardware.light@2.0-service \
     android.hardware.light@2.0-impl
 ##############################################################
-# Source: device/intel/mixins/groups/thermal/dptf/product.mk
-##############################################################
-# DPTF
-INTEL_MODEM_CTL := true
-PRODUCT_PACKAGES += esif_ufd \
-    dsp.dv \
-    dptf.dv \
-    libc++_shared.so \
-    Dptf \
-    DptfPolicyActive \
-    DptfPolicyAdaptivePerformance \
-    DptfPolicyConditionalLogicLib \
-    DptfPolicyCritical \
-    DptfPolicyEmergencyCallMode \
-    DptfPolicyPassive \
-    DptfPolicyVirtualSensor \
-    upe_java \
-    jhs
-PRODUCT_COPY_FILES += $(LOCAL_PATH)/dptf.dv:/system/etc/dptf/dv/dptf.dv
+# Source: device/intel/mixins/groups/thermal/thermal-daemon/product.mk
+##############################################################
+# thermal-daemon
+PRODUCT_PACKAGES += thermal-daemon
+PRODUCT_COPY_FILES += \
+	device/intel/project-celadon/common/thermal/thermal-conf.xml:/vendor/etc/thermal-daemon/thermal-conf.xml \
+	device/intel/project-celadon/common/thermal/thermal-cpu-cdev-order.xml:/vendor/etc/thermal-daemon/thermal-cpu-cdev-order.xml
 ##############################################################
 # Source: device/intel/mixins/groups/pstore/ram_dummy/product.mk
 ##############################################################
diff --git a/cel_apl/init.rc b/cel_apl/init.rc
index edebf56b1..2598da115 100644
--- a/cel_apl/init.rc
+++ b/cel_apl/init.rc
@@ -602,19 +602,12 @@ on post-fs
    insmod /vendor/lib/modules/kernel/drivers/usb/serial/pl2303.ko
    insmod /vendor/lib/modules/kernel/drivers/usb/serial/ftdi_sio.ko
 ##############################################################
-# Source: device/intel/mixins/groups/thermal/dptf/init.rc
+# Source: device/intel/mixins/groups/thermal/thermal-daemon/init.rc
 ##############################################################
-on post-fs
-    setprop persist.thermal.mode dptf
-
-service esif_ufd /system/vendor/bin/esif_ufd -n
+service thermal-daemon /system/vendor/bin/thermal-daemon --config-file /system/vendor/etc/thermal-daemon/thermal-conf.xml
+    class main
     user system
     group system
-    class main
-
-on post-fs-data
-    mkdir /data/misc/dptf 0770 system system
-    mkdir /data/misc/dptf/lock 0770 system system
 
 on boot
     chown system system /sys/devices/system/cpu/intel_pstate/max_perf_pct
@@ -622,7 +615,17 @@ on boot
     chown system system /sys/devices/system/cpu/intel_pstate/no_turbo
     chown system system /sys/class/powercap/intel-rapl:0/enabled
     chown system system /sys/class/powercap/intel-rapl:0/constraint_0_power_limit_uw
+    chown system system /sys/class/dmi/id/product_uuid
+    chown system system /sys/class/dmi/id/product_name
+    chown system system /system/vendor/etc/
+    chown system system /system/vendor/etc/thermal-daemon/thermal-conf.xml
     restorecon_recursive /sys/class/powercap
+
+on post-fs
+    setprop persist.thermal.mode thermal-daemon
+    mkdir /data/misc/thermal-daemon 0771 system system
+    start thermal-daemon
+
 ##############################################################
 # Source: device/intel/mixins/groups/pstore/ram_dummy/init.rc
 ##############################################################
diff --git a/celadon/device.mk b/celadon/device.mk
index 0b381a0b5..bccb7b72f 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -533,8 +533,8 @@ PRODUCT_PACKAGES += lights.project-celadon \
 # thermal-daemon
 PRODUCT_PACKAGES += thermal-daemon
 PRODUCT_COPY_FILES += \
-	$(LOCAL_PATH)/thermal-conf.xml:/vendor/etc/thermal-daemon/thermal-conf.xml \
-	$(LOCAL_PATH)/thermal-cpu-cdev-order.xml:/vendor/etc/thermal-daemon/thermal-cpu-cdev-order.xml
+	device/intel/project-celadon/common/thermal/thermal-conf.xml:/vendor/etc/thermal-daemon/thermal-conf.xml \
+	device/intel/project-celadon/common/thermal/thermal-cpu-cdev-order.xml:/vendor/etc/thermal-daemon/thermal-cpu-cdev-order.xml
 ##############################################################
 # Source: device/intel/mixins/groups/pstore/ram_dummy/product.mk
 ##############################################################
diff --git a/celadon/init.rc b/celadon/init.rc
index 28767fdae..2598da115 100644
--- a/celadon/init.rc
+++ b/celadon/init.rc
@@ -618,7 +618,7 @@ on boot
     chown system system /sys/class/dmi/id/product_uuid
     chown system system /sys/class/dmi/id/product_name
     chown system system /system/vendor/etc/
-    chown system system /system/vendor/etc/thermal-conf.xml
+    chown system system /system/vendor/etc/thermal-daemon/thermal-conf.xml
     restorecon_recursive /sys/class/powercap
 
 on post-fs

From 3114eb34f535a73bd001632b02f218bf98c9728b Mon Sep 17 00:00:00 2001
From: Hongcheng Xie <hongcheng.xie@intel.com>
Date: Thu, 8 Nov 2018 15:13:36 +0800
Subject: [PATCH 381/427] [MIXINUP] Add car product overlays

Google car.mk will define PRODUCT_PACKAGE_OVERLAYS, we need to make sure
vendor car product overlays take precedence than google definition under
packages/service/Car/car_product/overlay for customization.

Tracked-On: OAM-71506
Signed-off-by: Hongcheng Xie <hongcheng.xie@intel.com>
---
 cel_apl/device.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index d9a59f6f5..3dec2bce4 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -704,6 +704,9 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.broadcastradio.xml:vendor/etc/permissions/android.hardware.broadcastradio.xml \
     frameworks/native/data/etc/android.software.activities_on_secondary_displays.xml:vendor/etc/permissions/android.software.activities_on_secondary_displays.xml
 
+# Make sure vendor car product overlays take precedence than google definition
+# under packages/services/Car/car_product/overlay/
+PRODUCT_PACKAGE_OVERLAYS += device/intel/common/device-type/overlay-car
 $(call inherit-product, packages/services/Car/car_product/build/car.mk)
 
 $(call inherit-product,frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-heap.mk)

From a48188629852fe8b027016c1ecf8c56a8bed5364 Mon Sep 17 00:00:00 2001
From: "M, Kumar K" <kumar.k.m@intel.com>
Date: Mon, 5 Nov 2018 10:52:49 +0530
Subject: [PATCH 382/427] Enable audio HAL 4.0

Tracked-On: OAM-71684
Signed-off-by: M, Kumar K <kumar.k.m@intel.com>
---
 manifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index dce7d2486..43e6efea2 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -2,7 +2,7 @@
     <hal format="hidl">
         <name>android.hardware.audio</name>
         <transport arch="32+64">passthrough</transport>
-        <version>2.0</version>
+        <version>4.0</version>
         <interface>
             <name>IDevicesFactory</name>
             <instance>default</instance>
@@ -11,7 +11,7 @@
     <hal format="hidl">
         <name>android.hardware.audio.effect</name>
         <transport arch="32+64">passthrough</transport>
-        <version>2.0</version>
+        <version>4.0</version>
         <interface>
             <name>IEffectsFactory</name>
             <instance>default</instance>

From 21c62b5502cde11ab485dbce5fee8024161fe5a2 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Wed, 14 Nov 2018 17:25:45 +0530
Subject: [PATCH 383/427] [MIXINUP] Enable Audio HAL 4.0 on celadon #110

Tracked-On: OAM-71684
Signed-off-by: Swaroop Balan <swaroop.balan@intel.com>
---
 cel_apl/device.mk | 4 ++--
 celadon/device.mk | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 3dec2bce4..08a6b5f5d 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -454,8 +454,8 @@ PRODUCT_PACKAGES += \
 
 # Audio HAL
 PRODUCT_PACKAGES += \
-    android.hardware.audio.effect@2.0-impl \
-    android.hardware.audio@2.0-impl \
+    android.hardware.audio.effect@4.0-impl \
+    android.hardware.audio@4.0-impl \
     android.hardware.audio@2.0-service
 
 PRODUCT_PROPERTY_OVERRIDES += audio.safemedia.bypass=true
diff --git a/celadon/device.mk b/celadon/device.mk
index bccb7b72f..12de1c38f 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -454,8 +454,8 @@ PRODUCT_PACKAGES += \
 
 # Audio HAL
 PRODUCT_PACKAGES += \
-    android.hardware.audio.effect@2.0-impl \
-    android.hardware.audio@2.0-impl \
+    android.hardware.audio.effect@4.0-impl \
+    android.hardware.audio@4.0-impl \
     android.hardware.audio@2.0-service
 
 PRODUCT_PROPERTY_OVERRIDES += audio.safemedia.bypass=true

From 722b25927095f0d6904e4f4b87d2c062daf506ae Mon Sep 17 00:00:00 2001
From: "Sristi, Vns Murthy" <vns.murthy.sristi@intel.com>
Date: Wed, 14 Nov 2018 11:40:01 +0530
Subject: [PATCH 384/427] enable sepolicy for sample-all neural networks hal

Tracked-On: OAM-69266
Signed-off-by: Sristi, Vns Murthy <vns.murthy.sristi@intel.com>
---
 manifest.xml                                  | 9 +++++++++
 sepolicy/neuralnetworks/file_contexts         | 1 +
 sepolicy/neuralnetworks/hal_neuralnetworks.te | 5 +++++
 3 files changed, 15 insertions(+)
 create mode 100644 sepolicy/neuralnetworks/file_contexts
 create mode 100644 sepolicy/neuralnetworks/hal_neuralnetworks.te

diff --git a/manifest.xml b/manifest.xml
index 43e6efea2..5d1cd3762 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -120,5 +120,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+          <name>android.hardware.neuralnetworks</name>
+          <transport>hwbinder</transport>
+          <version>1.1</version>
+          <interface>
+              <name>IDevice</name>
+              <instance>sample-all</instance>
+          </interface>
+    </hal>
 
 </manifest>
diff --git a/sepolicy/neuralnetworks/file_contexts b/sepolicy/neuralnetworks/file_contexts
new file mode 100644
index 000000000..3c1f96604
--- /dev/null
+++ b/sepolicy/neuralnetworks/file_contexts
@@ -0,0 +1 @@
+/(vendor|system/vendor)/bin/hw/android\.hardware\.neuralnetworks@1.1-service-sample-all   u:object_r:hal_neuralnetworks_default_exec:s0
diff --git a/sepolicy/neuralnetworks/hal_neuralnetworks.te b/sepolicy/neuralnetworks/hal_neuralnetworks.te
new file mode 100644
index 000000000..2940b6225
--- /dev/null
+++ b/sepolicy/neuralnetworks/hal_neuralnetworks.te
@@ -0,0 +1,5 @@
+type hal_neuralnetworks_default, domain;
+hal_server_domain(hal_neuralnetworks_default, hal_neuralnetworks)
+
+type hal_neuralnetworks_default_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(hal_neuralnetworks_default)

From a0b94f680d2b42cf8596bec7298348fbe9818667 Mon Sep 17 00:00:00 2001
From: sgnanase <sundar.gnanasekaran@intel.com>
Date: Wed, 14 Nov 2018 13:28:53 +0530
Subject: [PATCH 385/427] [CELADON] Enable back secure adb

Tracked-On: None
Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 cel_apl/device.mk | 12 ++++++++++++
 celadon/device.mk | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 08a6b5f5d..f2b722abb 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -281,16 +281,28 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.sf.lcd_density=160
 ##############################################################
 # Set default USB interface
 USB_CONFIG := mtp
+
 ifeq ($(TARGET_BUILD_VARIANT),user)
 # Enable Secure Debugging
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.adb.secure=1
 ifeq ($(BUILD_FOR_CTS_AUTOMATION),true)
 # Build for automated CTS
+ifneq ($(USB_CONFIG), adb)
 USB_CONFIG := $(USB_CONFIG),adb
+endif
+PRODUCT_COPY_FILES += $(INTEL_PATH_COMMON)/usb-gadget/adb_keys:root/adb_keys
 endif #BUILD_FOR_CTS_AUTOMATION == true
 endif #TARGET_BUILD_VARIANT == user
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.sys.usb.config=$(USB_CONFIG)
 
+# Add Intel adb keys for userdebug/eng builds
+ifneq ($(TARGET_BUILD_VARIANT),user)
+PRODUCT_COPY_FILES += $(INTEL_PATH_COMMON)/usb-gadget/adb_keys:root/adb_keys
+# Enable Secure Debugging for userdebug
+ifeq ($(TARGET_BUILD_VARIANT),userdebug) #userdebug
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.adb.secure=1
+endif #userdebug
+endif #userdebug/eng
 ##############################################################
 # Source: device/intel/mixins/groups/adb_net/true/product.mk
 ##############################################################
diff --git a/celadon/device.mk b/celadon/device.mk
index 12de1c38f..89bc2916b 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -281,16 +281,28 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.sf.lcd_density=160
 ##############################################################
 # Set default USB interface
 USB_CONFIG := mtp
+
 ifeq ($(TARGET_BUILD_VARIANT),user)
 # Enable Secure Debugging
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.adb.secure=1
 ifeq ($(BUILD_FOR_CTS_AUTOMATION),true)
 # Build for automated CTS
+ifneq ($(USB_CONFIG), adb)
 USB_CONFIG := $(USB_CONFIG),adb
+endif
+PRODUCT_COPY_FILES += $(INTEL_PATH_COMMON)/usb-gadget/adb_keys:root/adb_keys
 endif #BUILD_FOR_CTS_AUTOMATION == true
 endif #TARGET_BUILD_VARIANT == user
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.sys.usb.config=$(USB_CONFIG)
 
+# Add Intel adb keys for userdebug/eng builds
+ifneq ($(TARGET_BUILD_VARIANT),user)
+PRODUCT_COPY_FILES += $(INTEL_PATH_COMMON)/usb-gadget/adb_keys:root/adb_keys
+# Enable Secure Debugging for userdebug
+ifeq ($(TARGET_BUILD_VARIANT),userdebug) #userdebug
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.adb.secure=1
+endif #userdebug
+endif #userdebug/eng
 ##############################################################
 # Source: device/intel/mixins/groups/adb_net/true/product.mk
 ##############################################################

From 736d74817c53bd58c6460984091483541122839f Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Thu, 15 Nov 2018 11:37:32 +0530
Subject: [PATCH 386/427] [CELADON] Upgrading the kernel def_config to 4.19

Tracked-On:None
Signed-off-by: Swaroop Balan <swaroop.balan@intel.com>
---
 kernel_config/kernel_64_defconfig | 516 ++++++++++++------------------
 1 file changed, 202 insertions(+), 314 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 705b9f275..4edeabdf6 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.19.0-rc7 Kernel Configuration
+# Linux/x86_64 4.19.0 Kernel Configuration
 #
 
 #
-# Compiler: x86_64-poky-linux-gcc (GCC) 7.3.0
+# Compiler: gcc (Ubuntu 5.5.0-12ubuntu1~14.04) 5.5.0 20171010
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=70300
+CONFIG_GCC_VERSION=50500
 CONFIG_CLANG_VERSION=0
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
@@ -82,6 +82,7 @@ CONFIG_NO_HZ_IDLE=y
 # CONFIG_NO_HZ_FULL is not set
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
+# CONFIG_ANDROID_AUTO_SUSPEND_BEHAVIOR is not set
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
@@ -152,6 +153,7 @@ CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 # CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_SCHED_AUTOGROUP=y
+# CONFIG_SCHED_TUNE is not set
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
@@ -346,6 +348,7 @@ CONFIG_MICROCODE_OLD_INTERFACE=y
 CONFIG_X86_CPUID=y
 # CONFIG_X86_5LEVEL is not set
 CONFIG_X86_DIRECT_GBPAGES=y
+# CONFIG_X86_CPA_STATISTICS is not set
 CONFIG_ARCH_HAS_MEM_ENCRYPT=y
 # CONFIG_AMD_MEM_ENCRYPT is not set
 # CONFIG_NUMA is not set
@@ -429,6 +432,7 @@ CONFIG_PM_TRACE=y
 CONFIG_PM_TRACE_RTC=y
 CONFIG_PM_CLK=y
 CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
+# CONFIG_ENERGY_MODEL is not set
 CONFIG_ARCH_SUPPORTS_ACPI=y
 CONFIG_ACPI=y
 CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
@@ -888,6 +892,7 @@ CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
+CONFIG_NET_EGRESS=y
 
 #
 # Networking options
@@ -932,7 +937,6 @@ CONFIG_NET_UDP_TUNNEL=m
 CONFIG_INET_ESP=y
 # CONFIG_INET_ESP_OFFLOAD is not set
 # CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
 CONFIG_INET_TUNNEL=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
@@ -944,22 +948,6 @@ CONFIG_INET_UDP_DIAG=m
 CONFIG_INET_DIAG_DESTROY=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-# CONFIG_TCP_CONG_WESTWOOD is not set
-# CONFIG_TCP_CONG_HTCP is not set
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_NV is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
-# CONFIG_TCP_CONG_LP is not set
-# CONFIG_TCP_CONG_VENO is not set
-# CONFIG_TCP_CONG_YEAH is not set
-# CONFIG_TCP_CONG_ILLINOIS is not set
-# CONFIG_TCP_CONG_DCTCP is not set
-# CONFIG_TCP_CONG_CDG is not set
-# CONFIG_TCP_CONG_BBR is not set
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
@@ -995,12 +983,14 @@ CONFIG_NET_PTP_CLASSIFY=y
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=m
 
 #
 # Core Netfilter Configuration
 #
 CONFIG_NETFILTER_INGRESS=y
 CONFIG_NETFILTER_NETLINK=y
+CONFIG_NETFILTER_FAMILY_BRIDGE=y
 CONFIG_NETFILTER_FAMILY_ARP=y
 # CONFIG_NETFILTER_NETLINK_ACCT is not set
 CONFIG_NETFILTER_NETLINK_QUEUE=y
@@ -1142,7 +1132,6 @@ CONFIG_NETFILTER_XT_MATCH_U32=y
 # IP: Netfilter Configuration
 #
 CONFIG_NF_DEFRAG_IPV4=y
-CONFIG_NF_CONNTRACK_IPV4=y
 CONFIG_NF_SOCKET_IPV4=y
 CONFIG_NF_TPROXY_IPV4=y
 # CONFIG_NF_DUP_IPV4 is not set
@@ -1179,8 +1168,6 @@ CONFIG_IP_NF_ARP_MANGLE=y
 #
 # IPv6: Netfilter Configuration
 #
-CONFIG_NF_DEFRAG_IPV6=y
-CONFIG_NF_CONNTRACK_IPV6=y
 CONFIG_NF_SOCKET_IPV6=y
 CONFIG_NF_TPROXY_IPV6=y
 # CONFIG_NF_DUP_IPV6 is not set
@@ -1209,7 +1196,9 @@ CONFIG_IP6_NF_RAW=y
 CONFIG_IP6_NF_NAT=y
 CONFIG_IP6_NF_TARGET_MASQUERADE=y
 CONFIG_IP6_NF_TARGET_NPT=y
+CONFIG_NF_DEFRAG_IPV6=y
 # CONFIG_BRIDGE_NF_EBTABLES is not set
+# CONFIG_BPFILTER is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set
@@ -1225,6 +1214,7 @@ CONFIG_HAVE_NET_DSA=y
 # CONFIG_NET_DSA is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set
+CONFIG_LLC=m
 # CONFIG_LLC2 is not set
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
@@ -1259,6 +1249,7 @@ CONFIG_NET_SCH_HTB=y
 # CONFIG_NET_SCH_QFQ is not set
 # CONFIG_NET_SCH_CODEL is not set
 # CONFIG_NET_SCH_FQ_CODEL is not set
+# CONFIG_NET_SCH_CAKE is not set
 # CONFIG_NET_SCH_FQ is not set
 # CONFIG_NET_SCH_HHF is not set
 # CONFIG_NET_SCH_PIE is not set
@@ -1291,7 +1282,6 @@ CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_EMATCH_U32=y
 # CONFIG_NET_EMATCH_META is not set
 # CONFIG_NET_EMATCH_TEXT is not set
-# CONFIG_NET_EMATCH_CANID is not set
 # CONFIG_NET_EMATCH_IPT is not set
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_POLICE=y
@@ -1363,7 +1353,6 @@ CONFIG_BT_DEBUGFS=y
 CONFIG_BT_INTEL=m
 CONFIG_BT_BCM=m
 CONFIG_BT_RTL=m
-CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 # CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set
 CONFIG_BT_HCIBTUSB_BCM=y
@@ -1373,26 +1362,19 @@ CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_3WIRE=y
 CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_QCA=y
 # CONFIG_BT_HCIUART_AG6XX is not set
 # CONFIG_BT_HCIUART_MRVL is not set
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
 CONFIG_BT_HCIVHCI=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
+CONFIG_BT_HCIRSI=m
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AF_KCM is not set
-# CONFIG_STREAM_PARSER is not set
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_EXT=y
@@ -1408,7 +1390,6 @@ CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
 CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
 CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEBUGFS is not set
-# CONFIG_CFG80211_INTERNAL_REGDB is not set
 CONFIG_CFG80211_CRDA_SUPPORT=y
 CONFIG_CFG80211_WEXT=y
 CONFIG_CFG80211_WEXT_EXPORT=y
@@ -1448,6 +1429,7 @@ CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
 # CONFIG_NET_DEVLINK is not set
 CONFIG_MAY_USE_DEVLINK=y
+CONFIG_PAGE_POOL=y
 # CONFIG_FAILOVER is not set
 CONFIG_HAVE_EBPF_JIT=y
 
@@ -1471,7 +1453,9 @@ CONFIG_FW_LOADER=y
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_FW_LOADER_USER_HELPER=y
 CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
+CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
+CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_DRIVER is not set
 CONFIG_DEBUG_DEVRES=y
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
@@ -1481,6 +1465,7 @@ CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
@@ -1528,8 +1513,13 @@ CONFIG_BLK_DEV_RAM_SIZE=16384
 # CONFIG_VIRTIO_BLK is not set
 # CONFIG_BLK_DEV_RBD is not set
 # CONFIG_BLK_DEV_RSXX is not set
+
+#
+# NVME Support
+#
 CONFIG_NVME_CORE=y
 CONFIG_BLK_DEV_NVME=y
+# CONFIG_NVME_MULTIPATH is not set
 # CONFIG_NVME_FC is not set
 # CONFIG_NVME_TARGET is not set
 
@@ -1559,7 +1549,6 @@ CONFIG_BLK_DEV_NVME=y
 # CONFIG_PCI_ENDPOINT_TEST is not set
 CONFIG_UID_SYS_STATS=y
 # CONFIG_UID_SYS_STATS_DEBUG is not set
-# CONFIG_MEMORY_STATE_TIME is not set
 # CONFIG_C2PORT is not set
 
 #
@@ -1583,6 +1572,8 @@ CONFIG_EEPROM_93CX6=m
 CONFIG_INTEL_MEI=y
 CONFIG_INTEL_MEI_ME=y
 CONFIG_INTEL_MEI_TXE=y
+# CONFIG_INTEL_MEI_SPD is not set
+# CONFIG_INTEL_MEI_DAL is not set
 # CONFIG_VMWARE_VMCI is not set
 
 #
@@ -1698,18 +1689,13 @@ CONFIG_SCSI_UFSHCD_PCI=y
 # CONFIG_SCSI_HPTIOP is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 CONFIG_VMWARE_PVSCSI=y
-CONFIG_HYPERV_STORAGE=y
 # CONFIG_SCSI_SNIC is not set
 # CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
 # CONFIG_SCSI_GDTH is not set
 # CONFIG_SCSI_ISCI is not set
 # CONFIG_SCSI_IPS is not set
 # CONFIG_SCSI_INITIO is not set
 # CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_PPA is not set
-# CONFIG_SCSI_IMM is not set
 # CONFIG_SCSI_STEX is not set
 # CONFIG_SCSI_SYM53C8XX_2 is not set
 # CONFIG_SCSI_IPR is not set
@@ -1723,15 +1709,9 @@ CONFIG_HYPERV_STORAGE=y
 # CONFIG_SCSI_PMCRAID is not set
 # CONFIG_SCSI_PM8001 is not set
 CONFIG_SCSI_VIRTIO=y
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
 # CONFIG_SCSI_DH is not set
 # CONFIG_SCSI_OSD_INITIATOR is not set
 CONFIG_ATA=y
-# CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_ATA_ACPI=y
 # CONFIG_SATA_ZPODD is not set
@@ -1743,8 +1723,6 @@ CONFIG_SATA_PMP=y
 CONFIG_SATA_AHCI=y
 CONFIG_SATA_MOBILE_LPM_POLICY=0
 CONFIG_SATA_AHCI_PLATFORM=y
-# CONFIG_AHCI_CEVA is not set
-# CONFIG_AHCI_QORIQ is not set
 # CONFIG_SATA_INIC162X is not set
 # CONFIG_SATA_ACARD_AHCI is not set
 # CONFIG_SATA_SIL24 is not set
@@ -1804,7 +1782,7 @@ CONFIG_PATA_OLDPIIX=y
 CONFIG_PATA_SCH=y
 # CONFIG_PATA_SERVERWORKS is not set
 # CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
+CONFIG_PATA_SIS=y
 # CONFIG_PATA_TOSHIBA is not set
 # CONFIG_PATA_TRIFLEX is not set
 # CONFIG_PATA_VIA is not set
@@ -1872,7 +1850,7 @@ CONFIG_DM_VERITY_FEC=y
 # CONFIG_FIREWIRE_NOSY is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_NETDEVICES=y
-CONFIG_MII=y
+CONFIG_MII=m
 CONFIG_NET_CORE=y
 # CONFIG_BONDING is not set
 # CONFIG_DUMMY is not set
@@ -1920,9 +1898,7 @@ CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_AMD8111_ETH=m
 CONFIG_PCNET32=m
-CONFIG_PCMCIA_NMCLAN=m
 # CONFIG_AMD_XGBE is not set
-# CONFIG_AMD_XGBE_HAVE_ECC is not set
 CONFIG_NET_VENDOR_AQUANTIA=y
 # CONFIG_AQTION is not set
 CONFIG_NET_VENDOR_ARC=y
@@ -1934,10 +1910,6 @@ CONFIG_ATL1C=m
 CONFIG_ALX=m
 CONFIG_NET_VENDOR_AURORA=y
 CONFIG_AURORA_NB8800=m
-CONFIG_NET_CADENCE=y
-CONFIG_MACB=m
-CONFIG_MACB_USE_HWSTAMP=y
-# CONFIG_MACB_PCI is not set
 CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_B44=m
 CONFIG_B44_PCI_AUTOSELECT=y
@@ -1951,13 +1923,19 @@ CONFIG_CNIC=m
 # CONFIG_SYSTEMPORT is not set
 CONFIG_BNXT=m
 CONFIG_BNXT_FLOWER_OFFLOAD=y
+CONFIG_BNXT_HWMON=y
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_BNA=m
+CONFIG_NET_VENDOR_CADENCE=y
+CONFIG_MACB=m
+CONFIG_MACB_USE_HWSTAMP=y
+# CONFIG_MACB_PCI is not set
 CONFIG_NET_VENDOR_CAVIUM=y
 CONFIG_THUNDER_NIC_PF=m
 # CONFIG_THUNDER_NIC_VF is not set
 CONFIG_THUNDER_NIC_BGX=m
 CONFIG_THUNDER_NIC_RGX=m
+CONFIG_CAVIUM_PTP=y
 CONFIG_LIQUIDIO=m
 # CONFIG_LIQUIDIO_VF is not set
 CONFIG_NET_VENDOR_CHELSIO=y
@@ -1968,6 +1946,7 @@ CONFIG_CHELSIO_T4=m
 CONFIG_CHELSIO_T4VF=m
 CONFIG_NET_VENDOR_CISCO=y
 CONFIG_ENIC=m
+CONFIG_NET_VENDOR_CORTINA=y
 CONFIG_CX_ECAT=m
 CONFIG_DNET=m
 CONFIG_NET_VENDOR_DEC=y
@@ -1982,7 +1961,6 @@ CONFIG_DE4X5=m
 CONFIG_WINBOND_840=m
 CONFIG_DM9102=m
 CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_DL2K=m
 CONFIG_SUNDANCE=m
@@ -1990,14 +1968,11 @@ CONFIG_SUNDANCE=m
 CONFIG_NET_VENDOR_EMULEX=y
 CONFIG_BE2NET=m
 CONFIG_BE2NET_HWMON=y
+CONFIG_BE2NET_BE2=y
+CONFIG_BE2NET_BE3=y
+CONFIG_BE2NET_LANCER=y
+CONFIG_BE2NET_SKYHAWK=y
 CONFIG_NET_VENDOR_EZCHIP=y
-# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
-CONFIG_NET_VENDOR_EXAR=y
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_PCMCIA_FMVJ18X=m
 CONFIG_NET_VENDOR_HP=y
 CONFIG_HP100=m
 CONFIG_NET_VENDOR_HUAWEI=y
@@ -2010,17 +1985,15 @@ CONFIG_E1000E=m
 CONFIG_E1000E_HWTS=y
 CONFIG_IGB=m
 CONFIG_IGB_HWMON=y
-CONFIG_IGB_DCA=y
 CONFIG_IGBVF=m
 CONFIG_IXGB=m
 CONFIG_IXGBE=m
 CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBE_DCA=y
 CONFIG_IXGBEVF=m
 CONFIG_I40E=m
 CONFIG_I40EVF=m
+# CONFIG_ICE is not set
 CONFIG_FM10K=m
-CONFIG_NET_VENDOR_I825XX=y
 CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_MVMDIO=m
@@ -2033,9 +2006,12 @@ CONFIG_NET_VENDOR_MELLANOX=y
 CONFIG_MLX4_EN=m
 CONFIG_MLX4_CORE=m
 CONFIG_MLX4_DEBUG=y
+CONFIG_MLX4_CORE_GEN2=y
 CONFIG_MLX5_CORE=m
 # CONFIG_MLX5_FPGA is not set
 CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_EN_ARFS=y
+CONFIG_MLX5_EN_RXNFC=y
 CONFIG_MLX5_MPFS=y
 # CONFIG_MLX5_CORE_IPOIB is not set
 CONFIG_MLXSW_CORE=m
@@ -2054,25 +2030,28 @@ CONFIG_NET_VENDOR_MICROCHIP=y
 CONFIG_ENC28J60=m
 # CONFIG_ENC28J60_WRITEVERIFY is not set
 CONFIG_ENCX24J600=m
+# CONFIG_LAN743X is not set
+CONFIG_NET_VENDOR_MICROSEMI=y
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
 CONFIG_FEALNX=m
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
+CONFIG_NET_VENDOR_NETERION=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
 CONFIG_NET_VENDOR_NETRONOME=y
 # CONFIG_NFP is not set
 CONFIG_NET_VENDOR_NI=y
 CONFIG_NET_VENDOR_8390=y
-CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
-# CONFIG_PCMCIA_PCNET is not set
 CONFIG_NET_VENDOR_NVIDIA=y
 CONFIG_FORCEDETH=m
 CONFIG_NET_VENDOR_OKI=y
 CONFIG_ETHOC=m
-CONFIG_NET_PACKET_ENGINE=y
+CONFIG_NET_VENDOR_PACKET_ENGINES=y
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_NET_VENDOR_QLOGIC=y
@@ -2084,11 +2063,11 @@ CONFIG_NETXEN_NIC=m
 CONFIG_QED=m
 CONFIG_QEDE=m
 CONFIG_NET_VENDOR_QUALCOMM=y
-# CONFIG_QCA7000_SPI is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_RMNET is not set
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
 CONFIG_NET_VENDOR_REALTEK=y
-CONFIG_ATP=m
 CONFIG_8139CP=m
 CONFIG_8139TOO=m
 CONFIG_8139TOO_PIO=y
@@ -2097,53 +2076,31 @@ CONFIG_8139TOO_8129=y
 # CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_R8169=m
 CONFIG_NET_VENDOR_RENESAS=y
-CONFIG_NET_VENDOR_RDC=y
-CONFIG_R6040=m
 CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SAMSUNG=y
 CONFIG_SXGBE_ETH=m
 CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
-CONFIG_SFC_MTD=y
 CONFIG_SFC_MCDI_MON=y
 CONFIG_SFC_MCDI_LOGGING=y
 # CONFIG_SFC_FALCON is not set
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SMSC=y
-# CONFIG_PCMCIA_SMC91C92 is not set
 CONFIG_EPIC100=m
 CONFIG_SMSC911X=m
-# CONFIG_SMSC911X_ARCH_HOOKS is not set
 CONFIG_SMSC9420=m
+CONFIG_NET_VENDOR_SOCIONEXT=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=m
 CONFIG_STMMAC_PLATFORM=m
-# CONFIG_DWMAC_DWC_QOS_ETH is not set
 CONFIG_DWMAC_GENERIC=m
 CONFIG_STMMAC_PCI=m
 # CONFIG_NET_VENDOR_SUN is not set
-# CONFIG_NET_VENDOR_TEHUTI is not set
-CONFIG_NET_VENDOR_TI=y
-# CONFIG_TI_CPSW_ALE is not set
-CONFIG_TLAN=m
-CONFIG_NET_VENDOR_VIA=y
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_NET_VENDOR_WIZNET=y
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_BUS_ANY=y
-# CONFIG_WIZNET_W5100_SPI is not set
-CONFIG_NET_VENDOR_XIRCOM=y
-CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_NET_VENDOR_SYNOPSYS=y
 # CONFIG_DWC_XLGMAC is not set
 # CONFIG_NET_VENDOR_TEHUTI is not set
@@ -2157,12 +2114,9 @@ CONFIG_MDIO_DEVICE=m
 CONFIG_MDIO_BUS=m
 CONFIG_MDIO_BCM_UNIMAC=m
 CONFIG_MDIO_BITBANG=m
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 CONFIG_MDIO_CAVIUM=m
 CONFIG_MDIO_GPIO=m
-# CONFIG_MDIO_HISI_FEMAC is not set
-CONFIG_MDIO_OCTEON=m
+# CONFIG_MDIO_MSCC_MIIM is not set
 CONFIG_MDIO_THUNDER=m
 CONFIG_PHYLIB=m
 CONFIG_SWPHY=y
@@ -2173,6 +2127,7 @@ CONFIG_SWPHY=y
 #
 CONFIG_AMD_PHY=m
 # CONFIG_AQUANTIA_PHY is not set
+# CONFIG_ASIX_PHY is not set
 CONFIG_AT803X_PHY=m
 CONFIG_BCM7XXX_PHY=m
 CONFIG_BCM87XX_PHY=m
@@ -2181,6 +2136,8 @@ CONFIG_BROADCOM_PHY=m
 CONFIG_CICADA_PHY=m
 # CONFIG_CORTINA_PHY is not set
 CONFIG_DAVICOM_PHY=m
+# CONFIG_DP83822_PHY is not set
+# CONFIG_DP83TC811_PHY is not set
 # CONFIG_DP83848_PHY is not set
 # CONFIG_DP83867_PHY is not set
 CONFIG_FIXED_PHY=m
@@ -2192,10 +2149,12 @@ CONFIG_MARVELL_PHY=m
 # CONFIG_MARVELL_10G_PHY is not set
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
+# CONFIG_MICROCHIP_T1_PHY is not set
 # CONFIG_MICROSEMI_PHY is not set
 CONFIG_NATIONAL_PHY=m
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
+# CONFIG_RENESAS_PHY is not set
 # CONFIG_ROCKCHIP_PHY is not set
 CONFIG_SMSC_PHY=m
 CONFIG_STE10XP=m
@@ -2203,7 +2162,6 @@ CONFIG_STE10XP=m
 CONFIG_VITESSE_PHY=m
 # CONFIG_XILINX_GMII2RGMII is not set
 CONFIG_MICREL_KS8995MA=m
-CONFIG_PLIP=m
 CONFIG_PPP=y
 CONFIG_PPP_BSDCOMP=y
 CONFIG_PPP_DEFLATE=y
@@ -2211,14 +2169,11 @@ CONFIG_PPP_FILTER=y
 CONFIG_PPP_MPPE=y
 # CONFIG_PPP_MULTILINK is not set
 CONFIG_PPPOE=y
-CONFIG_PPPOL2TP=y
+CONFIG_PPPOL2TP=m
 # CONFIG_PPP_ASYNC is not set
 # CONFIG_PPP_SYNC_TTY is not set
 # CONFIG_SLIP is not set
 CONFIG_SLHC=y
-# CONFIG_SLIP_COMPRESSED is not set
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
 CONFIG_USB_NET_DRIVERS=y
 CONFIG_USB_CATC=m
 # CONFIG_USB_KAWETH is not set
@@ -2282,7 +2237,6 @@ CONFIG_WLAN_VENDOR_ATH=y
 CONFIG_WLAN_VENDOR_ATMEL=y
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
 CONFIG_AT76C50X_USB=m
 CONFIG_WLAN_VENDOR_BROADCOM=y
 CONFIG_B43=m
@@ -2326,7 +2280,6 @@ CONFIG_BRCMFMAC_PCIE=y
 # CONFIG_BRCMDBG is not set
 CONFIG_WLAN_VENDOR_CISCO=y
 CONFIG_AIRO=m
-CONFIG_AIRO_CS=m
 CONFIG_WLAN_VENDOR_INTEL=y
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
@@ -2353,8 +2306,7 @@ CONFIG_IWLDVM=m
 CONFIG_IWLMVM=m
 CONFIG_IWLWIFI_OPMODE_MODULAR=y
 # CONFIG_IWLWIFI_BCAST_FILTERING is not set
-# CONFI
-G_IWLWIFI_PCIE_RTPM is not set
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
 
 #
 # Debugging Options
@@ -2366,15 +2318,12 @@ CONFIG_HOSTAP=m
 # CONFIG_HOSTAP_FIRMWARE is not set
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
 CONFIG_HERMES=m
 # CONFIG_HERMES_PRISM is not set
 CONFIG_HERMES_CACHE_FW_ON_INIT=y
 CONFIG_PLX_HERMES=m
 CONFIG_TMD_HERMES=m
 CONFIG_NORTEL_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_ORINOCO_USB=m
 CONFIG_P54_COMMON=m
 CONFIG_P54_USB=m
@@ -2386,7 +2335,6 @@ CONFIG_PRISM54=m
 CONFIG_WLAN_VENDOR_MARVELL=y
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
 CONFIG_LIBERTAS_SDIO=m
 CONFIG_LIBERTAS_SPI=m
 # CONFIG_LIBERTAS_DEBUG is not set
@@ -2401,6 +2349,9 @@ CONFIG_MWIFIEX_USB=m
 CONFIG_MWL8K=m
 CONFIG_WLAN_VENDOR_MEDIATEK=y
 CONFIG_MT7601U=m
+# CONFIG_MT76x0U is not set
+# CONFIG_MT76x2E is not set
+# CONFIG_MT76x2U is not set
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -2458,6 +2409,7 @@ CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
 CONFIG_RSI_SDIO=m
 CONFIG_RSI_USB=m
+CONFIG_RSI_COEX=y
 CONFIG_WLAN_VENDOR_ST=y
 CONFIG_CW1200=m
 CONFIG_CW1200_WLAN_SDIO=m
@@ -2469,7 +2421,6 @@ CONFIG_WL1251_SDIO=m
 CONFIG_WL12XX=m
 CONFIG_WL18XX=m
 CONFIG_WLCORE=m
-CONFIG_WLCORE_SPI=m
 CONFIG_WLCORE_SDIO=m
 CONFIG_WILINK_PLATFORM_DATA=y
 CONFIG_WLAN_VENDOR_ZYDAS=y
@@ -2478,8 +2429,6 @@ CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_WLAN_VENDOR_QUANTENNA=y
 # CONFIG_QTNFMAC_PEARL_PCIE is not set
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_PCMCIA_WL3501=m
 CONFIG_MAC80211_HWSIM=m
 # CONFIG_USB_NET_RNDIS_WLAN is not set
 
@@ -2492,7 +2441,8 @@ CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 # CONFIG_WAN is not set
 CONFIG_VMXNET3=m
 # CONFIG_FUJITSU_ES is not set
-CONFIG_HYPERV_NET=m
+# CONFIG_NETDEVSIM is not set
+# CONFIG_NET_FAILOVER is not set
 # CONFIG_ISDN is not set
 # CONFIG_NVM is not set
 
@@ -2516,8 +2466,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
-CONFIG_INPUT_KEYRESET=y
-CONFIG_INPUT_KEYCOMBO=y
 
 #
 # Input Device Drivers
@@ -2546,12 +2494,8 @@ CONFIG_KEYBOARD_MATRIX=m
 # CONFIG_KEYBOARD_SAMSUNG is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_OMAP4 is not set
 # CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
 CONFIG_KEYBOARD_XTKBD=m
-# CONFIG_KEYBOARD_CROS_EC is not set
-# CONFIG_KEYBOARD_CAP11XX is not set
-# CONFIG_KEYBOARD_BCM is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=m
 CONFIG_MOUSE_PS2_ALPS=y
@@ -2563,6 +2507,7 @@ CONFIG_MOUSE_PS2_CYPRESS=y
 CONFIG_MOUSE_PS2_LIFEBOOK=y
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
 CONFIG_MOUSE_PS2_SENTELIC=y
 CONFIG_MOUSE_PS2_TOUCHKIT=y
 CONFIG_MOUSE_PS2_FOCALTECH=y
@@ -2601,15 +2546,11 @@ CONFIG_JOYSTICK_SPACEBALL=m
 CONFIG_JOYSTICK_STINGER=m
 CONFIG_JOYSTICK_TWIDJOY=m
 CONFIG_JOYSTICK_ZHENHUA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
 CONFIG_JOYSTICK_AS5011=m
 CONFIG_JOYSTICK_JOYDUMP=m
 CONFIG_JOYSTICK_XPAD=m
 CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_WALKERA0701=m
 # CONFIG_JOYSTICK_PSXPAD_SPI is not set
 # CONFIG_JOYSTICK_PXRC is not set
 CONFIG_INPUT_TABLET=y
@@ -2627,12 +2568,13 @@ CONFIG_TOUCHSCREEN_AD7877=m
 CONFIG_TOUCHSCREEN_AD7879=m
 CONFIG_TOUCHSCREEN_AD7879_I2C=m
 CONFIG_TOUCHSCREEN_AD7879_SPI=m
-# CONFIG_TOUCHSCREEN_AR1021_I2C is not set
+# CONFIG_TOUCHSCREEN_ADC is not set
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 # CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
 CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
 CONFIG_TOUCHSCREEN_BU21013=m
-CONFIG_TOUCHSCREEN_CHIPONE_ICN8318=m
+# CONFIG_TOUCHSCREEN_BU21029 is not set
+# CONFIG_TOUCHSCREEN_CHIPONE_ICN8505 is not set
 CONFIG_TOUCHSCREEN_CY8CTMG110=m
 CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
 CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
@@ -2643,11 +2585,13 @@ CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
 CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_EGALAX=m
 # CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
+# CONFIG_TOUCHSCREEN_EXC3000 is not set
 CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GOODIX=m
+# CONFIG_TOUCHSCREEN_HIDEEP is not set
 CONFIG_TOUCHSCREEN_ILI210X=m
+# CONFIG_TOUCHSCREEN_S6SY761 is not set
 CONFIG_TOUCHSCREEN_GUNZE=m
 # CONFIG_TOUCHSCREEN_EKTF2127 is not set
 CONFIG_TOUCHSCREEN_ELAN=m
@@ -2659,14 +2603,12 @@ CONFIG_TOUCHSCREEN_MCS5000=m
 CONFIG_TOUCHSCREEN_MMS114=m
 # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
 CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_IMX6UL_TSC=m
 CONFIG_TOUCHSCREEN_INEXIO=m
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
 CONFIG_TOUCHSCREEN_EDT_FT5X06=m
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_UCB1400=m
 CONFIG_TOUCHSCREEN_PIXCIR=m
 CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
 CONFIG_TOUCHSCREEN_WM97XX=m
@@ -2712,12 +2654,10 @@ CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TOUCHSCREEN_ROHM_BU21023=m
 CONFIG_INPUT_MISC=y
-CONFIG_INPUT_88PM80X_ONKEY=m
 CONFIG_INPUT_AD714X=m
 CONFIG_INPUT_AD714X_I2C=m
 CONFIG_INPUT_AD714X_SPI=m
 # CONFIG_INPUT_ARIZONA_HAPTICS is not set
-# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
 CONFIG_INPUT_BMA150=m
 # CONFIG_INPUT_E3X0_BUTTON is not set
 CONFIG_INPUT_PCSPKR=m
@@ -2728,7 +2668,6 @@ CONFIG_INPUT_GP2A=m
 # CONFIG_INPUT_GPIO_DECODER is not set
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYCHORD=y
 CONFIG_INPUT_KEYSPAN_REMOTE=m
 CONFIG_INPUT_KXTJ9=m
 # CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
@@ -2736,7 +2675,6 @@ CONFIG_INPUT_POWERMATE=m
 CONFIG_INPUT_YEALINK=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_REGULATOR_HAPTIC=m
-CONFIG_INPUT_TPS65218_PWRBUTTON=m
 CONFIG_INPUT_UINPUT=y
 # CONFIG_INPUT_GPIO is not set
 # CONFIG_INPUT_PCF8574 is not set
@@ -2748,7 +2686,8 @@ CONFIG_INPUT_ADXL34X_I2C=m
 CONFIG_INPUT_ADXL34X_SPI=m
 # CONFIG_INPUT_IMS_PCU is not set
 # CONFIG_INPUT_CMA3000 is not set
-CONFIG_INPUT_SOC_BUTTON_ARRAY=y
+# CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set
+CONFIG_INPUT_SOC_BUTTON_ARRAY=m
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
@@ -2762,15 +2701,12 @@ CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_SERPORT=y
 CONFIG_SERIO_CT82C710=m
-CONFIG_SERIO_PARKBD=m
 CONFIG_SERIO_PCIPS2=y
 CONFIG_SERIO_LIBPS2=y
 CONFIG_SERIO_RAW=y
 CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_ARC_PS2=m
-# CONFIG_SERIO_APBPS2 is not set
-CONFIG_HYPERV_KEYBOARD=y
 # CONFIG_SERIO_GPIO_PS2 is not set
 # CONFIG_USERIO is not set
 CONFIG_GAMEPORT=m
@@ -2821,22 +2757,18 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_DMA=y
 CONFIG_SERIAL_8250_PCI=m
 CONFIG_SERIAL_8250_EXAR=m
-# CONFIG_SERIAL_8250_CS is not set
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
-# CONFIG_SERIAL_8250_ASPEED_VUART is not set
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 CONFIG_SERIAL_8250_DETECT_IRQ=y
 CONFIG_SERIAL_8250_RSA=y
-# CONFIG_SERIAL_8250_FSL is not set
 CONFIG_SERIAL_8250_DW=y
 # CONFIG_SERIAL_8250_RT288X is not set
 CONFIG_SERIAL_8250_LPSS=y
 # CONFIG_SERIAL_8250_MID is not set
 # CONFIG_SERIAL_8250_MOXA is not set
-# CONFIG_SERIAL_OF_PLATFORM is not set
 
 #
 # Non-8250 serial port support
@@ -2868,15 +2800,6 @@ CONFIG_HW_RANDOM_INTEL=y
 CONFIG_NVRAM=y
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
-
-#
-# PCMCIA character devices
-#
-# CONFIG_SYNCLINK_CS is not set
-# CONFIG_CARDMAN_4000 is not set
-# CONFIG_CARDMAN_4040 is not set
-# CONFIG_SCR24X is not set
-# CONFIG_IPWIRELESS is not set
 # CONFIG_MWAVE is not set
 CONFIG_RAW_DRIVER=m
 CONFIG_MAX_RAW_DEVS=4096
@@ -2891,6 +2814,8 @@ CONFIG_RPMB=y
 # CONFIG_RPMB_INTF_DEV is not set
 # CONFIG_RPMB_SIM is not set
 # CONFIG_VIRTIO_RPMB is not set
+# CONFIG_RPMB_MUX is not set
+# CONFIG_RANDOM_TRUST_CPU is not set
 
 #
 # I2C support
@@ -3422,9 +3347,20 @@ CONFIG_ITCO_WDT=y
 #
 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
 CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB is not set
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+# CONFIG_SSB_DRIVER_GPIO is not set
 CONFIG_BCMA_POSSIBLE=y
 CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
 CONFIG_BCMA_HOST_PCI_POSSIBLE=y
 CONFIG_BCMA_HOST_PCI=y
 # CONFIG_BCMA_HOST_SOC is not set
@@ -3485,6 +3421,7 @@ CONFIG_MFD_INTEL_LPSS_PCI=y
 # CONFIG_MFD_VIPERBOARD is not set
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_PCF50633 is not set
+# CONFIG_UCB1400_CORE is not set
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_RT5033 is not set
 # CONFIG_MFD_RC5T583 is not set
@@ -3494,7 +3431,7 @@ CONFIG_MFD_INTEL_LPSS_PCI=y
 # CONFIG_MFD_SKY81452 is not set
 # CONFIG_MFD_SMSC is not set
 # CONFIG_ABX500_CORE is not set
-# CONFIG_MFD_SYSCON is not set
+CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_LP3943 is not set
 # CONFIG_MFD_LP8788 is not set
@@ -3538,6 +3475,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_88PG86X is not set
 # CONFIG_REGULATOR_ACT8865 is not set
 # CONFIG_REGULATOR_AD5398 is not set
+# CONFIG_REGULATOR_ANATOP is not set
 # CONFIG_REGULATOR_ARIZONA_LDO1 is not set
 # CONFIG_REGULATOR_ARIZONA_MICSUPP is not set
 # CONFIG_REGULATOR_DA9210 is not set
@@ -3600,25 +3538,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_VIDEO_V4L2=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_PCI_SKELETON is not set
-CONFIG_VIDEO_TUNER=m
 CONFIG_V4L2_FWNODE=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF2_DMA_SG=m
-CONFIG_VIDEOBUF2_DVB=m
-CONFIG_DVB_CORE=y
-CONFIG_DVB_NET=y
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
 
 #
 # Media drivers
@@ -3638,79 +3558,6 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 # CONFIG_USB_S2255 is not set
 # CONFIG_VIDEO_USBTV is not set
 
-#
-# Analog TV USB devices
-#
-# CONFIG_VIDEO_PVRUSB2 is not set
-# CONFIG_VIDEO_HDPVR is not set
-# CONFIG_VIDEO_USBVISION is not set
-# CONFIG_VIDEO_STK1160_COMMON is not set
-# CONFIG_VIDEO_GO7007 is not set
-
-#
-# Analog/digital TV USB devices
-#
-# CONFIG_VIDEO_AU0828 is not set
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-
-#
-# Digital TV USB devices
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_DIB3000MC=m
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-# CONFIG_DVB_USB_DVBSKY is not set
-# CONFIG_DVB_USB_ZD1301 is not set
-# CONFIG_DVB_TTUSB_BUDGET is not set
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_USB_DRV=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
-CONFIG_DVB_AS102=m
-
 #
 # Webcam, TV (analog/digital) USB devices
 #
@@ -3724,11 +3571,24 @@ CONFIG_MEDIA_PCI_SUPPORT=y
 # CONFIG_VIDEO_TW5864 is not set
 # CONFIG_VIDEO_TW68 is not set
 # CONFIG_VIDEO_TW686X is not set
+# CONFIG_VIDEO_INTEL_IPU is not set
+# CONFIG_VIDEO_INTEL_IPU_FW_LIB is not set
+# CONFIG_VIDEO_INTEL_UOS is not set
+# CONFIG_VIDEO_INTEL_IPU_ACRN is not set
 # CONFIG_VIDEO_IPU3_CIO2 is not set
 CONFIG_V4L_PLATFORM_DRIVERS=y
 # CONFIG_VIDEO_CAFE_CCIC is not set
 # CONFIG_VIDEO_CADENCE is not set
 # CONFIG_SOC_CAMERA is not set
+# CONFIG_INTEL_IPU4_AR023Z is not set
+# CONFIG_INTEL_IPU4_OV13860 is not set
+# CONFIG_INTEL_IPU4_OV9281 is not set
+# CONFIG_INTEL_IPU4_OV10635 is not set
+# CONFIG_INTEL_IPU4_AR0231AT is not set
+# CONFIG_INTEL_IPU4_OV10640 is not set
+# CONFIG_INTEL_IPU4_ADV7481 is not set
+# CONFIG_INTEL_IPU4_ADV7481_EVAL is not set
+CONFIG_INTEL_IPU4_ADV7481_I2C_ID=0
 # CONFIG_V4L_MEM2MEM_DRIVERS is not set
 # CONFIG_V4L_TEST_DRIVERS is not set
 
@@ -3755,10 +3615,10 @@ CONFIG_RADIO_ADAPTERS=y
 # Texas Instruments WL128x FM driver (ST based)
 #
 # CONFIG_CYPRESS_FIRMWARE is not set
-CONFIG_VIDEOBUF2_CORE=y
-CONFIG_VIDEOBUF2_V4L2=y
-CONFIG_VIDEOBUF2_MEMOPS=y
-CONFIG_VIDEOBUF2_VMALLOC=y
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_V4L2=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_VMALLOC=m
 CONFIG_VIDEOBUF2_DMA_SG=m
 
 #
@@ -3802,7 +3662,6 @@ CONFIG_VIDEO_CS5345=m
 #
 CONFIG_VIDEO_ADV7180=m
 CONFIG_VIDEO_ADV7183=m
-# CONFIG_VIDEO_ADV748X is not set
 CONFIG_VIDEO_ADV7604=m
 # CONFIG_VIDEO_ADV7604_CEC is not set
 # CONFIG_VIDEO_ADV7842 is not set
@@ -3814,6 +3673,7 @@ CONFIG_VIDEO_KS0127=m
 # CONFIG_VIDEO_AD5820 is not set
 # CONFIG_VIDEO_AK7375 is not set
 # CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9807_VCM is not set
 CONFIG_VIDEO_SAA7110=m
 CONFIG_VIDEO_SAA711X=m
 # CONFIG_VIDEO_TC358743 is not set
@@ -3823,6 +3683,7 @@ CONFIG_VIDEO_TVP7002=m
 # CONFIG_VIDEO_TW2804 is not set
 # CONFIG_VIDEO_TW9903 is not set
 # CONFIG_VIDEO_TW9906 is not set
+# CONFIG_VIDEO_TW9910 is not set
 CONFIG_VIDEO_VPX3220=m
 
 #
@@ -3848,7 +3709,6 @@ CONFIG_VIDEO_AK881X=m
 #
 # Camera sensor devices
 #
-CONFIG_VIDEO_SMIAPP_PLL=m
 # CONFIG_VIDEO_IMX258 is not set
 # CONFIG_VIDEO_IMX274 is not set
 # CONFIG_VIDEO_OV2640 is not set
@@ -3886,14 +3746,12 @@ CONFIG_VIDEO_S5K4ECGX=m
 # CONFIG_VIDEO_SMIAPP is not set
 # CONFIG_VIDEO_ET8EK8 is not set
 # CONFIG_VIDEO_CRLMODULE is not set
-# CONFIG_VIDEO_LC898122 is not set
 # CONFIG_VIDEO_S5C73M3 is not set
 
 #
 # Flash devices
 #
 # CONFIG_VIDEO_ADP1653 is not set
-# CONFIG_VIDEO_AS3645A is not set
 # CONFIG_VIDEO_LM3560 is not set
 # CONFIG_VIDEO_LM3646 is not set
 
@@ -3918,6 +3776,9 @@ CONFIG_VIDEO_S5K4ECGX=m
 # CONFIG_VIDEO_THS7303 is not set
 # CONFIG_VIDEO_M52790 is not set
 # CONFIG_VIDEO_I2C is not set
+# CONFIG_VIDEO_TI964 is not set
+# CONFIG_VIDEO_MAX9286 is not set
+# CONFIG_VIDEO_TI960 is not set
 
 #
 # Sensors used on soc_camera driver
@@ -4029,6 +3890,7 @@ CONFIG_DRM_I915=y
 # CONFIG_DRM_I915_ALPHA_SUPPORT is not set
 CONFIG_DRM_I915_CAPTURE_ERROR=y
 CONFIG_DRM_I915_COMPRESS_ERROR=y
+CONFIG_DRM_I915_MEMTRACK=y
 CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_I915_GVT is not set
 
@@ -4187,7 +4049,7 @@ CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SND=y
 CONFIG_SND_TIMER=y
 CONFIG_SND_PCM=y
-CONFIG_SND_HWDEP=m
+CONFIG_SND_HWDEP=y
 CONFIG_SND_SEQ_DEVICE=y
 CONFIG_SND_RAWMIDI=y
 CONFIG_SND_JACK=y
@@ -4205,6 +4067,7 @@ CONFIG_SND_PROC_FS=y
 CONFIG_SND_VERBOSE_PROCFS=y
 CONFIG_SND_VERBOSE_PRINTK=y
 # CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
 CONFIG_SND_DMA_SGBUF=y
 CONFIG_SND_SEQUENCER=m
 # CONFIG_SND_SEQ_DUMMY is not set
@@ -4212,6 +4075,7 @@ CONFIG_SND_SEQUENCER=m
 CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
 CONFIG_SND_SEQ_MIDI_EVENT=m
 CONFIG_SND_SEQ_MIDI=m
+CONFIG_SND_AC97_CODEC=m
 CONFIG_SND_DRIVERS=y
 # CONFIG_SND_PCSP is not set
 CONFIG_SND_DUMMY=m
@@ -4220,6 +4084,7 @@ CONFIG_SND_DUMMY=m
 # CONFIG_SND_MTPAV is not set
 # CONFIG_SND_SERIAL_U16550 is not set
 # CONFIG_SND_MPU401 is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
 CONFIG_SND_PCI=y
 # CONFIG_SND_AD1889 is not set
 # CONFIG_SND_ALS300 is not set
@@ -4312,8 +4177,8 @@ CONFIG_SND_HDA_GENERIC=y
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=3
 CONFIG_SND_HDA_CORE=y
 CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_COMPONENT=y
 CONFIG_SND_HDA_I915=y
-CONFIG_SND_HDA_EXT_CORE=m
 CONFIG_SND_HDA_PREALLOC_SIZE=64
 # CONFIG_SND_SPI is not set
 CONFIG_SND_USB=y
@@ -4331,6 +4196,7 @@ CONFIG_SND_USB_HIFACE=m
 # CONFIG_SND_USB_TONEPORT is not set
 # CONFIG_SND_USB_VARIAX is not set
 CONFIG_SND_SOC=y
+CONFIG_SND_SOC_AC97_BUS=y
 # CONFIG_SND_SOC_AMD_ACP is not set
 # CONFIG_SND_ATMEL_SOC is not set
 # CONFIG_SND_DESIGNWARE_I2S is not set
@@ -4382,6 +4248,7 @@ CONFIG_SND_SOC_ADAU1701=m
 # CONFIG_SND_SOC_CS35L34 is not set
 # CONFIG_SND_SOC_CS35L35 is not set
 # CONFIG_SND_SOC_CS42L42 is not set
+# CONFIG_SND_SOC_SVFPGA_I2C is not set
 # CONFIG_SND_SOC_CS42L51_I2C is not set
 # CONFIG_SND_SOC_CS42L52 is not set
 # CONFIG_SND_SOC_CS42L56 is not set
@@ -4420,6 +4287,8 @@ CONFIG_SND_SOC_ADAU1701=m
 # CONFIG_SND_SOC_RT5616 is not set
 # CONFIG_SND_SOC_RT5631 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
+CONFIG_SND_SOC_SIGMADSP=m
+CONFIG_SND_SOC_SIGMADSP_I2C=m
 # CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 # CONFIG_SND_SOC_SPDIF is not set
@@ -4478,6 +4347,7 @@ CONFIG_SND_SOC_ADAU1701=m
 # CONFIG_SND_SIMPLE_CARD is not set
 CONFIG_SND_X86=y
 # CONFIG_HDMI_LPE_AUDIO is not set
+CONFIG_AC97_BUS=y
 
 #
 # HID support
@@ -4640,7 +4510,6 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y
 CONFIG_USB_UHCI_HCD=y
 CONFIG_USB_SL811_HCD=y
 CONFIG_USB_SL811_HCD_ISO=y
-# CONFIG_USB_SL811_CS is not set
 # CONFIG_USB_R8A66597_HCD is not set
 CONFIG_USB_HCD_BCMA=m
 # CONFIG_USB_HCD_SSB is not set
@@ -4701,7 +4570,7 @@ CONFIG_USB_DWC3_GADGET=y
 # Platform Glue Driver Support
 #
 CONFIG_USB_DWC3_PCI=y
-CONFIG_USB_DWC3_OF_SIMPLE=m
+CONFIG_USB_DWC3_HAPS=y
 CONFIG_USB_DWC2=y
 # CONFIG_USB_DWC2_HOST is not set
 
@@ -4719,7 +4588,6 @@ CONFIG_USB_DWC2_PCI=y
 #
 # USB port drivers
 #
-# CONFIG_USB_USS720 is not set
 CONFIG_USB_SERIAL=m
 # CONFIG_USB_SERIAL_GENERIC is not set
 # CONFIG_USB_SERIAL_SIMPLE is not set
@@ -4750,7 +4618,6 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
 CONFIG_USB_SERIAL_METRO=m
 CONFIG_USB_SERIAL_MOS7720=m
-# CONFIG_USB_SERIAL_MOS7715_PARPORT is not set
 CONFIG_USB_SERIAL_MOS7840=m
 # CONFIG_USB_SERIAL_MXUPORT is not set
 CONFIG_USB_SERIAL_NAVMAN=m
@@ -4811,19 +4678,15 @@ CONFIG_USB_EZUSB_FX2=m
 # USB Physical Layer drivers
 #
 CONFIG_USB_PHY=y
-CONFIG_USB_OTG_WAKELOCK=y
 CONFIG_NOP_USB_XCEIV=y
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_ISP1301 is not set
-CONFIG_USB_INTEL_DUAL_ROLE_PHY=y
-# CONFIG_DUAL_ROLE_USB_INTF is not set
 CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
 CONFIG_USB_GADGET_DEBUG_FILES=y
 CONFIG_USB_GADGET_DEBUG_FS=y
 CONFIG_USB_GADGET_VBUS_DRAW=500
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-# CONFIG_U_SERIAL_CONSOLE is not set
 
 #
 # USB Peripheral Controller
@@ -4834,7 +4697,6 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_PXA27X is not set
 # CONFIG_USB_MV_UDC is not set
 # CONFIG_USB_MV_U3D is not set
-# CONFIG_USB_SNP_UDC_PLAT is not set
 # CONFIG_USB_M66592 is not set
 # CONFIG_USB_BDC_UDC is not set
 # CONFIG_USB_AMD5536UDC is not set
@@ -4842,19 +4704,13 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_NET2280 is not set
 # CONFIG_USB_GOKU is not set
 # CONFIG_USB_EG20T is not set
-# CONFIG_USB_GADGET_XILINX is not set
 # CONFIG_USB_DUMMY_HCD is not set
 CONFIG_USB_LIBCOMPOSITE=y
-CONFIG_USB_U_SERIAL=y
 CONFIG_USB_U_ETHER=y
-CONFIG_USB_F_SERIAL=y
 CONFIG_USB_F_RNDIS=y
-CONFIG_USB_F_MASS_STORAGE=y
 CONFIG_USB_F_FS=y
 CONFIG_USB_F_UVC=m
 CONFIG_USB_F_MIDI=y
-CONFIG_USB_F_MTP=y
-CONFIG_USB_F_PTP=y
 CONFIG_USB_F_AUDIO_SRC=y
 CONFIG_USB_F_ACC=y
 CONFIG_USB_CONFIGFS=y
@@ -4870,8 +4726,6 @@ CONFIG_USB_CONFIGFS_RNDIS=y
 # CONFIG_USB_CONFIGFS_MASS_STORAGE is not set
 # CONFIG_USB_CONFIGFS_F_LB_SS is not set
 CONFIG_USB_CONFIGFS_F_FS=y
-CONFIG_USB_CONFIGFS_F_MTP=y
-CONFIG_USB_CONFIGFS_F_PTP=y
 CONFIG_USB_CONFIGFS_F_ACC=y
 CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
 CONFIG_USB_CONFIGFS_UEVENT=y
@@ -4899,29 +4753,35 @@ CONFIG_USB_CONFIGFS_F_MIDI=y
 # CONFIG_USB_G_HID is not set
 # CONFIG_USB_G_DBGP is not set
 CONFIG_USB_G_WEBCAM=m
-
-#
-# USB Power Delivery and Type-C drivers
-#
 CONFIG_TYPEC=y
+CONFIG_TYPEC_TCPM=y
+# CONFIG_TYPEC_TCPCI is not set
+# CONFIG_TYPEC_RT1711H is not set
+# CONFIG_TYPEC_FUSB302 is not set
 CONFIG_TYPEC_WCOVE=y
 CONFIG_TYPEC_UCSI=y
 # CONFIG_UCSI_ACPI is not set
+# CONFIG_TYPEC_TPS6598X is not set
+
+#
+# USB Type-C Multiplexer/DeMultiplexer Switch support
+#
+# CONFIG_TYPEC_MUX_PI3USB30532 is not set
+
+#
+# USB Type-C Alternate Mode drivers
+#
+# CONFIG_TYPEC_DP_ALTMODE is not set
+CONFIG_USB_ROLES_INTEL_XHCI=y
 # CONFIG_USB_LED_TRIG is not set
 # CONFIG_USB_ULPI_BUS is not set
 CONFIG_USB_ROLE_SWITCH=y
-CONFIG_USB_ROLES_INTEL_XHCI=y
 # CONFIG_UWB is not set
 CONFIG_MMC=y
-CONFIG_PWRSEQ_EMMC=y
-# CONFIG_PWRSEQ_SD8787 is not set
-CONFIG_PWRSEQ_SIMPLE=y
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_SDIO_UART=m
 # CONFIG_MMC_TEST is not set
-# CONFIG_MMC_EMBEDDED_SDIO is not set
-# CONFIG_MMC_PARANOID_SD_INIT is not set
 
 #
 # MMC/SD/SDIO Host Controller Drivers
@@ -4963,6 +4823,7 @@ CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_LP5523 is not set
 # CONFIG_LEDS_LP5562 is not set
 # CONFIG_LEDS_LP8501 is not set
+# CONFIG_LEDS_CLEVO_MAIL is not set
 # CONFIG_LEDS_PCA955X is not set
 # CONFIG_LEDS_PCA963X is not set
 # CONFIG_LEDS_DAC124S085 is not set
@@ -5017,7 +4878,8 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
-#CONFIG_RTC_DEBUG=y
+# CONFIG_RTC_DEBUG is not set
+CONFIG_RTC_NVMEM=y
 
 #
 # RTC interfaces
@@ -5128,7 +4990,6 @@ CONFIG_INTEL_IDMA64=y
 CONFIG_DW_DMAC_CORE=y
 CONFIG_DW_DMAC=y
 CONFIG_DW_DMAC_PCI=y
-CONFIG_HSU_DMA=y
 
 #
 # DMA Clients
@@ -5141,8 +5002,20 @@ CONFIG_HSU_DMA=y
 #
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
+CONFIG_HYPER_DMABUF=y
+CONFIG_HYPER_DMABUF_SYSFS=y
+# CONFIG_HYPER_DMABUF_EVENT_GEN is not set
 # CONFIG_AUXDISPLAY is not set
-# CONFIG_UIO is not set
+CONFIG_UIO=m
+# CONFIG_UIO_CIF is not set
+# CONFIG_UIO_PDRV_GENIRQ is not set
+# CONFIG_UIO_DMEM_GENIRQ is not set
+# CONFIG_UIO_AEC is not set
+# CONFIG_UIO_SERCOS3 is not set
+# CONFIG_UIO_PCI_GENERIC is not set
+# CONFIG_UIO_NETX is not set
+# CONFIG_UIO_PRUSS is not set
+# CONFIG_UIO_MF624 is not set
 # CONFIG_VFIO is not set
 CONFIG_VIRT_DRIVERS=y
 # CONFIG_VBOXGUEST is not set
@@ -5264,30 +5137,42 @@ CONFIG_LTE_GDM724X=m
 #
 # Gasket devices
 #
-# CONFIG_TYPEC_TCPM is not set
-# CONFIG_DRM_VBOXVIDEO is not set
-# CONFIG_PI433 is not set
+# CONFIG_STAGING_GASKET_FRAMEWORK is not set
+# CONFIG_XIL_AXIS_FIFO is not set
+# CONFIG_EROFS_FS is not set
 CONFIG_X86_PLATFORM_DEVICES=y
+# CONFIG_ACER_WMI is not set
 # CONFIG_ACER_WIRELESS is not set
 # CONFIG_ACERHDF is not set
+# CONFIG_ALIENWARE_WMI is not set
 # CONFIG_ASUS_LAPTOP is not set
 # CONFIG_DELL_SMBIOS is not set
+# CONFIG_DELL_WMI_AIO is not set
+# CONFIG_DELL_WMI_LED is not set
 # CONFIG_DELL_SMO8800 is not set
 # CONFIG_DELL_RBTN is not set
 # CONFIG_FUJITSU_LAPTOP is not set
 # CONFIG_FUJITSU_TABLET is not set
+# CONFIG_AMILO_RFKILL is not set
 # CONFIG_GPD_POCKET_FAN is not set
+# CONFIG_HP_ACCEL is not set
 # CONFIG_HP_WIRELESS is not set
+# CONFIG_HP_WMI is not set
+# CONFIG_MSI_LAPTOP is not set
 # CONFIG_PANASONIC_LAPTOP is not set
 # CONFIG_COMPAL_LAPTOP is not set
 # CONFIG_SONY_LAPTOP is not set
+# CONFIG_IDEAPAD_LAPTOP is not set
+# CONFIG_SURFACE3_WMI is not set
 # CONFIG_THINKPAD_ACPI is not set
 # CONFIG_SENSORS_HDAPS is not set
 # CONFIG_INTEL_MENLOW is not set
 # CONFIG_EEEPC_LAPTOP is not set
+# CONFIG_ASUS_WMI is not set
 # CONFIG_ASUS_WIRELESS is not set
 CONFIG_ACPI_WMI=m
 CONFIG_WMI_BMOF=m
+# CONFIG_INTEL_WMI_THUNDERBOLT is not set
 CONFIG_MSI_WMI=m
 # CONFIG_PEAQ_WMI is not set
 CONFIG_TOPSTAR_LAPTOP=m
@@ -5296,7 +5181,6 @@ CONFIG_TOSHIBA_BT_RFKILL=m
 CONFIG_TOSHIBA_HAPS=m
 CONFIG_TOSHIBA_WMI=m
 CONFIG_ACPI_CMPC=m
-# CONFIG_INTEL_CHT_INT33FE is not set
 # CONFIG_INTEL_INT0002_VGPIO is not set
 # CONFIG_INTEL_HID_EVENT is not set
 # CONFIG_INTEL_VBTN is not set
@@ -5319,6 +5203,7 @@ CONFIG_INTEL_PUNIT_IPC=y
 CONFIG_INTEL_TELEMETRY=y
 # CONFIG_MLX_PLATFORM is not set
 # CONFIG_INTEL_TURBO_MAX_3 is not set
+# CONFIG_TOUCHSCREEN_DMI is not set
 # CONFIG_I2C_MULTI_INSTANTIATE is not set
 # CONFIG_INTEL_PSTORE_PRAM is not set
 CONFIG_PMC_ATOM=y
@@ -5452,8 +5337,6 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 #
 # CONFIG_ADIS16201 is not set
 # CONFIG_ADIS16209 is not set
-# CONFIG_ADXL345_I2C is not set
-# CONFIG_ADXL345_SPI is not set
 CONFIG_BMA180=m
 # CONFIG_BMA220 is not set
 CONFIG_BMC150_ACCEL=y
@@ -5818,7 +5701,8 @@ CONFIG_PWM_LPSS_PCI=y
 #
 CONFIG_ARM_GIC_MAX_NR=1
 # CONFIG_IPACK_BUS is not set
-# CONFIG_RESET_CONTROLLER is not set
+CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_TI_SYSCON is not set
 # CONFIG_FMC is not set
 
 #
@@ -5829,10 +5713,7 @@ CONFIG_GENERIC_PHY=y
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_CPCAP_USB is not set
-# CONFIG_PHY_QCOM_USB_HS is not set
-# CONFIG_PHY_QCOM_USB_HSIC is not set
 # CONFIG_PHY_SAMSUNG_USB2 is not set
-# CONFIG_PHY_TUSB1210 is not set
 CONFIG_POWERCAP=y
 CONFIG_INTEL_RAPL=y
 # CONFIG_IDLE_INJECT is not set
@@ -5860,6 +5741,8 @@ CONFIG_NVMEM=y
 # HW tracing support
 #
 CONFIG_STM=y
+# CONFIG_STM_PROTO_BASIC is not set
+# CONFIG_STM_PROTO_SYS_T is not set
 # CONFIG_STM_DUMMY is not set
 CONFIG_STM_SOURCE_CONSOLE=y
 # CONFIG_STM_SOURCE_HEARTBEAT is not set
@@ -5867,9 +5750,11 @@ CONFIG_STM_SOURCE_CONSOLE=y
 # CONFIG_INTEL_TH is not set
 # CONFIG_FPGA is not set
 CONFIG_PM_OPP=y
+# CONFIG_SDW is not set
 # CONFIG_UNISYS_VISORBUS is not set
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
+# CONFIG_LEGACY_ENERGY_MODEL_DT is not set
 
 #
 # File systems
@@ -5895,12 +5780,15 @@ CONFIG_FS_MBCACHE=y
 # CONFIG_OCFS2_FS is not set
 # CONFIG_BTRFS_FS is not set
 # CONFIG_NILFS2_FS is not set
-# CONFIG_F2FS_FS is not set
 CONFIG_F2FS_FS=y
 CONFIG_F2FS_STAT_FS=y
 CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_FS_POSIX_ACL=y
 CONFIG_F2FS_FS_SECURITY=y
+# CONFIG_F2FS_CHECK_FS is not set
+# CONFIG_F2FS_FS_ENCRYPTION is not set
+# CONFIG_F2FS_IO_TRACE is not set
+# CONFIG_F2FS_FAULT_INJECTION is not set
 # CONFIG_FS_DAX is not set
 CONFIG_FS_POSIX_ACL=y
 # CONFIG_EXPORTFS_BLOCK_OPS is not set
@@ -5979,8 +5867,6 @@ CONFIG_SDCARD_FS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-# CONFIG_JFFS2_FS is not set
-# CONFIG_UBIFS_FS is not set
 # CONFIG_CRAMFS is not set
 CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_FILE_CACHE=y
@@ -6005,7 +5891,7 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_QNX6FS_FS is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_PSTORE=y
-CONFIG_PSTORE_ZLIB_COMPRESS=y
+CONFIG_PSTORE_DEFLATE_COMPRESS=y
 # CONFIG_PSTORE_LZO_COMPRESS is not set
 # CONFIG_PSTORE_LZ4_COMPRESS is not set
 # CONFIG_PSTORE_LZ4HC_COMPRESS is not set
@@ -6038,7 +5924,8 @@ CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_SUNRPC_DEBUG is not set
 # CONFIG_CEPH_FS is not set
 CONFIG_CIFS=m
-# CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
 # CONFIG_CIFS_WEAK_PW_HASH is not set
 # CONFIG_CIFS_UPCALL is not set
 # CONFIG_CIFS_XATTR is not set
@@ -6046,8 +5933,6 @@ CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
 # CONFIG_CIFS_DFS_UPCALL is not set
-# CONFIG_CIFS_SMB311 is not set
-# CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
 CONFIG_NLS=y
@@ -6110,13 +5995,14 @@ CONFIG_KEYS=y
 CONFIG_KEYS_COMPAT=y
 # CONFIG_PERSISTENT_KEYRINGS is not set
 CONFIG_BIG_KEYS=y
-# CONFIG_TRUSTED_KEYS is not set
 # CONFIG_ENCRYPTED_KEYS is not set
 # CONFIG_KEY_DH_OPERATIONS is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
 CONFIG_SECURITY=y
 CONFIG_SECURITY_WRITABLE_HOOKS=y
+# CONFIG_SECURITY_STACKING is not set
+# CONFIG_SECURITY_LSM_DEBUG is not set
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
 # CONFIG_PAGE_TABLE_ISOLATION is not set
@@ -6143,6 +6029,10 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 # CONFIG_SECURITY_LOADPIN is not set
 # CONFIG_SECURITY_YAMA is not set
 # CONFIG_INTEGRITY is not set
+
+#
+# Security Module Selection
+#
 CONFIG_DEFAULT_SECURITY_SELINUX=y
 # CONFIG_DEFAULT_SECURITY_DAC is not set
 CONFIG_DEFAULT_SECURITY="selinux"
@@ -6338,6 +6228,7 @@ CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set
 # CONFIG_CRYPTO_DEV_QAT_C62XVF is not set
 # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
+# CONFIG_CRYPTO_DEV_CHELSIO is not set
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
@@ -6382,7 +6273,7 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_BIT is not set
 CONFIG_CRC64=m
 # CONFIG_CRC4 is not set
-# CONFIG_CRC7 is not set
+CONFIG_CRC7=m
 CONFIG_LIBCRC32C=y
 CONFIG_CRC8=y
 # CONFIG_RANDOM32_SELFTEST is not set
@@ -6515,8 +6406,6 @@ CONFIG_DEBUG_STACKOVERFLOW=y
 CONFIG_HAVE_ARCH_KASAN=y
 # CONFIG_KASAN is not set
 CONFIG_ARCH_HAS_KCOV=y
-CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-# CONFIG_KCOV is not set
 # CONFIG_DEBUG_SHIRQ is not set
 
 #
@@ -6662,6 +6551,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_UDELAY is not set
 # CONFIG_TEST_STATIC_KEYS is not set
 # CONFIG_TEST_KMOD is not set
+# CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
 # CONFIG_SAMPLES is not set
@@ -6703,5 +6593,3 @@ CONFIG_X86_DEBUG_FPU=y
 CONFIG_UNWINDER_ORC=y
 # CONFIG_UNWINDER_FRAME_POINTER is not set
 # CONFIG_UNWINDER_GUESS is not set
-
-CONFIG_TYPEC_TCPM=y

From 9e1ff5f5b2241d6eca2437f3731c182d8b6891f8 Mon Sep 17 00:00:00 2001
From: Zhiwei Li <zhiwei.li@intel.com>
Date: Fri, 2 Nov 2018 13:04:37 +0800
Subject: [PATCH 387/427] support adoptable storage on usb

since there is no sd card slot on Commercial KBL-NUC, use adoptable usb to test related function instead.

Tracked-On: https://jira01.devtools.intel.com/browse/OAM-69262
Signed-off-by: Zhiwei li zhiwei.li@intel.com
---
 celadon/mixins.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/celadon/mixins.spec b/celadon/mixins.spec
index a2efdef6e..9a3d15031 100644
--- a/celadon/mixins.spec
+++ b/celadon/mixins.spec
@@ -13,7 +13,7 @@ media: project-celadon(mediasdk=false,media_sdk_source=false)
 device-type: tablet
 ethernet: dhcp
 debugfs: default
-storage: sdcard-mmc0-usb-sd(adoptablesd=true,adoptableusb=false)
+storage: sdcard-mmc0-usb-sd(adoptablesd=false,adoptableusb=true)
 display-density: default
 usb-gadget: g_ffs
 adb_net: true

From 70b733690cc5f7663d089d2df7d9f685819e331d Mon Sep 17 00:00:00 2001
From: Madhusudhan S <madhusudhan.s@intel.com>
Date: Wed, 31 Oct 2018 15:21:12 +0530
Subject: [PATCH 388/427] SELinux: Remove dedicated sepolicy configuration for
 /sys/power/state

We do not need the sepolicy changes for sys/power/state in "P" since
it is already handled by the core.

Tracked-on: OAM-56502
Signed-off-by: Madhusudhan S <madhusudhan.s@intel.com>
---
 sepolicy/car/file.te          | 1 -
 sepolicy/car/file_contexts    | 1 -
 sepolicy/car/system_app.te    | 2 --
 sepolicy/car/system_server.te | 1 -
 4 files changed, 5 deletions(-)
 delete mode 100644 sepolicy/car/system_app.te

diff --git a/sepolicy/car/file.te b/sepolicy/car/file.te
index 1e3ef6fb9..0399da341 100644
--- a/sepolicy/car/file.te
+++ b/sepolicy/car/file.te
@@ -3,5 +3,4 @@
 # when system is going to suspend, by press ignition button, Carservice needs to write
 # /sys/power/state to put system to suspend
 #
-type sysfs_power_state, fs_type, sysfs_type;
 type sysfs_early_evs, fs_type, sysfs_type;
diff --git a/sepolicy/car/file_contexts b/sepolicy/car/file_contexts
index 66fd766c9..589ff440d 100644
--- a/sepolicy/car/file_contexts
+++ b/sepolicy/car/file_contexts
@@ -1,5 +1,4 @@
 /(vendor|system/vendor)/bin/hw/android\.hardware\.automotive\.vehicle\.intel@2\.0-service  u:object_r:hal_vehicle_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.automotive\.vehicle\.intel@2\.1-service  u:object_r:hal_vehicle_default_exec:s0
-/sys/power/state u:object_r:sysfs_power_state:s0
 
 /vendor/bin/hw/android.hardware.broadcastradio@intel-service u:object_r:hal_broadcastradio_default_exec:s0
diff --git a/sepolicy/car/system_app.te b/sepolicy/car/system_app.te
deleted file mode 100644
index 9a4a4f335..000000000
--- a/sepolicy/car/system_app.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# allow CarService to write /sys/power/state to enter deep sleep.
-allow system_app sysfs_power_state:file rw_file_perms;
diff --git a/sepolicy/car/system_server.te b/sepolicy/car/system_server.te
index 2ad5fe21e..e69de29bb 100644
--- a/sepolicy/car/system_server.te
+++ b/sepolicy/car/system_server.te
@@ -1 +0,0 @@
-allow system_server sysfs_power_state:file rw_file_perms;

From 5572abcfe55d9c411c6ec68cf9ca910d1841b9e4 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Fri, 16 Nov 2018 09:17:57 +0530
Subject: [PATCH 389/427] [CELADON] Enabling
 CONFIG_ANDROID_AUTO_SUSPEND_BEHAVIOR

Enabling CONFIG_ANDROID_AUTO_SUSPEND_BEHAVIOR
to bypass the alarmtimer during suspend flow.

Tracked-On: OAM-56502
Signed-off-by: Madhusudhan S <madhusudhan.s@intel.com>
---
 kernel_config/kernel_64_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 4edeabdf6..14d6a2543 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -4755,6 +4755,7 @@ CONFIG_USB_CONFIGFS_F_MIDI=y
 CONFIG_USB_G_WEBCAM=m
 CONFIG_TYPEC=y
 CONFIG_TYPEC_TCPM=y
+CONFIG_ANDROID_AUTO_SUSPEND_BEHAVIOR=y
 # CONFIG_TYPEC_TCPCI is not set
 # CONFIG_TYPEC_RT1711H is not set
 # CONFIG_TYPEC_FUSB302 is not set

From 0115b514cc8520d596c5f8f5d907f944025fd6f8 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Fri, 16 Nov 2018 09:25:21 +0530
Subject: [PATCH 390/427] [CELADON] Change the logging during boot

This is a wa to increase logging during console initialization and
will be reverted later.

Tracked-On: OAM-71556
Signed-off-by: Madhusudhan S <madhusudhan.s@intel.com>
---
 cel_apl/mixins.spec | 2 +-
 sepolicy/init.te    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cel_apl/mixins.spec b/cel_apl/mixins.spec
index d8c89af23..ff460f929 100644
--- a/cel_apl/mixins.spec
+++ b/cel_apl/mixins.spec
@@ -16,7 +16,7 @@ storage: sdcard-mmc0-usb-sd(adoptablesd=true,adoptableusb=false)
 display-density: default
 usb-gadget: g_ffs
 adb_net: true
-kernel: project-celadon(loglevel=3, disable_cpuidle_on_boot=true)
+kernel: project-celadon(loglevel=7, disable_cpuidle_on_boot=true)
 bluetooth: btusb (ivi=true)
 boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true,ignore_not_applicable_reset=true,self_usb_device_mode_protocol=true)
 audio: project-celadon
diff --git a/sepolicy/init.te b/sepolicy/init.te
index b459b0661..c9bba2451 100644
--- a/sepolicy/init.te
+++ b/sepolicy/init.te
@@ -31,3 +31,4 @@ allow init debugfs_pstate:file w_file_perms;
 allow init userdata_block_device:blk_file write;
 allow init misc_block_device:blk_file write;
 allow init kernel:key search;
+allow init proc:file w_file_perms;

From 96135726c9cc4e36c36c7e39c4ed17489ea0ef8f Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Fri, 16 Nov 2018 09:32:51 +0530
Subject: [PATCH 391/427] [MIXINUP] Reduce logging after kernel boot-up #113

Tracked-On: None
Signed-off-by: Swaroop Balan <swaroop.balan@intel.com>
---
 cel_apl/BoardConfig.mk | 11 ++++++++++-
 cel_apl/fstab          |  2 +-
 cel_apl/init.rc        |  1 +
 celadon/BoardConfig.mk |  9 +++++++++
 celadon/fstab          |  2 +-
 celadon/init.rc        |  1 +
 6 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index a4ea431cd..0303fec48 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -93,7 +93,7 @@ TARGET_SUPPORTS_64_BIT_APPS := true
 TARGET_PRELINK_MODULE := false
 TARGET_NO_KERNEL ?= false
 
-KERNEL_LOGLEVEL ?= 3
+KERNEL_LOGLEVEL ?= 7
 SERIAL_PARAMETER ?= console=tty0 console=ttyS0,115200n8
 
 
@@ -169,7 +169,16 @@ BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/config-partition
 
 TARGET_BOARD_PLATFORM := project-celadon
 
+ifeq (False,true)
+TARGET_USERIMAGES_USE_F2FS := true
+BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := f2fs
+INTERNAL_USERIMAGES_EXT_VARIANT := f2fs
+else
 TARGET_USERIMAGES_USE_EXT4 := true
+BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
+INTERNAL_USERIMAGES_EXT_VARIANT := ext4
+endif
+
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
 BOARD_FLASH_BLOCK_SIZE := 512
 
diff --git a/cel_apl/fstab b/cel_apl/fstab
index f6e8887cd..80d908ce7 100644
--- a/cel_apl/fstab
+++ b/cel_apl/fstab
@@ -38,7 +38,7 @@
 
 # If enable AVB and A/B slot, then will mount system partition as / through /dev/dm-0
 /dev/block/by-name/system       /               ext4    ro                                                          wait,slotselect,avb
-/dev/block/by-name/data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts,quota
+/dev/block/by-name/data         /data           ext4     noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts,quota
 /dev/block/by-name/boot         /boot           emmc    defaults                                                    defaults,slotselect,avb
 /dev/block/by-name/misc         /misc           emmc    defaults                                                    defaults
 /dev/block/by-name/bootloader   /bootloader     emmc    defaults                                                    recoveryonly
diff --git a/cel_apl/init.rc b/cel_apl/init.rc
index 2598da115..cc117930e 100644
--- a/cel_apl/init.rc
+++ b/cel_apl/init.rc
@@ -45,6 +45,7 @@ on restart-ueventd
 on fs
     mkdir /dev/pstore 0755 root system
     mount pstore pstore /dev/pstore
+    write /proc/sys/kernel/printk 3
 
 on post-fs
     setprop ro.setupwizard.mode DISABLED
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index 514ee9b71..dd7ee091c 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -173,7 +173,16 @@ BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/config-partition
 
 TARGET_BOARD_PLATFORM := project-celadon
 
+ifeq (False,true)
+TARGET_USERIMAGES_USE_F2FS := true
+BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := f2fs
+INTERNAL_USERIMAGES_EXT_VARIANT := f2fs
+else
 TARGET_USERIMAGES_USE_EXT4 := true
+BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
+INTERNAL_USERIMAGES_EXT_VARIANT := ext4
+endif
+
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
 BOARD_FLASH_BLOCK_SIZE := 512
 
diff --git a/celadon/fstab b/celadon/fstab
index f6e8887cd..80d908ce7 100644
--- a/celadon/fstab
+++ b/celadon/fstab
@@ -38,7 +38,7 @@
 
 # If enable AVB and A/B slot, then will mount system partition as / through /dev/dm-0
 /dev/block/by-name/system       /               ext4    ro                                                          wait,slotselect,avb
-/dev/block/by-name/data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts,quota
+/dev/block/by-name/data         /data           ext4     noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts,quota
 /dev/block/by-name/boot         /boot           emmc    defaults                                                    defaults,slotselect,avb
 /dev/block/by-name/misc         /misc           emmc    defaults                                                    defaults
 /dev/block/by-name/bootloader   /bootloader     emmc    defaults                                                    recoveryonly
diff --git a/celadon/init.rc b/celadon/init.rc
index 2598da115..cc117930e 100644
--- a/celadon/init.rc
+++ b/celadon/init.rc
@@ -45,6 +45,7 @@ on restart-ueventd
 on fs
     mkdir /dev/pstore 0755 root system
     mount pstore pstore /dev/pstore
+    write /proc/sys/kernel/printk 3
 
 on post-fs
     setprop ro.setupwizard.mode DISABLED

From 309312cd15d8c51e75d89949b7c30cc3a453a900 Mon Sep 17 00:00:00 2001
From: "Sristi, Vns Murthy" <vns.murthy.sristi@intel.com>
Date: Fri, 16 Nov 2018 17:25:28 +0530
Subject: [PATCH 392/427] [MIXINUP] enable MultiCameraApp in mixins

Tracked-On: 69238
Signed-off-by: Sristi, Vns Murthy <vns.murthy.sristi@intel.com>
---
 cel_apl/device.mk | 3 ++-
 celadon/device.mk | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index f2b722abb..42b71a0b1 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -679,7 +679,8 @@ PRODUCT_PACKAGES += android.hardware.camera.provider@2.4-external-service \
                     android.hardware.camera.provider@2.4-impl
 
 # Only include test apps in eng or userdebug builds.
-PRODUCT_PACKAGES_DEBUG += TestingCamera
+PRODUCT_PACKAGES_DEBUG += TestingCamera \
+                          MultiCameraApp
 ##############################################################
 # Source: device/intel/mixins/groups/memtrack/true/product.mk
 ##############################################################
diff --git a/celadon/device.mk b/celadon/device.mk
index 89bc2916b..47ca82671 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -679,7 +679,8 @@ PRODUCT_PACKAGES += android.hardware.camera.provider@2.4-external-service \
                     android.hardware.camera.provider@2.4-impl
 
 # Only include test apps in eng or userdebug builds.
-PRODUCT_PACKAGES_DEBUG += TestingCamera
+PRODUCT_PACKAGES_DEBUG += TestingCamera \
+                          MultiCameraApp
 ##############################################################
 # Source: device/intel/mixins/groups/memtrack/true/product.mk
 ##############################################################

From e33d488cf17dd2182c0aa360fcaec7cd189edb4d Mon Sep 17 00:00:00 2001
From: raghupatelraj <rugnath.ram@intel.com>
Date: Tue, 13 Nov 2018 17:08:48 +0530
Subject: [PATCH 393/427] Adding config_cpuset script

Tracked-On: OAM-71691
Signed-off-by: raghupatelraj <rugnath.ram@intel.com>
Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
---
 cel_apl/config_cpuset.sh | 8 ++++++++
 celadon/config_cpuset.sh | 8 ++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 cel_apl/config_cpuset.sh
 create mode 100644 celadon/config_cpuset.sh

diff --git a/cel_apl/config_cpuset.sh b/cel_apl/config_cpuset.sh
new file mode 100644
index 000000000..8fdf9edcd
--- /dev/null
+++ b/cel_apl/config_cpuset.sh
@@ -0,0 +1,8 @@
+#!/vendor/bin/sh
+ 
+ cp /sys/devices/system/cpu/online /dev/cpuset/foreground/cpus
+ cp /sys/devices/system/cpu/online /dev/cpuset/background/cpus
+ cp /sys/devices/system/cpu/online /dev/cpuset/system-background/cpus
+ cp /sys/devices/system/cpu/online /dev/cpuset/top-app/cpus
+ cp /sys/devices/system/cpu/online /dev/cpuset/foreground/boost/cpus
+
diff --git a/celadon/config_cpuset.sh b/celadon/config_cpuset.sh
new file mode 100644
index 000000000..8fdf9edcd
--- /dev/null
+++ b/celadon/config_cpuset.sh
@@ -0,0 +1,8 @@
+#!/vendor/bin/sh
+ 
+ cp /sys/devices/system/cpu/online /dev/cpuset/foreground/cpus
+ cp /sys/devices/system/cpu/online /dev/cpuset/background/cpus
+ cp /sys/devices/system/cpu/online /dev/cpuset/system-background/cpus
+ cp /sys/devices/system/cpu/online /dev/cpuset/top-app/cpus
+ cp /sys/devices/system/cpu/online /dev/cpuset/foreground/boost/cpus
+

From 144d6cc7544b4023a640cc14915b22a056fce748 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Thu, 22 Nov 2018 10:04:13 +0530
Subject: [PATCH 394/427] [MIXINUP] for Mixins porting

Tracked-On: OAM-71487
Signed-off-by: raghupatelraj <rugnath.ram@intel.com>
Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
Signed-off-by: Swaroop Balan <swaroop.balan@intel.com>
---
 cel_apl/AndroidBoard.mk            |  1 +
 cel_apl/BoardConfig.mk             | 13 +++++---
 cel_apl/config_cpuset.sh           | 14 ++++++++
 cel_apl/device.mk                  | 33 +++++++++++++------
 cel_apl/external_camera_config.xml | 51 ++++++++++++++++++++++++++++++
 cel_apl/fstab                      |  2 +-
 cel_apl/fstab.recovery             |  6 ++++
 cel_apl/init.rc                    | 22 +++++++++----
 cel_apl/oemvars.txt                |  4 +++
 cel_apl/ueventd.rc                 |  1 +
 celadon/AndroidBoard.mk            |  1 +
 celadon/BoardConfig.mk             | 12 ++++---
 celadon/config_cpuset.sh           | 14 ++++++++
 celadon/device.mk                  | 32 +++++++++++++------
 celadon/external_camera_config.xml | 51 ++++++++++++++++++++++++++++++
 celadon/fstab                      |  2 +-
 celadon/fstab.recovery             |  6 ++++
 celadon/init.rc                    | 22 +++++++++----
 celadon/oemvars.txt                |  4 +++
 celadon/ueventd.rc                 |  1 +
 20 files changed, 249 insertions(+), 43 deletions(-)
 create mode 100644 cel_apl/external_camera_config.xml
 create mode 100644 celadon/external_camera_config.xml

diff --git a/cel_apl/AndroidBoard.mk b/cel_apl/AndroidBoard.mk
index 60fa24ad9..d92b3514b 100644
--- a/cel_apl/AndroidBoard.mk
+++ b/cel_apl/AndroidBoard.mk
@@ -543,6 +543,7 @@ $(GPTIMAGE_BIN): \
 		--table $(TARGET_DEVICE_DIR)/gpt.ini \
 		--size $(gptimage_size) \
 		--bootloader $(bootloader_bin) \
+		--bootloader2 $(bootloader_bin) \
 		--tos $(tos_bin) \
 		--multiboot $(multiboot_bin) \
 		--boot $(INSTALLED_BOOTIMAGE_TARGET) \
diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index 0303fec48..ad604b019 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -121,7 +121,7 @@ BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/intel/common/bluetooth/int
 ##############################################################
 # Source: device/intel/mixins/groups/disk-bus/auto/BoardConfig.mk
 ##############################################################
-BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/set_storage
+BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/set_storage
 ##############################################################
 # Source: device/intel/mixins/groups/factory-partition/true/BoardConfig.mk
 ##############################################################
@@ -355,9 +355,13 @@ TARGET_ARCH := x86
 TARGET_CPU_ABI := x86
 endif
 ##############################################################
+# Source: device/intel/mixins/groups/cpuset/autocores/BoardConfig.mk
+##############################################################
+BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/config_cpuset
+##############################################################
 # Source: device/intel/mixins/groups/rfkill/true/BoardConfig.mk
 ##############################################################
-BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/rfkill
+BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/rfkill
 ##############################################################
 # Source: device/intel/mixins/groups/dexpreopt/enabled/BoardConfig.mk
 ##############################################################
@@ -459,7 +463,7 @@ BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/camera-ext/ext-came
 ##############################################################
 # Source: device/intel/mixins/groups/memtrack/true/BoardConfig.mk
 ##############################################################
-BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/memtrack
+BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/memtrack
 ##############################################################
 # Source: device/intel/mixins/groups/gptbuild/true/BoardConfig.mk
 ##############################################################
@@ -469,11 +473,10 @@ CRAFFIMAGE_BIN = $(PRODUCT_OUT)/$(TARGET_PRODUCT)_gptimage.craff
 ##############################################################
 # Source: device/intel/mixins/groups/device-type/car/BoardConfig.mk
 ##############################################################
-
 BOARD_SEPOLICY_DIRS += \
     packages/services/Car/car_product/sepolicy \
     device/generic/car/common/sepolicy \
-    device/intel/project-celadon/sepolicy/car
+    $(INTEL_PATH_SEPOLICY)/car
 
 TARGET_USES_CAR_FUTURE_FEATURES := true
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/cel_apl/config_cpuset.sh b/cel_apl/config_cpuset.sh
index 8fdf9edcd..97512e68d 100644
--- a/cel_apl/config_cpuset.sh
+++ b/cel_apl/config_cpuset.sh
@@ -6,3 +6,17 @@
  cp /sys/devices/system/cpu/online /dev/cpuset/top-app/cpus
  cp /sys/devices/system/cpu/online /dev/cpuset/foreground/boost/cpus
 
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/cpuset/autocores/config_cpuset.sh
+##############################################################
+#!/vendor/bin/sh
+ 
+ cp /sys/devices/system/cpu/online /dev/cpuset/foreground/cpus
+ cp /sys/devices/system/cpu/online /dev/cpuset/background/cpus
+ cp /sys/devices/system/cpu/online /dev/cpuset/system-background/cpus
+ cp /sys/devices/system/cpu/online /dev/cpuset/top-app/cpus
+ cp /sys/devices/system/cpu/online /dev/cpuset/foreground/boost/cpus
+
+# ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 42b71a0b1..93f550704 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -269,6 +269,11 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PROPERTY_OVERRIDES += \
    net.eth0.startonboot=1
 
+##############################################################
+# Source: device/intel/mixins/groups/storage/sdcard-mmc0-usb-sd/product.mk
+##############################################################
+
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += support.sdcardfs.mode=y
 ##############################################################
 # Source: device/intel/mixins/groups/display-density/default/product.mk
 ##############################################################
@@ -511,9 +516,17 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 PRODUCT_PACKAGES += \
   android.hardware.wifi@1.0-service
 ##############################################################
+# Source: device/intel/mixins/groups/cpuset/autocores/product.mk
+##############################################################
+PRODUCT_PACKAGES += \
+    config_cpuset.sh
+
+PRODUCT_COPY_FILES += \
+    device/intel/project-celadon/$(TARGET_PRODUCT)/config_cpuset.sh:vendor/bin/config_cpuset.sh
+##############################################################
 # Source: device/intel/mixins/groups/rfkill/true/product.mk
 ##############################################################
-PRODUCT_COPY_FILES += device/intel/common/rfkill/rfkill-init.sh:system/bin/rfkill-init.sh
+PRODUCT_COPY_FILES += $(INTEL_PATH_COMMON)/rfkill/rfkill-init.sh:vendor/bin/rfkill-init.sh
 ##############################################################
 # Source: device/intel/mixins/groups/usb/host+acc/product.mk
 ##############################################################
@@ -534,11 +547,12 @@ PRODUCT_PACKAGES += \
 ##############################################################
 # Lights HAL
 BOARD_SEPOLICY_DIRS += \
-    device/intel/project-celadon/sepolicy/light
+    $(INTEL_PATH_SEPOLICY)/light
 
-PRODUCT_PACKAGES += lights.project-celadon \
+PRODUCT_PACKAGES += lights.$(TARGET_BOARD_PLATFORM) \
     android.hardware.light@2.0-service \
     android.hardware.light@2.0-impl
+
 ##############################################################
 # Source: device/intel/mixins/groups/thermal/thermal-daemon/product.mk
 ##############################################################
@@ -629,13 +643,14 @@ PRODUCT_PACKAGES_DEBUG += \
     libjackpal-androidterm4 \
     peeknpoke \
     pytimechart-record \
-    lspci
+    lspci \
+    llvm-symbolizer
 ##############################################################
 # Source: device/intel/mixins/groups/midi/true/product.mk
 ##############################################################
 # MIDI support
 PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.software.midi.xml:system/etc/permissions/android.software.midi.xml
+    frameworks/native/data/etc/android.software.midi.xml:vendor/etc/permissions/android.software.midi.xml
 ##############################################################
 # Source: device/intel/mixins/groups/trusty/true/product.mk
 ##############################################################
@@ -686,7 +701,7 @@ PRODUCT_PACKAGES_DEBUG += TestingCamera \
 ##############################################################
 # memtrack HAL
 PRODUCT_PACKAGES += \
-	memtrack.project-celadon \
+	memtrack.$(TARGET_BOARD_PLATFORM) \
 	android.hardware.memtrack@1.0-service \
 	android.hardware.memtrack@1.0-impl
 ##############################################################
@@ -694,7 +709,7 @@ PRODUCT_PACKAGES += \
 ##############################################################
 PRODUCT_COPY_FILES += \
         frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:vendor/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml\
-        device/intel/common/touch/Vendor_0eef_Product_7200.idc:system/usr/idc/Vendor_0eef_Product_7200.idc
+        $(INTEL_PATH_COMMON)/touch/Vendor_0eef_Product_7200.idc:system/usr/idc/Vendor_0eef_Product_7200.idc
 ##############################################################
 # Source: device/intel/mixins/groups/art-config/default/product.mk
 ##############################################################
@@ -731,8 +746,8 @@ PRODUCT_PACKAGES += \
     VmsSubscriberClientSample \
 
 PRODUCT_PACKAGES += android.hardware.automotive.vehicle.intel@2.0-service \
-					android.hardware.automotive.vehicle@2.0-service \
-					android.hardware.automotive.vehicle@2.0-impl
+    android.hardware.automotive.vehicle@2.0-service \
+    android.hardware.automotive.vehicle@2.0-impl
 
 VEHICLE_HAL_PROTO_TYPE := google-emulator
 ##############################################################
diff --git a/cel_apl/external_camera_config.xml b/cel_apl/external_camera_config.xml
new file mode 100644
index 000000000..0266b3bc7
--- /dev/null
+++ b/cel_apl/external_camera_config.xml
@@ -0,0 +1,51 @@
+<!-- ############# BEGIN MIX-IN DEFINITIONS ############## -->
+<!-- Mix-In definitions are auto-generated by mixin-update -->
+<!-- ##################################################### -->
+<!-- Source: device/intel/mixins/groups/camera-ext/ext-camera-only/external_camera_config.xml -->
+<!-- ##################################################### -->
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Copyright (C) 2017-2018 Intel Corporation.
+
+     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.
+-->
+
+<ExternalCamera>
+    <Provider>
+        <ignore> <!-- Internal video devices to be ignored by external camera HAL -->
+        </ignore>
+    </Provider>
+    <!-- See ExternalCameraUtils.cpp for default values of Device configurations below
+-->
+    <Device>
+        <!-- Max JPEG buffer size in bytes-->
+        <MaxJpegBufferSize bytes="3145728"/> <!-- 3MB (~= 1080p YUV420) -->
+        <!-- Size of v4l2 buffer queue when streaming >= 30fps -->
+        <!-- Larger value: more request can be cached pipeline (less janky)  -->
+        <!-- Smaller value: use less memory -->
+        <NumVideoBuffers count="4"/>
+        <!-- Size of v4l2 buffer queue when streaming < 30fps -->
+        <NumStillBuffers count="2"/>
+
+        <!-- List of maximum fps for various output sizes -->
+        <!-- Any image size smaller than the size listed in Limit row will report
+            fps (as minimum frame duration) up to the fpsBound value. -->
+        <FpsList>
+            <!-- width/height must be increasing, fpsBound must be decreasing-->
+            <Limit width="640" height="480" fpsBound="30.0"/>
+            <Limit width="1280" height="720" fpsBound="15.0"/>
+            <Limit width="1920" height="1080" fpsBound="10.0"/>
+            <!-- image size larger than the last entry will not be supported-->
+        </FpsList>
+    </Device>
+</ExternalCamera>
+<!-- ############## END MIX-IN DEFINITIONS ############### -->
diff --git a/cel_apl/fstab b/cel_apl/fstab
index 80d908ce7..01407f788 100644
--- a/cel_apl/fstab
+++ b/cel_apl/fstab
@@ -4,7 +4,7 @@
 # Source: device/intel/mixins/groups/storage/sdcard-mmc0-usb-sd/fstab
 ##############################################################
 */usb*/*/host*/*/block/sd*              auto             auto    defaults                                   voldmanaged=usbdisk:auto
-*/mmc0/*/block/mmcblk*                  auto             auto    defaults                                   voldmanaged=sdcard1:auto
+*/mmc0/*/block/mmcblk*                  auto             auto    defaults                                   voldmanaged=sdcard1:auto,encryptable=userdata
 ##############################################################
 # Source: device/intel/mixins/groups/factory-partition/true/fstab
 ##############################################################
diff --git a/cel_apl/fstab.recovery b/cel_apl/fstab.recovery
index 3d4b9debb..88929d1e5 100644
--- a/cel_apl/fstab.recovery
+++ b/cel_apl/fstab.recovery
@@ -1,6 +1,12 @@
 # ----------------- BEGIN MIX-IN DEFINITIONS -----------------
 # Mix-In definitions are auto-generated by mixin-update
 ##############################################################
+# Source: device/intel/mixins/groups/storage/sdcard-mmc0-usb-sd/fstab.recovery
+##############################################################
+/dev/block/sda1                         /udiska          vfat    defaults                                   voldmanaged=udiska:auto
+/dev/block/sdb1                         /udiskb          vfat    defaults                                   voldmanaged=udiskb:auto
+/dev/block/mmcblk0p1                    /sdcard          vfat    defaults                                   voldmanaged=sdcard:auto
+##############################################################
 # Source: device/intel/mixins/groups/factory-partition/true/fstab.recovery
 ##############################################################
 /dev/block/by-name/factory      /factory        ext4    rw,noatime                                                  wait
diff --git a/cel_apl/init.rc b/cel_apl/init.rc
index cc117930e..cfd9ee904 100644
--- a/cel_apl/init.rc
+++ b/cel_apl/init.rc
@@ -474,6 +474,15 @@ on post-fs
     insmod /vendor/lib/modules/kernel/drivers/bluetooth/btrtl.ko
     insmod /vendor/lib/modules/kernel/drivers/bluetooth/btusb.ko
 ##############################################################
+# Source: device/intel/mixins/groups/disk-bus/auto/init.rc
+##############################################################
+on init
+    # Android creates by-name disk links with the disk controller
+    # in the generated path, so that the names pulled out of the GPT
+    # can be associated with the correct disk. Create a shortcut to
+    # /dev/block/by-name so that we can use the same fstabs everywhere.
+    exec u:r:set_storage:s0 root root -- /sbin/set_storage
+##############################################################
 # Source: device/intel/mixins/groups/factory-partition/true/init.rc
 ##############################################################
 # init.rc for telephony services specific to flashless platforms using /factory partition
@@ -570,19 +579,18 @@ on post-fs
 ##############################################################
 # Source: device/intel/mixins/groups/cpuset/autocores/init.rc
 ##############################################################
-on late-init
-    copy /sys/devices/system/cpu/online /dev/cpuset/foreground/cpus
-    copy /sys/devices/system/cpu/online /dev/cpuset/background/cpus
-    copy /sys/devices/system/cpu/online /dev/cpuset/system-background/cpus
-    copy /sys/devices/system/cpu/online /dev/cpuset/top-app/cpus
-    copy /sys/devices/system/cpu/online /dev/cpuset/foreground/boost/cpus
+on early-boot
+    # execute script to set initial CPU settings
+    # don't run as a service to avoid race conditions
+    exec - root system -- /vendor/bin/config_cpuset.sh
 ##############################################################
 # Source: device/intel/mixins/groups/rfkill/true/init.rc
 ##############################################################
 on boot
+    insmod ${ro.boot.moduleslocation}/rfkill-gpio.ko
     start rfkill-init
 
-service rfkill-init /system/bin/rfkill-init.sh
+service rfkill-init /vendor/bin/rfkill-init.sh 
     disabled
     user system
     group system
diff --git a/cel_apl/oemvars.txt b/cel_apl/oemvars.txt
index d4a47921d..f63725c6b 100644
--- a/cel_apl/oemvars.txt
+++ b/cel_apl/oemvars.txt
@@ -1,6 +1,10 @@
 # ----------------- BEGIN MIX-IN DEFINITIONS -----------------
 # Mix-In definitions are auto-generated by mixin-update
 ##############################################################
+# Source: device/intel/mixins/groups/2ndstage/oemvars/oemvars.txt
+##############################################################
+# This section may appear empty if magic_key_timeout is false
+##############################################################
 # Source: device/intel/mixins/groups/boot-arch/project-celadon/oemvars.txt
 ##############################################################
 # This section may appear empty if magic_key_timeout is false
diff --git a/cel_apl/ueventd.rc b/cel_apl/ueventd.rc
index b6e497c9d..8b0194bfe 100644
--- a/cel_apl/ueventd.rc
+++ b/cel_apl/ueventd.rc
@@ -72,6 +72,7 @@
 ##############################################################
 # i915 backlight driver
 /sys/devices/pci0000:00/0000:00:02.0/drm/card*/card*/intel_backlight brightness 0644 system system
+
 ##############################################################
 # Source: device/intel/mixins/groups/trusty/true/ueventd.rc
 ##############################################################
diff --git a/celadon/AndroidBoard.mk b/celadon/AndroidBoard.mk
index 4a32cebb1..fb6485740 100644
--- a/celadon/AndroidBoard.mk
+++ b/celadon/AndroidBoard.mk
@@ -543,6 +543,7 @@ $(GPTIMAGE_BIN): \
 		--table $(TARGET_DEVICE_DIR)/gpt.ini \
 		--size $(gptimage_size) \
 		--bootloader $(bootloader_bin) \
+		--bootloader2 $(bootloader_bin) \
 		--tos $(tos_bin) \
 		--multiboot $(multiboot_bin) \
 		--boot $(INSTALLED_BOOTIMAGE_TARGET) \
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index dd7ee091c..aaa4eb8d0 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -70,7 +70,7 @@ BOARD_HAVE_MEDIASDK_OPEN_SOURCE := true
 ##############################################################
 # Source: device/intel/mixins/groups/device-type/tablet/BoardConfig.mk
 ##############################################################
-DEVICE_PACKAGE_OVERLAYS += device/intel/common/device-type/overlay-tablet
+DEVICE_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/device-type/overlay-tablet
 ##############################################################
 # Source: device/intel/mixins/groups/debugfs/default/BoardConfig.mk
 ##############################################################
@@ -125,7 +125,7 @@ BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/intel/common/bluetooth/int
 ##############################################################
 # Source: device/intel/mixins/groups/disk-bus/auto/BoardConfig.mk
 ##############################################################
-BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/set_storage
+BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/set_storage
 ##############################################################
 # Source: device/intel/mixins/groups/factory-partition/true/BoardConfig.mk
 ##############################################################
@@ -359,9 +359,13 @@ TARGET_ARCH := x86
 TARGET_CPU_ABI := x86
 endif
 ##############################################################
+# Source: device/intel/mixins/groups/cpuset/autocores/BoardConfig.mk
+##############################################################
+BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/config_cpuset
+##############################################################
 # Source: device/intel/mixins/groups/rfkill/true/BoardConfig.mk
 ##############################################################
-BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/rfkill
+BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/rfkill
 ##############################################################
 # Source: device/intel/mixins/groups/dexpreopt/enabled/BoardConfig.mk
 ##############################################################
@@ -463,7 +467,7 @@ BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/camera-ext/ext-came
 ##############################################################
 # Source: device/intel/mixins/groups/memtrack/true/BoardConfig.mk
 ##############################################################
-BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/memtrack
+BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/memtrack
 ##############################################################
 # Source: device/intel/mixins/groups/gptbuild/true/BoardConfig.mk
 ##############################################################
diff --git a/celadon/config_cpuset.sh b/celadon/config_cpuset.sh
index 8fdf9edcd..97512e68d 100644
--- a/celadon/config_cpuset.sh
+++ b/celadon/config_cpuset.sh
@@ -6,3 +6,17 @@
  cp /sys/devices/system/cpu/online /dev/cpuset/top-app/cpus
  cp /sys/devices/system/cpu/online /dev/cpuset/foreground/boost/cpus
 
+# ----------------- BEGIN MIX-IN DEFINITIONS -----------------
+# Mix-In definitions are auto-generated by mixin-update
+##############################################################
+# Source: device/intel/mixins/groups/cpuset/autocores/config_cpuset.sh
+##############################################################
+#!/vendor/bin/sh
+ 
+ cp /sys/devices/system/cpu/online /dev/cpuset/foreground/cpus
+ cp /sys/devices/system/cpu/online /dev/cpuset/background/cpus
+ cp /sys/devices/system/cpu/online /dev/cpuset/system-background/cpus
+ cp /sys/devices/system/cpu/online /dev/cpuset/top-app/cpus
+ cp /sys/devices/system/cpu/online /dev/cpuset/foreground/boost/cpus
+
+# ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/celadon/device.mk b/celadon/device.mk
index 47ca82671..450ce6378 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -256,8 +256,7 @@ PRODUCT_CHARACTERISTICS := tablet
 $(call inherit-product,frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-heap.mk)
 
 PRODUCT_COPY_FILES += \
-        frameworks/native/data/etc/tablet_core_hardware.xml:system/etc/permissions/tablet_core_hardware.xml
-
+        frameworks/native/data/etc/tablet_core_hardware.xml:vendor/etc/permissions/tablet_core_hardware.xml
 
 ##############################################################
 # Source: device/intel/mixins/groups/ethernet/dhcp/product.mk
@@ -269,6 +268,11 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PROPERTY_OVERRIDES += \
    net.eth0.startonboot=1
 
+##############################################################
+# Source: device/intel/mixins/groups/storage/sdcard-mmc0-usb-sd/product.mk
+##############################################################
+
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += support.sdcardfs.mode=y
 ##############################################################
 # Source: device/intel/mixins/groups/display-density/default/product.mk
 ##############################################################
@@ -511,9 +515,17 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 PRODUCT_PACKAGES += \
   android.hardware.wifi@1.0-service
 ##############################################################
+# Source: device/intel/mixins/groups/cpuset/autocores/product.mk
+##############################################################
+PRODUCT_PACKAGES += \
+    config_cpuset.sh
+
+PRODUCT_COPY_FILES += \
+    device/intel/project-celadon/$(TARGET_PRODUCT)/config_cpuset.sh:vendor/bin/config_cpuset.sh
+##############################################################
 # Source: device/intel/mixins/groups/rfkill/true/product.mk
 ##############################################################
-PRODUCT_COPY_FILES += device/intel/common/rfkill/rfkill-init.sh:system/bin/rfkill-init.sh
+PRODUCT_COPY_FILES += $(INTEL_PATH_COMMON)/rfkill/rfkill-init.sh:vendor/bin/rfkill-init.sh
 ##############################################################
 # Source: device/intel/mixins/groups/usb/host+acc/product.mk
 ##############################################################
@@ -534,11 +546,12 @@ PRODUCT_PACKAGES += \
 ##############################################################
 # Lights HAL
 BOARD_SEPOLICY_DIRS += \
-    device/intel/project-celadon/sepolicy/light
+    $(INTEL_PATH_SEPOLICY)/light
 
-PRODUCT_PACKAGES += lights.project-celadon \
+PRODUCT_PACKAGES += lights.$(TARGET_BOARD_PLATFORM) \
     android.hardware.light@2.0-service \
     android.hardware.light@2.0-impl
+
 ##############################################################
 # Source: device/intel/mixins/groups/thermal/thermal-daemon/product.mk
 ##############################################################
@@ -629,13 +642,14 @@ PRODUCT_PACKAGES_DEBUG += \
     libjackpal-androidterm4 \
     peeknpoke \
     pytimechart-record \
-    lspci
+    lspci \
+    llvm-symbolizer
 ##############################################################
 # Source: device/intel/mixins/groups/midi/true/product.mk
 ##############################################################
 # MIDI support
 PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.software.midi.xml:system/etc/permissions/android.software.midi.xml
+    frameworks/native/data/etc/android.software.midi.xml:vendor/etc/permissions/android.software.midi.xml
 ##############################################################
 # Source: device/intel/mixins/groups/trusty/true/product.mk
 ##############################################################
@@ -686,7 +700,7 @@ PRODUCT_PACKAGES_DEBUG += TestingCamera \
 ##############################################################
 # memtrack HAL
 PRODUCT_PACKAGES += \
-	memtrack.project-celadon \
+	memtrack.$(TARGET_BOARD_PLATFORM) \
 	android.hardware.memtrack@1.0-service \
 	android.hardware.memtrack@1.0-impl
 ##############################################################
@@ -694,7 +708,7 @@ PRODUCT_PACKAGES += \
 ##############################################################
 PRODUCT_COPY_FILES += \
         frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:vendor/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml\
-        device/intel/common/touch/Vendor_0eef_Product_7200.idc:system/usr/idc/Vendor_0eef_Product_7200.idc
+        $(INTEL_PATH_COMMON)/touch/Vendor_0eef_Product_7200.idc:system/usr/idc/Vendor_0eef_Product_7200.idc
 ##############################################################
 # Source: device/intel/mixins/groups/art-config/default/product.mk
 ##############################################################
diff --git a/celadon/external_camera_config.xml b/celadon/external_camera_config.xml
new file mode 100644
index 000000000..0266b3bc7
--- /dev/null
+++ b/celadon/external_camera_config.xml
@@ -0,0 +1,51 @@
+<!-- ############# BEGIN MIX-IN DEFINITIONS ############## -->
+<!-- Mix-In definitions are auto-generated by mixin-update -->
+<!-- ##################################################### -->
+<!-- Source: device/intel/mixins/groups/camera-ext/ext-camera-only/external_camera_config.xml -->
+<!-- ##################################################### -->
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Copyright (C) 2017-2018 Intel Corporation.
+
+     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.
+-->
+
+<ExternalCamera>
+    <Provider>
+        <ignore> <!-- Internal video devices to be ignored by external camera HAL -->
+        </ignore>
+    </Provider>
+    <!-- See ExternalCameraUtils.cpp for default values of Device configurations below
+-->
+    <Device>
+        <!-- Max JPEG buffer size in bytes-->
+        <MaxJpegBufferSize bytes="3145728"/> <!-- 3MB (~= 1080p YUV420) -->
+        <!-- Size of v4l2 buffer queue when streaming >= 30fps -->
+        <!-- Larger value: more request can be cached pipeline (less janky)  -->
+        <!-- Smaller value: use less memory -->
+        <NumVideoBuffers count="4"/>
+        <!-- Size of v4l2 buffer queue when streaming < 30fps -->
+        <NumStillBuffers count="2"/>
+
+        <!-- List of maximum fps for various output sizes -->
+        <!-- Any image size smaller than the size listed in Limit row will report
+            fps (as minimum frame duration) up to the fpsBound value. -->
+        <FpsList>
+            <!-- width/height must be increasing, fpsBound must be decreasing-->
+            <Limit width="640" height="480" fpsBound="30.0"/>
+            <Limit width="1280" height="720" fpsBound="15.0"/>
+            <Limit width="1920" height="1080" fpsBound="10.0"/>
+            <!-- image size larger than the last entry will not be supported-->
+        </FpsList>
+    </Device>
+</ExternalCamera>
+<!-- ############## END MIX-IN DEFINITIONS ############### -->
diff --git a/celadon/fstab b/celadon/fstab
index 80d908ce7..16e2663c8 100644
--- a/celadon/fstab
+++ b/celadon/fstab
@@ -3,7 +3,7 @@
 ##############################################################
 # Source: device/intel/mixins/groups/storage/sdcard-mmc0-usb-sd/fstab
 ##############################################################
-*/usb*/*/host*/*/block/sd*              auto             auto    defaults                                   voldmanaged=usbdisk:auto
+*/usb*/*/host*/*/block/sd*              auto             auto    defaults                                   voldmanaged=usbdisk:auto,encryptable=userdata
 */mmc0/*/block/mmcblk*                  auto             auto    defaults                                   voldmanaged=sdcard1:auto
 ##############################################################
 # Source: device/intel/mixins/groups/factory-partition/true/fstab
diff --git a/celadon/fstab.recovery b/celadon/fstab.recovery
index 3d4b9debb..88929d1e5 100644
--- a/celadon/fstab.recovery
+++ b/celadon/fstab.recovery
@@ -1,6 +1,12 @@
 # ----------------- BEGIN MIX-IN DEFINITIONS -----------------
 # Mix-In definitions are auto-generated by mixin-update
 ##############################################################
+# Source: device/intel/mixins/groups/storage/sdcard-mmc0-usb-sd/fstab.recovery
+##############################################################
+/dev/block/sda1                         /udiska          vfat    defaults                                   voldmanaged=udiska:auto
+/dev/block/sdb1                         /udiskb          vfat    defaults                                   voldmanaged=udiskb:auto
+/dev/block/mmcblk0p1                    /sdcard          vfat    defaults                                   voldmanaged=sdcard:auto
+##############################################################
 # Source: device/intel/mixins/groups/factory-partition/true/fstab.recovery
 ##############################################################
 /dev/block/by-name/factory      /factory        ext4    rw,noatime                                                  wait
diff --git a/celadon/init.rc b/celadon/init.rc
index cc117930e..cfd9ee904 100644
--- a/celadon/init.rc
+++ b/celadon/init.rc
@@ -474,6 +474,15 @@ on post-fs
     insmod /vendor/lib/modules/kernel/drivers/bluetooth/btrtl.ko
     insmod /vendor/lib/modules/kernel/drivers/bluetooth/btusb.ko
 ##############################################################
+# Source: device/intel/mixins/groups/disk-bus/auto/init.rc
+##############################################################
+on init
+    # Android creates by-name disk links with the disk controller
+    # in the generated path, so that the names pulled out of the GPT
+    # can be associated with the correct disk. Create a shortcut to
+    # /dev/block/by-name so that we can use the same fstabs everywhere.
+    exec u:r:set_storage:s0 root root -- /sbin/set_storage
+##############################################################
 # Source: device/intel/mixins/groups/factory-partition/true/init.rc
 ##############################################################
 # init.rc for telephony services specific to flashless platforms using /factory partition
@@ -570,19 +579,18 @@ on post-fs
 ##############################################################
 # Source: device/intel/mixins/groups/cpuset/autocores/init.rc
 ##############################################################
-on late-init
-    copy /sys/devices/system/cpu/online /dev/cpuset/foreground/cpus
-    copy /sys/devices/system/cpu/online /dev/cpuset/background/cpus
-    copy /sys/devices/system/cpu/online /dev/cpuset/system-background/cpus
-    copy /sys/devices/system/cpu/online /dev/cpuset/top-app/cpus
-    copy /sys/devices/system/cpu/online /dev/cpuset/foreground/boost/cpus
+on early-boot
+    # execute script to set initial CPU settings
+    # don't run as a service to avoid race conditions
+    exec - root system -- /vendor/bin/config_cpuset.sh
 ##############################################################
 # Source: device/intel/mixins/groups/rfkill/true/init.rc
 ##############################################################
 on boot
+    insmod ${ro.boot.moduleslocation}/rfkill-gpio.ko
     start rfkill-init
 
-service rfkill-init /system/bin/rfkill-init.sh
+service rfkill-init /vendor/bin/rfkill-init.sh 
     disabled
     user system
     group system
diff --git a/celadon/oemvars.txt b/celadon/oemvars.txt
index d4a47921d..f63725c6b 100644
--- a/celadon/oemvars.txt
+++ b/celadon/oemvars.txt
@@ -1,6 +1,10 @@
 # ----------------- BEGIN MIX-IN DEFINITIONS -----------------
 # Mix-In definitions are auto-generated by mixin-update
 ##############################################################
+# Source: device/intel/mixins/groups/2ndstage/oemvars/oemvars.txt
+##############################################################
+# This section may appear empty if magic_key_timeout is false
+##############################################################
 # Source: device/intel/mixins/groups/boot-arch/project-celadon/oemvars.txt
 ##############################################################
 # This section may appear empty if magic_key_timeout is false
diff --git a/celadon/ueventd.rc b/celadon/ueventd.rc
index b6e497c9d..8b0194bfe 100644
--- a/celadon/ueventd.rc
+++ b/celadon/ueventd.rc
@@ -72,6 +72,7 @@
 ##############################################################
 # i915 backlight driver
 /sys/devices/pci0000:00/0000:00:02.0/drm/card*/card*/intel_backlight brightness 0644 system system
+
 ##############################################################
 # Source: device/intel/mixins/groups/trusty/true/ueventd.rc
 ##############################################################

From f69aa8b1c723cad74f5597ce50ffa471ae5d44eb Mon Sep 17 00:00:00 2001
From: Nitin Rawat <nitin.rawat@intel.com>
Date: Mon, 19 Nov 2018 22:57:22 +0530
Subject: [PATCH 395/427] CTS Fix for SELinuxHostTest Failed in
 CtsSecurityHostTestCases

Description:
The wlan_intel_restore must be associated with the "coredomain"
attribute because they are executed off of /system

This patch fixs android.security.cts.SELinuxHostTest#testCoredomain
Violators testcase

Tracked-On: https://jira01.devtools.intel.com/browse/OAM-71816
Signed-off-by: Nitin Rawat <nitin.rawat@intel.com>
---
 sepolicy/wlan/iwlwifi/wlan_intel_restore.te | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sepolicy/wlan/iwlwifi/wlan_intel_restore.te b/sepolicy/wlan/iwlwifi/wlan_intel_restore.te
index 22964bf67..8e44bc764 100644
--- a/sepolicy/wlan/iwlwifi/wlan_intel_restore.te
+++ b/sepolicy/wlan/iwlwifi/wlan_intel_restore.te
@@ -2,7 +2,7 @@
 # wlan_intel_restore - does what?
 #
 
-type wlan_intel_restore, domain;
+type wlan_intel_restore, coredomain;
 type wlan_intel_restore_exec, file_type, exec_type, vendor_file_type;
 
 init_daemon_domain(wlan_intel_restore)

From d2ce06e69675d6fce7e7318e63430d48b39c11c4 Mon Sep 17 00:00:00 2001
From: "Yan, WalterX" <walterx.yan@intel.com>
Date: Wed, 14 Nov 2018 14:30:25 +0800
Subject: [PATCH 396/427] Fix the issue that kitchensink_app cannot send
 bluetooth msg

This issue relates with the AOSP Car service module, It'd better
put these rules to packages/services/Car/car_product/sepolicy/test.
Maybe we need to upstream this patch?

Tracked-On: OAM-71318
Signed-off-by: ji, zhenlong z zhenlong.z.ji@intel.com
Signed-off-by: Yan, WalterX <walterx.yan@intel.com>
---
 sepolicy/car/kitchensink_app.te | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 sepolicy/car/kitchensink_app.te

diff --git a/sepolicy/car/kitchensink_app.te b/sepolicy/car/kitchensink_app.te
new file mode 100644
index 000000000..343f6fb1a
--- /dev/null
+++ b/sepolicy/car/kitchensink_app.te
@@ -0,0 +1,3 @@
+userdebug_or_eng(`
+  allow kitchensink_app { textservices_service bluetooth_manager_service }:service_manager find;
+')

From 0b92dc809655cd5f3ee986cdfa209ce55395c97b Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Thu, 22 Nov 2018 17:00:12 +0530
Subject: [PATCH 397/427] Revert "[MIXINUP] Reduce logging after kernel boot-up
 #113"

This reverts commit 96135726c9cc4e36c36c7e39c4ed17489ea0ef8f.
---
 cel_apl/BoardConfig.mk | 11 +----------
 cel_apl/fstab          |  2 +-
 cel_apl/init.rc        |  1 -
 celadon/BoardConfig.mk |  9 ---------
 celadon/fstab          |  2 +-
 celadon/init.rc        |  1 -
 6 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index ad604b019..78fb07d3a 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -93,7 +93,7 @@ TARGET_SUPPORTS_64_BIT_APPS := true
 TARGET_PRELINK_MODULE := false
 TARGET_NO_KERNEL ?= false
 
-KERNEL_LOGLEVEL ?= 7
+KERNEL_LOGLEVEL ?= 3
 SERIAL_PARAMETER ?= console=tty0 console=ttyS0,115200n8
 
 
@@ -169,16 +169,7 @@ BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/config-partition
 
 TARGET_BOARD_PLATFORM := project-celadon
 
-ifeq (False,true)
-TARGET_USERIMAGES_USE_F2FS := true
-BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := f2fs
-INTERNAL_USERIMAGES_EXT_VARIANT := f2fs
-else
 TARGET_USERIMAGES_USE_EXT4 := true
-BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
-INTERNAL_USERIMAGES_EXT_VARIANT := ext4
-endif
-
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
 BOARD_FLASH_BLOCK_SIZE := 512
 
diff --git a/cel_apl/fstab b/cel_apl/fstab
index 01407f788..4c41eb98e 100644
--- a/cel_apl/fstab
+++ b/cel_apl/fstab
@@ -38,7 +38,7 @@
 
 # If enable AVB and A/B slot, then will mount system partition as / through /dev/dm-0
 /dev/block/by-name/system       /               ext4    ro                                                          wait,slotselect,avb
-/dev/block/by-name/data         /data           ext4     noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts,quota
+/dev/block/by-name/data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts,quota
 /dev/block/by-name/boot         /boot           emmc    defaults                                                    defaults,slotselect,avb
 /dev/block/by-name/misc         /misc           emmc    defaults                                                    defaults
 /dev/block/by-name/bootloader   /bootloader     emmc    defaults                                                    recoveryonly
diff --git a/cel_apl/init.rc b/cel_apl/init.rc
index cfd9ee904..dddddc8c6 100644
--- a/cel_apl/init.rc
+++ b/cel_apl/init.rc
@@ -45,7 +45,6 @@ on restart-ueventd
 on fs
     mkdir /dev/pstore 0755 root system
     mount pstore pstore /dev/pstore
-    write /proc/sys/kernel/printk 3
 
 on post-fs
     setprop ro.setupwizard.mode DISABLED
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index aaa4eb8d0..ebc8b02e0 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -173,16 +173,7 @@ BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/config-partition
 
 TARGET_BOARD_PLATFORM := project-celadon
 
-ifeq (False,true)
-TARGET_USERIMAGES_USE_F2FS := true
-BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := f2fs
-INTERNAL_USERIMAGES_EXT_VARIANT := f2fs
-else
 TARGET_USERIMAGES_USE_EXT4 := true
-BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
-INTERNAL_USERIMAGES_EXT_VARIANT := ext4
-endif
-
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
 BOARD_FLASH_BLOCK_SIZE := 512
 
diff --git a/celadon/fstab b/celadon/fstab
index 16e2663c8..4b623cad1 100644
--- a/celadon/fstab
+++ b/celadon/fstab
@@ -38,7 +38,7 @@
 
 # If enable AVB and A/B slot, then will mount system partition as / through /dev/dm-0
 /dev/block/by-name/system       /               ext4    ro                                                          wait,slotselect,avb
-/dev/block/by-name/data         /data           ext4     noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts,quota
+/dev/block/by-name/data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts,quota
 /dev/block/by-name/boot         /boot           emmc    defaults                                                    defaults,slotselect,avb
 /dev/block/by-name/misc         /misc           emmc    defaults                                                    defaults
 /dev/block/by-name/bootloader   /bootloader     emmc    defaults                                                    recoveryonly
diff --git a/celadon/init.rc b/celadon/init.rc
index cfd9ee904..dddddc8c6 100644
--- a/celadon/init.rc
+++ b/celadon/init.rc
@@ -45,7 +45,6 @@ on restart-ueventd
 on fs
     mkdir /dev/pstore 0755 root system
     mount pstore pstore /dev/pstore
-    write /proc/sys/kernel/printk 3
 
 on post-fs
     setprop ro.setupwizard.mode DISABLED

From 92570f0cdb6e77b0a0667a8e9b8feaefa3888820 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Thu, 22 Nov 2018 17:00:42 +0530
Subject: [PATCH 398/427] Revert "[CELADON] Change the logging during boot"

This reverts commit 0115b514cc8520d596c5f8f5d907f944025fd6f8.
---
 cel_apl/mixins.spec | 2 +-
 sepolicy/init.te    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/cel_apl/mixins.spec b/cel_apl/mixins.spec
index ff460f929..d8c89af23 100644
--- a/cel_apl/mixins.spec
+++ b/cel_apl/mixins.spec
@@ -16,7 +16,7 @@ storage: sdcard-mmc0-usb-sd(adoptablesd=true,adoptableusb=false)
 display-density: default
 usb-gadget: g_ffs
 adb_net: true
-kernel: project-celadon(loglevel=7, disable_cpuidle_on_boot=true)
+kernel: project-celadon(loglevel=3, disable_cpuidle_on_boot=true)
 bluetooth: btusb (ivi=true)
 boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true,ignore_not_applicable_reset=true,self_usb_device_mode_protocol=true)
 audio: project-celadon
diff --git a/sepolicy/init.te b/sepolicy/init.te
index c9bba2451..b459b0661 100644
--- a/sepolicy/init.te
+++ b/sepolicy/init.te
@@ -31,4 +31,3 @@ allow init debugfs_pstate:file w_file_perms;
 allow init userdata_block_device:blk_file write;
 allow init misc_block_device:blk_file write;
 allow init kernel:key search;
-allow init proc:file w_file_perms;

From 8b1e60f6bee390f87f3f9ce99f7f99ffcef5f4a6 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Thu, 22 Nov 2018 17:03:31 +0530
Subject: [PATCH 399/427] [MIXINUP] after reverting Reduce logging after kernel
 boot-up and support of f2fs enable

Tracked-On: None
---
 cel_apl/BoardConfig.mk | 9 +++++++++
 cel_apl/fstab          | 2 +-
 celadon/BoardConfig.mk | 9 +++++++++
 celadon/fstab          | 2 +-
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index 78fb07d3a..408b92733 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -169,7 +169,16 @@ BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/config-partition
 
 TARGET_BOARD_PLATFORM := project-celadon
 
+ifeq (False,true)
+TARGET_USERIMAGES_USE_F2FS := true
+BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := f2fs
+INTERNAL_USERIMAGES_EXT_VARIANT := f2fs
+else
 TARGET_USERIMAGES_USE_EXT4 := true
+BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
+INTERNAL_USERIMAGES_EXT_VARIANT := ext4
+endif
+
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
 BOARD_FLASH_BLOCK_SIZE := 512
 
diff --git a/cel_apl/fstab b/cel_apl/fstab
index 4c41eb98e..01407f788 100644
--- a/cel_apl/fstab
+++ b/cel_apl/fstab
@@ -38,7 +38,7 @@
 
 # If enable AVB and A/B slot, then will mount system partition as / through /dev/dm-0
 /dev/block/by-name/system       /               ext4    ro                                                          wait,slotselect,avb
-/dev/block/by-name/data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts,quota
+/dev/block/by-name/data         /data           ext4     noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts,quota
 /dev/block/by-name/boot         /boot           emmc    defaults                                                    defaults,slotselect,avb
 /dev/block/by-name/misc         /misc           emmc    defaults                                                    defaults
 /dev/block/by-name/bootloader   /bootloader     emmc    defaults                                                    recoveryonly
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index ebc8b02e0..aaa4eb8d0 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -173,7 +173,16 @@ BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/config-partition
 
 TARGET_BOARD_PLATFORM := project-celadon
 
+ifeq (False,true)
+TARGET_USERIMAGES_USE_F2FS := true
+BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := f2fs
+INTERNAL_USERIMAGES_EXT_VARIANT := f2fs
+else
 TARGET_USERIMAGES_USE_EXT4 := true
+BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
+INTERNAL_USERIMAGES_EXT_VARIANT := ext4
+endif
+
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
 BOARD_FLASH_BLOCK_SIZE := 512
 
diff --git a/celadon/fstab b/celadon/fstab
index 4b623cad1..16e2663c8 100644
--- a/celadon/fstab
+++ b/celadon/fstab
@@ -38,7 +38,7 @@
 
 # If enable AVB and A/B slot, then will mount system partition as / through /dev/dm-0
 /dev/block/by-name/system       /               ext4    ro                                                          wait,slotselect,avb
-/dev/block/by-name/data         /data           ext4    noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts,quota
+/dev/block/by-name/data         /data           ext4     noatime,nosuid,nodev,discard,noauto_da_alloc,errors=panic   wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts,quota
 /dev/block/by-name/boot         /boot           emmc    defaults                                                    defaults,slotselect,avb
 /dev/block/by-name/misc         /misc           emmc    defaults                                                    defaults
 /dev/block/by-name/bootloader   /bootloader     emmc    defaults                                                    recoveryonly

From 096fe8afe63a5c695db0df356952973824afe5ab Mon Sep 17 00:00:00 2001
From: Harshita Goswami <harshita.goswami@intel.com>
Date: Fri, 23 Nov 2018 01:11:52 +0530
Subject: [PATCH 400/427] Set config_enableWifiDisplay to false

Wifi Display has dependency on wifi direct and
wifi Direct will work when wifi vendor hal is supported.
Intel doesnot have wifi vendor hal implementation,
Hence disabled config_enableWifiDisplay flag to false
to disable wifi direct so that Concurrencytest will pass.

Tracked-On: OAM-71339
Signed-off-by: Harshita Goswami <harshita.goswami@intel.com>
---
 common/overlay/frameworks/base/core/res/res/values/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/overlay/frameworks/base/core/res/res/values/config.xml b/common/overlay/frameworks/base/core/res/res/values/config.xml
index 009ab4a8b..448c1b795 100644
--- a/common/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/common/overlay/frameworks/base/core/res/res/values/config.xml
@@ -80,7 +80,7 @@
          * The remote submix module "audio.r_submix.default" must be installed on the device.
          * The device must be provisioned with HDCP keys (for protected content).
     -->
-    <bool name="config_enableWifiDisplay">true</bool>
+    <bool name="config_enableWifiDisplay">false</bool>
 
     <string-array translatable="false" name="config_globalActionsList">
         <item>power</item>

From 5b5fd42d9296f8f704c2352d06959eb554404b83 Mon Sep 17 00:00:00 2001
From: Muhammad Aksar <muhammad.aksar@intel.com>
Date: Fri, 16 Nov 2018 17:37:32 +0530
Subject: [PATCH 401/427] USB Camera: Change UVC driver as built-in module

Make the UVC driver as built-in instead of LKM

Tracked-On: OAM-71785

Signed-off-by: Muhammad Aksar <muhammad.aksar@intel.com>
---
 kernel_config/kernel_64_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 14d6a2543..321f8186a 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -3548,7 +3548,7 @@ CONFIG_MEDIA_USB_SUPPORT=y
 #
 # Webcam devices
 #
-CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS=y
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 # CONFIG_USB_GSPCA is not set
 # CONFIG_USB_PWC is not set

From 5d3c6c910578b83a37b6e0b253e7e71562779a13 Mon Sep 17 00:00:00 2001
From: Muhammad Aksar <muhammad.aksar@intel.com>
Date: Fri, 23 Nov 2018 11:32:06 +0530
Subject: [PATCH 402/427] USB Camera: Add support for 720p HD preview at 30fps

Support for 720@30fps on External Camera HAL

Tracked-On: OAM-72082

Signed-off-by: Muhammad Aksar <muhammad.aksar@intel.com>
---
 common/camera-ext/external_camera_config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/camera-ext/external_camera_config.xml b/common/camera-ext/external_camera_config.xml
index 7cf8b39af..adbf8258b 100644
--- a/common/camera-ext/external_camera_config.xml
+++ b/common/camera-ext/external_camera_config.xml
@@ -37,7 +37,7 @@
         <FpsList>
             <!-- width/height must be increasing, fpsBound must be decreasing-->
             <Limit width="640" height="480" fpsBound="30.0"/>
-            <Limit width="1280" height="720" fpsBound="15.0"/>
+            <Limit width="1280" height="720" fpsBound="30.0"/>
             <Limit width="1920" height="1080" fpsBound="10.0"/>
             <!-- image size larger than the last entry will not be supported-->
         </FpsList>

From 2c313d9303d8383c37c2f95be39f02c8b939997e Mon Sep 17 00:00:00 2001
From: ysiyer <yegnesh.s.iyer@intel.com>
Date: Wed, 21 Nov 2018 15:35:36 +0530
Subject: [PATCH 403/427] Health-HAL: Adding health hal for celadon

Current celadon platforms are not battery operated systems.
Android 9 onwards, the battery less devices status reporting has
changed. This caused cts failures.

Ref: https://source.android.com/devices/tech/power/batteryless
+-------------------------------------------------------------------------------+
|  Battery State             |  Android 9 and higher  |  Android 8.1 and lower  |
+-------------------------------------------------------------------------------+
|  Present                   |    false               |    true                 |
|  Status                    |    unknown             |    charging             |
|  Remaining Capacity        |    0                   |    100                  |
|  Health                    |    unknown             |    good                 |
|  AC charger online status  |    not modified        |    forced to true       |
+-------------------------------------------------------------------------------+

As per google's recommendation, OEMs can implement HAL to
overcome/report the status as desired.

Tracked-On: OAM-71291
Signed-off-by: Liu, PengX <pengx.liu@intel.com>
Signed-off-by: ysiyer <yegnesh.s.iyer@intel.com>
---
 cel_apl/mixins.spec                           |   1 +
 celadon/mixins.spec                           |   1 +
 health/Android.bp                             |  93 ++++++
 health/Health.cpp                             | 292 ++++++++++++++++++
 health/HealthService.cpp                      |  95 ++++++
 health/HealthServiceCommon.cpp                |  93 ++++++
 ...oid.hardware.health@2.0-service.celadon.rc |   5 +
 health/healthd_common.cpp                     | 276 +++++++++++++++++
 health/include/health2/Health.h               |  78 +++++
 health/include/health2/powerSupplyType.h      |  24 ++
 health/include/health2/service.h              |  23 ++
 manifest.xml                                  |  10 +-
 sepolicy/health_hal/file.te                   |   3 +
 sepolicy/health_hal/file_contexts             |   2 +
 sepolicy/health_hal/hal_health2_0_default.te  |   5 +
 15 files changed, 1000 insertions(+), 1 deletion(-)
 create mode 100644 health/Android.bp
 create mode 100644 health/Health.cpp
 create mode 100644 health/HealthService.cpp
 create mode 100644 health/HealthServiceCommon.cpp
 create mode 100644 health/android.hardware.health@2.0-service.celadon.rc
 create mode 100644 health/healthd_common.cpp
 create mode 100644 health/include/health2/Health.h
 create mode 100644 health/include/health2/powerSupplyType.h
 create mode 100644 health/include/health2/service.h
 create mode 100644 sepolicy/health_hal/file.te
 create mode 100644 sepolicy/health_hal/file_contexts
 create mode 100644 sepolicy/health_hal/hal_health2_0_default.te

diff --git a/cel_apl/mixins.spec b/cel_apl/mixins.spec
index d8c89af23..5c71718d8 100644
--- a/cel_apl/mixins.spec
+++ b/cel_apl/mixins.spec
@@ -47,6 +47,7 @@ camera-ext: ext-camera-only
 memtrack: true
 touch: galax7200
 avb: true
+health: true
 slot-ab: true
 art-config: default
 gptbuild: true(size=14G)
diff --git a/celadon/mixins.spec b/celadon/mixins.spec
index 9a3d15031..1cc5d6f87 100644
--- a/celadon/mixins.spec
+++ b/celadon/mixins.spec
@@ -48,6 +48,7 @@ camera-ext: ext-camera-only
 memtrack: true
 touch: galax7200
 avb: true
+health: true
 slot-ab: true
 art-config: default
 gptbuild: true(size=14G)
diff --git a/health/Android.bp b/health/Android.bp
new file mode 100644
index 000000000..6996d6617
--- /dev/null
+++ b/health/Android.bp
@@ -0,0 +1,93 @@
+cc_library_static {
+    name: "android.hardware.health@2.0-impl.celadon",
+    vendor_available: true,
+    defaults: ["hidl_defaults"],
+    srcs: [
+        "Health.cpp",
+        "healthd_common.cpp",
+    ],
+
+    cflags: ["-DHEALTHD_USE_HEALTH_2_0"],
+
+
+    shared_libs: [
+        "libbase",
+        "libhidlbase",
+        "libhidltransport",
+        "libhwbinder",
+        "liblog",
+        "libutils",
+        "libcutils",
+        "android.hardware.health@2.0",
+    ],
+
+    export_include_dirs: ["include"],
+
+    static_libs: [
+        "libbatterymonitor",
+        "android.hardware.health@1.0-convert",
+    ],
+}
+
+cc_library_static {
+    name: "libhealthservice.celadon",
+    vendor_available: true,
+    srcs: ["HealthServiceCommon.cpp"],
+
+
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
+    shared_libs: [
+        "android.hardware.health@2.0",
+    ],
+    static_libs: [
+        "android.hardware.health@2.0-impl.celadon",
+        "android.hardware.health@1.0-convert",
+    ],
+    export_static_lib_headers: [
+        "android.hardware.health@1.0-convert",
+    ],
+    export_include_dirs: ["include"],
+    header_libs: ["libhealthd_headers"],
+    export_header_lib_headers: ["libhealthd_headers"],
+}
+
+
+cc_binary {
+	      name: "android.hardware.health@2.0-service.celadon",
+	      overrides: ["healthd"],
+	      init_rc: ["android.hardware.health@2.0-service.celadon.rc"],
+	      proprietary: true,
+	      relative_install_path: "hw",
+	      srcs: [
+		      "HealthService.cpp",
+	      ],
+
+	      cflags: [
+		      "-Wall",
+		      "-Werror",
+	      ],
+
+	      static_libs: [
+		      "android.hardware.health@1.0-convert",
+		      "android.hardware.health@2.0-impl.celadon",
+		      "libhealthservice.celadon",
+		      "libbatterymonitor",
+ 		      "libhealthstoragedefault",
+	      ],
+
+	      shared_libs: [
+		      "libbase",
+		      "libcutils",
+		      "libhidlbase",
+		      "libhidltransport",
+		      "libhwbinder",
+		      "libutils",
+		      "android.hardware.health@2.0",
+	      ],
+
+	      header_libs: ["libhealthd_headers"],
+}
+
diff --git a/health/Health.cpp b/health/Health.cpp
new file mode 100644
index 000000000..29de64866
--- /dev/null
+++ b/health/Health.cpp
@@ -0,0 +1,292 @@
+/*
+ * Copyright (C) 2018 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.health@2.0-impl.celadon"
+#include <android-base/logging.h>
+
+#include <android-base/file.h>
+#include <health2/Health.h>
+#include <health2/powerSupplyType.h>
+
+#include <hal_conversion.h>
+#include <hidl/HidlTransportSupport.h>
+
+extern void healthd_battery_update_internal(bool);
+extern unsigned int platformPowerSupplyType;
+
+namespace android {
+namespace hardware {
+namespace health {
+namespace V2_0 {
+namespace implementation {
+
+sp<Health> Health::instance_;
+Health::Health(struct healthd_config* c) {
+    // TODO(b/69268160): remove when libhealthd is removed.
+    healthd_board_init(c);
+    battery_monitor_ = std::make_unique<BatteryMonitor>();
+    battery_monitor_->init(c);
+}
+
+// Methods from IHealth follow.
+Return<Result> Health::registerCallback(const sp<IHealthInfoCallback>& callback) {
+    if (callback == nullptr) {
+        return Result::SUCCESS;
+    }
+
+    {
+        std::lock_guard<std::mutex> _lock(callbacks_lock_);
+        callbacks_.push_back(callback);
+        // unlock
+    }
+
+    auto linkRet = callback->linkToDeath(this, 0u /* cookie */);
+    if (!linkRet.withDefault(false)) {
+        LOG(WARNING) << __func__ << "Cannot link to death: "
+                     << (linkRet.isOk() ? "linkToDeath returns false" : linkRet.description());
+        // ignore the error
+    }
+
+    return update();
+}
+
+bool Health::unregisterCallbackInternal(const sp<IBase>& callback) {
+    if (callback == nullptr) return false;
+
+    bool removed = false;
+    std::lock_guard<std::mutex> _lock(callbacks_lock_);
+    for (auto it = callbacks_.begin(); it != callbacks_.end();) {
+        if (interfacesEqual(*it, callback)) {
+            it = callbacks_.erase(it);
+            removed = true;
+        } else {
+            ++it;
+        }
+    }
+    (void)callback->unlinkToDeath(this).isOk();  // ignore errors
+    return removed;
+}
+
+Return<Result> Health::unregisterCallback(const sp<IHealthInfoCallback>& callback) {
+    return unregisterCallbackInternal(callback) ? Result::SUCCESS : Result::NOT_FOUND;
+}
+
+template <typename T>
+void getProperty(const std::unique_ptr<BatteryMonitor>& monitor, int id, T defaultValue,
+                 const std::function<void(Result, T)>& callback) {
+    struct BatteryProperty prop;
+    T ret = defaultValue;
+    Result result = Result::SUCCESS;
+    if (platformPowerSupplyType == CONSTANT_POWER)
+	    result = Result::NOT_SUPPORTED;
+    else{
+	    status_t err = monitor->getProperty(static_cast<int>(id), &prop);
+	    if (err != OK) {
+		    LOG(DEBUG) << "getProperty(" << id << ")"
+			    << " fails: (" << err << ") " << strerror(-err);
+	    } else {
+		    ret = static_cast<T>(prop.valueInt64);
+	    }
+	    switch (err) {
+		    case OK:
+			    result = Result::SUCCESS;
+			    break;
+		    case NAME_NOT_FOUND:
+			    result = Result::NOT_SUPPORTED;
+			    break;
+		    default:
+			    result = Result::UNKNOWN;
+			    break;
+	    }
+    }
+    callback(result, static_cast<T>(ret));
+}
+
+Return<void> Health::getChargeCounter(getChargeCounter_cb _hidl_cb) {
+    getProperty<int32_t>(battery_monitor_, BATTERY_PROP_CHARGE_COUNTER, 0, _hidl_cb);
+    return Void();
+}
+
+Return<void> Health::getCurrentNow(getCurrentNow_cb _hidl_cb) {
+    getProperty<int32_t>(battery_monitor_, BATTERY_PROP_CURRENT_NOW, 0, _hidl_cb);
+    return Void();
+}
+
+Return<void> Health::getCurrentAverage(getCurrentAverage_cb _hidl_cb) {
+    getProperty<int32_t>(battery_monitor_, BATTERY_PROP_CURRENT_AVG, 0, _hidl_cb);
+    return Void();
+}
+
+Return<void> Health::getCapacity(getCapacity_cb _hidl_cb) {
+    getProperty<int32_t>(battery_monitor_, BATTERY_PROP_CAPACITY, 0, _hidl_cb);
+    return Void();
+}
+
+Return<void> Health::getEnergyCounter(getEnergyCounter_cb _hidl_cb) {
+    getProperty<int64_t>(battery_monitor_, BATTERY_PROP_ENERGY_COUNTER, 0, _hidl_cb);
+    return Void();
+}
+
+Return<void> Health::getChargeStatus(getChargeStatus_cb _hidl_cb) {
+    getProperty(battery_monitor_, BATTERY_PROP_BATTERY_STATUS, BatteryStatus::UNKNOWN, _hidl_cb);
+    return Void();
+}
+
+Return<Result> Health::update() {
+    if (!healthd_mode_ops || !healthd_mode_ops->battery_update) {
+        LOG(WARNING) << "health@2.0: update: not initialized. "
+                     << "update() should not be called in charger / recovery.";
+        return Result::UNKNOWN;
+    }
+
+    // Retrieve all information and call healthd_mode_ops->battery_update, which calls
+    // notifyListeners.
+    bool chargerOnline = battery_monitor_->update();
+
+    // adjust uevent / wakealarm periods
+    healthd_battery_update_internal(chargerOnline);
+
+    return Result::SUCCESS;
+}
+
+void Health::notifyListeners(HealthInfo* healthInfo) {
+    std::vector<StorageInfo> info;
+    get_storage_info(info);
+
+    std::vector<DiskStats> stats;
+    get_disk_stats(stats);
+
+    int32_t currentAvg = 0;
+
+    struct BatteryProperty prop;
+    status_t ret = battery_monitor_->getProperty(BATTERY_PROP_CURRENT_AVG, &prop);
+    if (ret == OK) {
+        currentAvg = static_cast<int32_t>(prop.valueInt64);
+    }
+
+    healthInfo->batteryCurrentAverage = currentAvg;
+    healthInfo->diskStats = stats;
+    healthInfo->storageInfos = info;
+
+    std::lock_guard<std::mutex> _lock(callbacks_lock_);
+    for (auto it = callbacks_.begin(); it != callbacks_.end();) {
+        auto ret = (*it)->healthInfoChanged(*healthInfo);
+        if (!ret.isOk() && ret.isDeadObject()) {
+            it = callbacks_.erase(it);
+        } else {
+            ++it;
+        }
+    }
+}
+
+Return<void> Health::debug(const hidl_handle& handle, const hidl_vec<hidl_string>&) {
+    if (handle != nullptr && handle->numFds >= 1) {
+        int fd = handle->data[0];
+        battery_monitor_->dumpState(fd);
+
+        getHealthInfo([fd](auto res, const auto& info) {
+            android::base::WriteStringToFd("\ngetHealthInfo -> ", fd);
+            if (res == Result::SUCCESS) {
+                android::base::WriteStringToFd(toString(info), fd);
+            } else {
+                android::base::WriteStringToFd(toString(res), fd);
+            }
+            android::base::WriteStringToFd("\n", fd);
+        });
+
+        fsync(fd);
+    }
+    return Void();
+}
+
+Return<void> Health::getStorageInfo(getStorageInfo_cb _hidl_cb) {
+    std::vector<struct StorageInfo> info;
+    get_storage_info(info);
+    hidl_vec<struct StorageInfo> info_vec(info);
+    if (!info.size()) {
+        _hidl_cb(Result::NOT_SUPPORTED, info_vec);
+    } else {
+        _hidl_cb(Result::SUCCESS, info_vec);
+    }
+    return Void();
+}
+
+Return<void> Health::getDiskStats(getDiskStats_cb _hidl_cb) {
+    std::vector<struct DiskStats> stats;
+    get_disk_stats(stats);
+    hidl_vec<struct DiskStats> stats_vec(stats);
+    if (!stats.size()) {
+        _hidl_cb(Result::NOT_SUPPORTED, stats_vec);
+    } else {
+        _hidl_cb(Result::SUCCESS, stats_vec);
+    }
+    return Void();
+}
+
+Return<void> Health::getHealthInfo(getHealthInfo_cb _hidl_cb) {
+    using android::hardware::health::V1_0::hal_conversion::convertToHealthInfo;
+    using android::hardware::health::V1_0::BatteryStatus;
+    using android::hardware::health::V1_0::BatteryHealth;
+
+    update();
+    struct android::BatteryProperties p = getBatteryProperties(battery_monitor_.get());
+    V1_0::HealthInfo batteryInfo;
+    convertToHealthInfo(&p, batteryInfo);
+    std::vector<StorageInfo> info;
+    get_storage_info(info);
+
+    std::vector<DiskStats> stats;
+    get_disk_stats(stats);
+
+    int32_t currentAvg = 0;
+
+    struct BatteryProperty prop;
+    status_t ret = battery_monitor_->getProperty(BATTERY_PROP_CURRENT_AVG, &prop);
+    if (ret == OK) {
+        currentAvg = static_cast<int32_t>(prop.valueInt64);
+    }
+
+    V2_0::HealthInfo healthInfo = {};
+    healthInfo.legacy = std::move(batteryInfo);
+    healthInfo.batteryCurrentAverage = currentAvg;
+    healthInfo.diskStats = stats;
+    healthInfo.storageInfos = info;
+
+    _hidl_cb(Result::SUCCESS, healthInfo);
+    return Void();
+}
+
+void Health::serviceDied(uint64_t /* cookie */, const wp<IBase>& who) {
+    (void)unregisterCallbackInternal(who.promote());
+}
+
+sp<IHealth> Health::initInstance(struct healthd_config* c) {
+    if (instance_ == nullptr) {
+        instance_ = new Health(c);
+    }
+    return instance_;
+}
+
+sp<Health> Health::getImplementation() {
+    CHECK(instance_ != nullptr);
+    return instance_;
+}
+
+}  // namespace implementation
+}  // namespace V2_0
+}  // namespace health
+}  // namespace hardware
+}  // namespace android
+
diff --git a/health/HealthService.cpp b/health/HealthService.cpp
new file mode 100644
index 000000000..d278741ee
--- /dev/null
+++ b/health/HealthService.cpp
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2018 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.health@2.0-service.celadon"
+#include <android-base/logging.h>
+
+#include <healthd/healthd.h>
+#include <health2/Health.h>
+#include <health2/service.h>
+#include <health2/powerSupplyType.h>
+#include <hidl/HidlTransportSupport.h>
+
+#include <utils/String8.h>
+#include <cutils/klog.h>
+#include <android-base/file.h>
+#include <android-base/strings.h>
+
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <vector>
+#include <stdio.h>
+
+
+using android::hardware::health::V1_0::BatteryStatus;
+using android::hardware::health::V1_0::BatteryHealth;
+using namespace android;
+#define POWER_SUPPLY_SUBSYSTEM "power_supply"
+#define POWER_SUPPLY_SYSFS_PATH "/sys/class/" POWER_SUPPLY_SUBSYSTEM
+
+unsigned int platformPowerSupplyType = BATTERY;
+
+void healthd_board_init(struct healthd_config*)
+{
+	String8 path;
+
+	DIR* dir = opendir(POWER_SUPPLY_SYSFS_PATH);
+	if (dir == NULL) {
+		KLOG_ERROR(LOG_TAG, "Could not open %s\n", POWER_SUPPLY_SYSFS_PATH);
+	} else {
+		struct dirent* entry;
+
+		while ((entry = readdir(dir))) {
+			const char* name = entry->d_name;
+
+			if (!strcmp(name, ".") || !strcmp(name, "..")){
+				platformPowerSupplyType = CONSTANT_POWER;
+				continue;
+			}else
+				platformPowerSupplyType = BATTERY;
+		}
+
+	}
+	closedir(dir);
+}
+
+int healthd_board_battery_update(struct android::BatteryProperties *props)
+{
+
+	if (platformPowerSupplyType == CONSTANT_POWER) {
+		props->batteryStatus = android::BATTERY_STATUS_FULL;
+		props->batteryHealth = android::BATTERY_HEALTH_GOOD;
+		props->batteryLevel = 100;
+		props->batteryChargeCounter= 1000000;
+		props->batteryCurrent= 1000000;
+		props->chargerAcOnline = true;
+		props->chargerUsbOnline= false;
+		props->chargerWirelessOnline = false;
+		props->maxChargingCurrent= 2500000;
+		props->maxChargingVoltage= 4300000;
+		props->batteryPresent= true;
+		props->batteryVoltage= 1200000;
+		props->batteryTemperature= 25;
+		props->batteryFullCharge= 4200000;
+	} else
+		UNUSED(props);
+	return 0;
+}
+
+int main(void) {
+    return health_service_main();
+}
+
diff --git a/health/HealthServiceCommon.cpp b/health/HealthServiceCommon.cpp
new file mode 100644
index 000000000..385f211e9
--- /dev/null
+++ b/health/HealthServiceCommon.cpp
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2017 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 "health@2.0/"
+#include <android-base/logging.h>
+
+#include <android/hardware/health/1.0/types.h>
+#include <hal_conversion.h>
+#include <health2/Health.h>
+#include <health2/service.h>
+#include <healthd/healthd.h>
+#include <hidl/HidlTransportSupport.h>
+
+using android::hardware::IPCThreadState;
+using android::hardware::configureRpcThreadpool;
+using android::hardware::handleTransportPoll;
+using android::hardware::setupTransportPolling;
+using android::hardware::health::V2_0::HealthInfo;
+using android::hardware::health::V1_0::hal_conversion::convertToHealthInfo;
+using android::hardware::health::V2_0::IHealth;
+using android::hardware::health::V2_0::implementation::Health;
+
+extern int healthd_main(void);
+
+static int gBinderFd = -1;
+static std::string gInstanceName;
+
+static void binder_event(uint32_t /*epevents*/) {
+    if (gBinderFd >= 0) handleTransportPoll(gBinderFd);
+}
+
+void healthd_mode_service_2_0_init(struct healthd_config* config) {
+    LOG(INFO) << LOG_TAG << gInstanceName << " Hal is starting up...";
+
+    gBinderFd = setupTransportPolling();
+
+    if (gBinderFd >= 0) {
+        if (healthd_register_event(gBinderFd, binder_event))
+            LOG(ERROR) << LOG_TAG << gInstanceName << ": Register for binder events failed";
+    }
+
+    android::sp<IHealth> service = Health::initInstance(config);
+    CHECK_EQ(service->registerAsService(gInstanceName), android::OK)
+        << LOG_TAG << gInstanceName << ": Failed to register HAL";
+
+    LOG(INFO) << LOG_TAG << gInstanceName << ": Hal init done";
+}
+
+int healthd_mode_service_2_0_preparetowait(void) {
+    IPCThreadState::self()->flushCommands();
+    return -1;
+}
+
+void healthd_mode_service_2_0_heartbeat(void) {
+    // noop
+}
+
+void healthd_mode_service_2_0_battery_update(struct android::BatteryProperties* prop) {
+    HealthInfo info;
+    convertToHealthInfo(prop, info.legacy);
+    Health::getImplementation()->notifyListeners(&info);
+}
+
+static struct healthd_mode_ops healthd_mode_service_2_0_ops = {
+    .init = healthd_mode_service_2_0_init,
+    .preparetowait = healthd_mode_service_2_0_preparetowait,
+    .heartbeat = healthd_mode_service_2_0_heartbeat,
+    .battery_update = healthd_mode_service_2_0_battery_update,
+};
+
+int health_service_main(const char* instance) {
+    gInstanceName = instance;
+    if (gInstanceName.empty()) {
+        gInstanceName = "default";
+    }
+    healthd_mode_ops = &healthd_mode_service_2_0_ops;
+    LOG(INFO) << LOG_TAG << gInstanceName << ": Hal starting main loop...";
+    return healthd_main();
+}
+
diff --git a/health/android.hardware.health@2.0-service.celadon.rc b/health/android.hardware.health@2.0-service.celadon.rc
new file mode 100644
index 000000000..9917bb61b
--- /dev/null
+++ b/health/android.hardware.health@2.0-service.celadon.rc
@@ -0,0 +1,5 @@
+service vendor.health-hal-2-0 /vendor/bin/hw/android.hardware.health@2.0-service.celadon
+  class hal
+  user system
+  group system
+  file /dev/kmsg w
diff --git a/health/healthd_common.cpp b/health/healthd_common.cpp
new file mode 100644
index 000000000..05089b07b
--- /dev/null
+++ b/health/healthd_common.cpp
@@ -0,0 +1,276 @@
+/*
+ * Copyright (C) 2013 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.health@2.0-impl.celadon"
+#define KLOG_LEVEL 6
+
+#include <healthd/BatteryMonitor.h>
+#include <healthd/healthd.h>
+
+#include <batteryservice/BatteryService.h>
+#include <cutils/klog.h>
+#include <cutils/uevent.h>
+#include <errno.h>
+#include <libgen.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/epoll.h>
+#include <sys/timerfd.h>
+#include <unistd.h>
+#include <utils/Errors.h>
+
+#include <health2/Health.h>
+
+using namespace android;
+
+// Periodic chores fast interval in seconds
+#define DEFAULT_PERIODIC_CHORES_INTERVAL_FAST (60 * 1)
+// Periodic chores fast interval in seconds
+#define DEFAULT_PERIODIC_CHORES_INTERVAL_SLOW (60 * 10)
+
+static struct healthd_config healthd_config = {
+    .periodic_chores_interval_fast = DEFAULT_PERIODIC_CHORES_INTERVAL_FAST,
+    .periodic_chores_interval_slow = DEFAULT_PERIODIC_CHORES_INTERVAL_SLOW,
+    .batteryStatusPath = String8(String8::kEmptyString),
+    .batteryHealthPath = String8(String8::kEmptyString),
+    .batteryPresentPath = String8(String8::kEmptyString),
+    .batteryCapacityPath = String8(String8::kEmptyString),
+    .batteryVoltagePath = String8(String8::kEmptyString),
+    .batteryTemperaturePath = String8(String8::kEmptyString),
+    .batteryTechnologyPath = String8(String8::kEmptyString),
+    .batteryCurrentNowPath = String8(String8::kEmptyString),
+    .batteryCurrentAvgPath = String8(String8::kEmptyString),
+    .batteryChargeCounterPath = String8(String8::kEmptyString),
+    .batteryFullChargePath = String8(String8::kEmptyString),
+    .batteryCycleCountPath = String8(String8::kEmptyString),
+    .energyCounter = NULL,
+    .boot_min_cap = 0,
+    .screen_on = NULL,
+};
+
+static int eventct;
+static int epollfd;
+
+#define POWER_SUPPLY_SUBSYSTEM "power_supply"
+
+// epoll_create() parameter is actually unused
+#define MAX_EPOLL_EVENTS 40
+static int uevent_fd;
+static int wakealarm_fd;
+
+// -1 for no epoll timeout
+static int awake_poll_interval = -1;
+
+static int wakealarm_wake_interval = DEFAULT_PERIODIC_CHORES_INTERVAL_FAST;
+
+using ::android::hardware::health::V2_0::implementation::Health;
+
+struct healthd_mode_ops* healthd_mode_ops = nullptr;
+
+int healthd_register_event(int fd, void (*handler)(uint32_t), EventWakeup wakeup) {
+    struct epoll_event ev;
+
+    ev.events = EPOLLIN;
+
+    if (wakeup == EVENT_WAKEUP_FD) ev.events |= EPOLLWAKEUP;
+
+    ev.data.ptr = (void*)handler;
+    if (epoll_ctl(epollfd, EPOLL_CTL_ADD, fd, &ev) == -1) {
+        KLOG_ERROR(LOG_TAG, "epoll_ctl failed; errno=%d\n", errno);
+        return -1;
+    }
+
+    eventct++;
+    return 0;
+}
+
+static void wakealarm_set_interval(int interval) {
+    struct itimerspec itval;
+
+    if (wakealarm_fd == -1) return;
+
+    wakealarm_wake_interval = interval;
+
+    if (interval == -1) interval = 0;
+
+    itval.it_interval.tv_sec = interval;
+    itval.it_interval.tv_nsec = 0;
+    itval.it_value.tv_sec = interval;
+    itval.it_value.tv_nsec = 0;
+
+    if (timerfd_settime(wakealarm_fd, 0, &itval, NULL) == -1)
+        KLOG_ERROR(LOG_TAG, "wakealarm_set_interval: timerfd_settime failed\n");
+}
+
+void healthd_battery_update_internal(bool charger_online) {
+    // Fast wake interval when on charger (watch for overheat);
+    // slow wake interval when on battery (watch for drained battery).
+
+    int new_wake_interval = charger_online ? healthd_config.periodic_chores_interval_fast
+                                           : healthd_config.periodic_chores_interval_slow;
+
+    if (new_wake_interval != wakealarm_wake_interval) wakealarm_set_interval(new_wake_interval);
+
+    // During awake periods poll at fast rate.  If wake alarm is set at fast
+    // rate then just use the alarm; if wake alarm is set at slow rate then
+    // poll at fast rate while awake and let alarm wake up at slow rate when
+    // asleep.
+
+    if (healthd_config.periodic_chores_interval_fast == -1)
+        awake_poll_interval = -1;
+    else
+        awake_poll_interval = new_wake_interval == healthd_config.periodic_chores_interval_fast
+                                  ? -1
+                                  : healthd_config.periodic_chores_interval_fast * 1000;
+}
+
+static void healthd_battery_update(void) {
+    Health::getImplementation()->update();
+}
+
+static void periodic_chores() {
+    healthd_battery_update();
+}
+
+#define UEVENT_MSG_LEN 2048
+static void uevent_event(uint32_t /*epevents*/) {
+    char msg[UEVENT_MSG_LEN + 2];
+    char* cp;
+    int n;
+
+    n = uevent_kernel_multicast_recv(uevent_fd, msg, UEVENT_MSG_LEN);
+    if (n <= 0) return;
+    if (n >= UEVENT_MSG_LEN) /* overflow -- discard */
+        return;
+
+    msg[n] = '\0';
+    msg[n + 1] = '\0';
+    cp = msg;
+
+    while (*cp) {
+        if (!strcmp(cp, "SUBSYSTEM=" POWER_SUPPLY_SUBSYSTEM)) {
+            healthd_battery_update();
+            break;
+        }
+
+        /* advance to after the next \0 */
+        while (*cp++)
+            ;
+    }
+}
+
+static void uevent_init(void) {
+    uevent_fd = uevent_open_socket(64 * 1024, true);
+
+    if (uevent_fd < 0) {
+        KLOG_ERROR(LOG_TAG, "uevent_init: uevent_open_socket failed\n");
+        return;
+    }
+
+    fcntl(uevent_fd, F_SETFL, O_NONBLOCK);
+    if (healthd_register_event(uevent_fd, uevent_event, EVENT_WAKEUP_FD))
+        KLOG_ERROR(LOG_TAG, "register for uevent events failed\n");
+}
+
+static void wakealarm_event(uint32_t /*epevents*/) {
+    unsigned long long wakeups;
+
+    if (read(wakealarm_fd, &wakeups, sizeof(wakeups)) == -1) {
+        KLOG_ERROR(LOG_TAG, "wakealarm_event: read wakealarm fd failed\n");
+        return;
+    }
+
+    periodic_chores();
+}
+
+static void wakealarm_init(void) {
+    wakealarm_fd = timerfd_create(CLOCK_BOOTTIME_ALARM, TFD_NONBLOCK);
+    if (wakealarm_fd == -1) {
+        KLOG_ERROR(LOG_TAG, "wakealarm_init: timerfd_create failed\n");
+        return;
+    }
+
+    if (healthd_register_event(wakealarm_fd, wakealarm_event, EVENT_WAKEUP_FD))
+        KLOG_ERROR(LOG_TAG, "Registration of wakealarm event failed\n");
+
+    wakealarm_set_interval(healthd_config.periodic_chores_interval_fast);
+}
+
+static void healthd_mainloop(void) {
+    int nevents = 0;
+    while (1) {
+        struct epoll_event events[eventct];
+        int timeout = awake_poll_interval;
+        int mode_timeout;
+
+        /* Don't wait for first timer timeout to run periodic chores */
+        if (!nevents) periodic_chores();
+
+        healthd_mode_ops->heartbeat();
+
+        mode_timeout = healthd_mode_ops->preparetowait();
+        if (timeout < 0 || (mode_timeout > 0 && mode_timeout < timeout)) timeout = mode_timeout;
+        nevents = epoll_wait(epollfd, events, eventct, timeout);
+        if (nevents == -1) {
+            if (errno == EINTR) continue;
+            KLOG_ERROR(LOG_TAG, "healthd_mainloop: epoll_wait failed\n");
+            break;
+        }
+
+        for (int n = 0; n < nevents; ++n) {
+            if (events[n].data.ptr) (*(void (*)(int))events[n].data.ptr)(events[n].events);
+        }
+    }
+
+    return;
+}
+
+static int healthd_init() {
+    epollfd = epoll_create(MAX_EPOLL_EVENTS);
+    if (epollfd == -1) {
+        KLOG_ERROR(LOG_TAG, "epoll_create failed; errno=%d\n", errno);
+        return -1;
+    }
+
+    healthd_mode_ops->init(&healthd_config);
+    wakealarm_init();
+    uevent_init();
+
+    return 0;
+}
+
+int healthd_main() {
+    int ret;
+
+    klog_set_level(KLOG_LEVEL);
+
+    if (!healthd_mode_ops) {
+        KLOG_ERROR("healthd ops not set, exiting\n");
+        exit(1);
+    }
+
+    ret = healthd_init();
+    if (ret) {
+        KLOG_ERROR("Initialization failed, exiting\n");
+        exit(2);
+    }
+
+    healthd_mainloop();
+    KLOG_ERROR("Main loop terminated, exiting\n");
+    return 3;
+}
+
diff --git a/health/include/health2/Health.h b/health/include/health2/Health.h
new file mode 100644
index 000000000..fe6c3dff7
--- /dev/null
+++ b/health/include/health2/Health.h
@@ -0,0 +1,78 @@
+#ifndef ANDROID_HARDWARE_HEALTH_V2_0_HEALTH_H
+#define ANDROID_HARDWARE_HEALTH_V2_0_HEALTH_H
+
+#include <memory>
+#include <vector>
+
+#include <android/hardware/health/1.0/types.h>
+#include <android/hardware/health/2.0/IHealth.h>
+#include <healthd/BatteryMonitor.h>
+#include <hidl/Status.h>
+
+using android::hardware::health::V2_0::StorageInfo;
+using android::hardware::health::V2_0::DiskStats;
+
+void get_storage_info(std::vector<struct StorageInfo>& info);
+void get_disk_stats(std::vector<struct DiskStats>& stats);
+
+namespace android {
+namespace hardware {
+namespace health {
+namespace V2_0 {
+namespace implementation {
+
+using V1_0::BatteryStatus;
+
+using ::android::hidl::base::V1_0::IBase;
+
+struct Health : public IHealth, hidl_death_recipient {
+   public:
+    static sp<IHealth> initInstance(struct healthd_config* c);
+    // Should only be called by implementation itself (-impl, -service).
+    // Clients should not call this function. Instead, initInstance() initializes and returns the
+    // global instance that has fewer functions.
+    // TODO(b/62229583): clean up and hide these functions after update() logic is simplified.
+    static sp<Health> getImplementation();
+
+    Health(struct healthd_config* c);
+
+    // TODO(b/62229583): clean up and hide these functions after update() logic is simplified.
+    void notifyListeners(HealthInfo* info);
+
+    // Methods from IHealth follow.
+    Return<Result> registerCallback(const sp<IHealthInfoCallback>& callback) override;
+    Return<Result> unregisterCallback(const sp<IHealthInfoCallback>& callback) override;
+    Return<Result> update() override;
+    Return<void> getChargeCounter(getChargeCounter_cb _hidl_cb) override;
+    Return<void> getCurrentNow(getCurrentNow_cb _hidl_cb) override;
+    Return<void> getCurrentAverage(getCurrentAverage_cb _hidl_cb) override;
+    Return<void> getCapacity(getCapacity_cb _hidl_cb) override;
+    Return<void> getEnergyCounter(getEnergyCounter_cb _hidl_cb) override;
+    Return<void> getChargeStatus(getChargeStatus_cb _hidl_cb) override;
+    Return<void> getStorageInfo(getStorageInfo_cb _hidl_cb) override;
+    Return<void> getDiskStats(getDiskStats_cb _hidl_cb) override;
+    Return<void> getHealthInfo(getHealthInfo_cb _hidl_cb) override;
+
+    // Methods from ::android::hidl::base::V1_0::IBase follow.
+    Return<void> debug(const hidl_handle& fd, const hidl_vec<hidl_string>& args) override;
+
+    void serviceDied(uint64_t cookie, const wp<IBase>& /* who */) override;
+
+   private:
+    static sp<Health> instance_;
+
+    std::mutex callbacks_lock_;
+    std::vector<sp<IHealthInfoCallback>> callbacks_;
+    std::unique_ptr<BatteryMonitor> battery_monitor_;
+
+    bool unregisterCallbackInternal(const sp<IBase>& cb);
+};
+
+}  // namespace implementation
+}  // namespace V2_0
+}  // namespace health
+}  // namespace hardware
+}  // namespace android
+
+#endif  // ANDROID_HARDWARE_HEALTH_V2_0_HEALTH_H
+
diff --git a/health/include/health2/powerSupplyType.h b/health/include/health2/powerSupplyType.h
new file mode 100644
index 000000000..fdf47402f
--- /dev/null
+++ b/health/include/health2/powerSupplyType.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2018 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_POWER_SUPPLY_TYPE
+#define ANDROID_HARDWARE_POWER_SUPPLY_TYPE
+
+enum  powerType {
+        CONSTANT_POWER = 0,
+        BATTERY,
+};
+#endif  // ANDROID_HARDWARE_POWER_SUPPLY_TYPE
diff --git a/health/include/health2/service.h b/health/include/health2/service.h
new file mode 100644
index 000000000..0abff41d9
--- /dev/null
+++ b/health/include/health2/service.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2018 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_HEALTH_V2_0_SERVICE_COMMON
+#define ANDROID_HARDWARE_HEALTH_V2_0_SERVICE_COMMON
+
+int health_service_main(const char* instance = "");
+
+#endif  // ANDROID_HARDWARE_HEALTH_V2_0_SERVICE_COMMON
+
diff --git a/manifest.xml b/manifest.xml
index 5d1cd3762..1514dcca8 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -129,5 +129,13 @@
               <instance>sample-all</instance>
           </interface>
     </hal>
-
+    <hal format="hidl">
+        <name>android.hardware.health</name>
+        <transport>hwbinder</transport>
+        <version>2.0</version>
+        <interface>
+            <name>IHealth</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
 </manifest>
diff --git a/sepolicy/health_hal/file.te b/sepolicy/health_hal/file.te
new file mode 100644
index 000000000..813d4f187
--- /dev/null
+++ b/sepolicy/health_hal/file.te
@@ -0,0 +1,3 @@
+# health_hal files
+type sysfs_health2_0_management, fs_type, sysfs_type;
+
diff --git a/sepolicy/health_hal/file_contexts b/sepolicy/health_hal/file_contexts
new file mode 100644
index 000000000..988d0de8c
--- /dev/null
+++ b/sepolicy/health_hal/file_contexts
@@ -0,0 +1,2 @@
+/vendor/bin/hw/android\.hardware\.health@2\.0-service\.celadon          u:object_r:hal_health_default_exec:s0
+
diff --git a/sepolicy/health_hal/hal_health2_0_default.te b/sepolicy/health_hal/hal_health2_0_default.te
new file mode 100644
index 000000000..65500b79f
--- /dev/null
+++ b/sepolicy/health_hal/hal_health2_0_default.te
@@ -0,0 +1,5 @@
+# health info abstraction
+
+allow hal_health_default sysfs_health2_0_management:dir r_dir_perms;
+allow hal_health_default sysfs_health2_0_management:file rw_file_perms;
+allow hal_health_default sysfs_health2_0_management:lnk_file r_file_perms;

From 3ef66e78c9a348db690bd5daeb315e6f2b018a41 Mon Sep 17 00:00:00 2001
From: buildslave <ctbbot@intel.com>
Date: Tue, 27 Nov 2018 08:50:05 +0000
Subject: [PATCH 404/427] mixin updates

Disable Wifi Direct
Wifi Direct will work when wifi vendor hal is supported.
Intel doesnot have wifi vendor hal implementation,
Hence to pass Concurrencytest, wifi direct is disabled.
Celadon porting mixins [debug-logs]
Health-HAL: Adding health hal for celadon
Current celadon platforms are not battery operated systems.
Android 9 onwards, the battery less devices status reporting has
changed. This caused cts failures.
Ref: https://source.android.com/devices/tech/power/batteryless
+-------------------------------------------------------------------------------+
|  Battery State             |  Android 9 and higher  |  Android 8.1 and lower  |
+-------------------------------------------------------------------------------+
|  Present                   |    false               |    true                 |
|  Status                    |    unknown             |    charging             |
|  Remaining Capacity        |    0                   |    100                  |
|  Health                    |    unknown             |    good                 |
|  AC charger online status  |    not modified        |    forced to true       |
+-------------------------------------------------------------------------------+
As per google's recommendation, OEMs can implement HAL to
overcome/report the status as desired.
Health-HAL: Enabling health hal in mixins
Current celadon platforms are not battery operated systems.
Android 9 onwards, the battery less devices status reporting has
changed. This caused cts failures.
Ref: https://source.android.com/devices/tech/power/batteryless
+-------------------------------------------------------------------------------+
|  Battery State             |  Android 9 and higher  |  Android 8.1 and lower  |
+-------------------------------------------------------------------------------+
|  Present                   |    false               |    true                 |
|  Status                    |    unknown             |    charging             |
|  Remaining Capacity        |    0                   |    100                  |
|  Health                    |    unknown             |    good                 |
|  AC charger online status  |    not modified        |    forced to true       |
+-------------------------------------------------------------------------------+
As per google's recommendation, OEMs can implement HAL to
overcome/report the status as desired.

Change-Id: Ia7e3e6ce179d91300413f94a9259ff49292ecf80
Tracked-On: OAM-71291
Tracked-On: OAM-71339
Tracked-On: OAM-72056
Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/119
Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/120
Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/121
Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia/pull/164
Signed-off-by: Harshita Goswami <harshita.goswami@intel.com>
Signed-off-by: Liu, PengX <pengx.liu@intel.com>
Signed-off-by: raghupatelraj <rugnath.ram@intel.com>
Signed-off-by: sgnanase <sundar.gnanasekaran@intel.com>
Signed-off-by: ysiyer <yegnesh.s.iyer@intel.com>
---
 cel_apl/BoardConfig.mk   |  9 ++++++++-
 cel_apl/device.mk        | 13 +++++++++----
 cel_apl/init.coredump.rc |  2 +-
 cel_apl/init.logs.rc     | 26 ++++++++++++++++----------
 celadon/BoardConfig.mk   |  9 ++++++++-
 celadon/device.mk        | 13 +++++++++----
 celadon/init.coredump.rc |  2 +-
 celadon/init.logs.rc     | 26 ++++++++++++++++----------
 8 files changed, 68 insertions(+), 32 deletions(-)

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index 408b92733..5f8a03403 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -404,7 +404,7 @@ BOARD_KERNEL_CMDLINE += \
 # Source: device/intel/mixins/groups/debug-phonedoctor/true/BoardConfig.mk
 ##############################################################
 BOARD_SEPOLICY_M4DEFS += module_debug_phonedoctor=true
-BOARD_SEPOLICY_DIRS += device/intel/androidia/sepolicy/debug-phonedoctor
+BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/debug-phonedoctor
 ##############################################################
 # Source: device/intel/mixins/groups/flashfiles/ini/BoardConfig.mk
 ##############################################################
@@ -465,6 +465,13 @@ BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/camera-ext/ext-came
 ##############################################################
 BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/memtrack
 ##############################################################
+# Source: device/intel/mixins/groups/health/true/BoardConfig.mk
+##############################################################
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/health_hal
+
+DEVICE_FRAMEWORK_MANIFEST_FILE += \
+				system/libhidl/vintfdata/manifest_healthd_exclude.xml
+##############################################################
 # Source: device/intel/mixins/groups/gptbuild/true/BoardConfig.mk
 ##############################################################
 # can't use := here, as PRODUCT_OUT is not defined yet
diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 93f550704..7c3e94ea9 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -501,8 +501,7 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
         device/intel/common/wlan/wpa_supplicant-common.conf:system/etc/wifi/wpa_supplicant.conf \
         device/intel/common/wlan/iwlwifi/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \
-        frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
-        frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml
+        frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml 
 
 
 
@@ -587,7 +586,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.intel.logger=/system/bin/logcat
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += logd.kernel.raw_message=False
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.intel.logger.rot_cnt=20
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.intel.logger.rot_size=5000
-BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/debug-logs
+BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/debug-logs
 BOARD_SEPOLICY_M4DEFS += module_debug_logs=true
 endif
 ##############################################################
@@ -620,7 +619,7 @@ PRODUCT_COPY_FILES += $(LOCAL_PATH)/init.coredump.rc:root/init.coredump.rc
 endif
 
 ifeq ($(MIXIN_DEBUG_LOGS),true)
-BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/coredump
+BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/coredump
 # Enable core dump for eng builds
 ifeq ($(TARGET_BUILD_VARIANT),eng)
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.core.enabled=1
@@ -711,6 +710,12 @@ PRODUCT_COPY_FILES += \
         frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:vendor/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml\
         $(INTEL_PATH_COMMON)/touch/Vendor_0eef_Product_7200.idc:system/usr/idc/Vendor_0eef_Product_7200.idc
 ##############################################################
+# Source: device/intel/mixins/groups/health/true/product.mk
+##############################################################
+PRODUCT_PACKAGES += health
+PRODUCT_PACKAGES += health.$(TARGET_BOARD_PLATFORM) \
+					android.hardware.health@2.0-service.celadon
+##############################################################
 # Source: device/intel/mixins/groups/art-config/default/product.mk
 ##############################################################
 # This is needed to enable silver art optimizer.
diff --git a/cel_apl/init.coredump.rc b/cel_apl/init.coredump.rc
index 6263c89ca..75ecbc71c 100644
--- a/cel_apl/init.coredump.rc
+++ b/cel_apl/init.coredump.rc
@@ -11,11 +11,11 @@ on early-init
 
 on post-fs-data
     mkdir /data/core 0773 root log
-    write /proc/sys/kernel/core_pattern /data/core/%t_%p_%s_%e.core
 
 on property:persist.core.enabled=0
     setrlimit 4 0 0
 
 on property:persist.core.enabled=1
     setrlimit 4 -1 -1
+    write /proc/sys/kernel/core_pattern /data/core/%t_%p_%s_%e.core
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/cel_apl/init.logs.rc b/cel_apl/init.logs.rc
index 04907eae8..6901e4416 100644
--- a/cel_apl/init.logs.rc
+++ b/cel_apl/init.logs.rc
@@ -7,27 +7,31 @@ on post-fs-data
     mkdir /data/logs 0770 system log
 
 on property:persist.service.aplogfs.enable=0
-    stop ap_logfs
+    stop vendor.ap_logfs
 
 on property:persist.service.aplogfs.enable=1
     setprop persist.service.apklogfs.enable 0
-    restart ap_log_srv
+    restart vendor.ap_log_srv
 
 on property:persist.service.apklogfs.enable=0
-    stop apk_logfs
+    stop vendor.apk_logfs
 
 on property:persist.service.apklogfs.enable=1
     setprop persist.service.aplogfs.enable 0
-    restart ap_log_srv
+    restart vendor.ap_log_srv
 
-service apk_logfs /system/vendor/bin/logcat_ep.sh auto \
+service vendor.apk_logfs /vendor/bin/logcat_ep.sh auto \
         -b main -b system -b radio -b events -b crash -b kernel \
         -v threadtime -f /data/logs/aplog
+    user root
+    group root log
     disabled
 
-service ap_logfs /system/vendor/bin/logcat_ep.sh auto \
+service vendor.ap_logfs /vendor/bin/logcat_ep.sh auto \
         -b main -b system -b radio -b events -b crash \
         -v threadtime -f /data/logs/aplog
+    user root
+    group root log
     disabled
 
 # Service called at boot time after data is decrypted
@@ -35,19 +39,21 @@ service ap_logfs /system/vendor/bin/logcat_ep.sh auto \
 # This is done through the late_start class or through persist properties
 # that are only available after data is decrypted.
 # The service may be called again when the properties are updated.
-service ap_log_srv /system/vendor/bin/start_log_srv.sh
+service vendor.ap_log_srv /vendor/bin/start_log_srv.sh
+    user root
+    group root log
     class late_start
     oneshot
 
-service earlylogs /system/vendor/bin/elogs.sh
+service vendor.earlylogs /vendor/bin/elogs.sh
     class core
     oneshot
 
 on nonencrypted
-    stop earlylogs
+    stop vendor.earlylogs
 
 on property:vold.decrypt=trigger_restart_framework
-    stop earlylogs
+    stop vendor.earlylogs
 
 on property:persist.service.elogs.enable=1
     mkdir /cache/elogs 0770 system log
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index aaa4eb8d0..ed896f3d9 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -408,7 +408,7 @@ BOARD_KERNEL_CMDLINE += \
 # Source: device/intel/mixins/groups/debug-phonedoctor/true/BoardConfig.mk
 ##############################################################
 BOARD_SEPOLICY_M4DEFS += module_debug_phonedoctor=true
-BOARD_SEPOLICY_DIRS += device/intel/androidia/sepolicy/debug-phonedoctor
+BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/debug-phonedoctor
 ##############################################################
 # Source: device/intel/mixins/groups/flashfiles/ini/BoardConfig.mk
 ##############################################################
@@ -469,6 +469,13 @@ BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/camera-ext/ext-came
 ##############################################################
 BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/memtrack
 ##############################################################
+# Source: device/intel/mixins/groups/health/true/BoardConfig.mk
+##############################################################
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/health_hal
+
+DEVICE_FRAMEWORK_MANIFEST_FILE += \
+				system/libhidl/vintfdata/manifest_healthd_exclude.xml
+##############################################################
 # Source: device/intel/mixins/groups/gptbuild/true/BoardConfig.mk
 ##############################################################
 # can't use := here, as PRODUCT_OUT is not defined yet
diff --git a/celadon/device.mk b/celadon/device.mk
index 450ce6378..bc6b4a0be 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -500,8 +500,7 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
         device/intel/common/wlan/wpa_supplicant-common.conf:system/etc/wifi/wpa_supplicant.conf \
         device/intel/common/wlan/iwlwifi/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \
-        frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
-        frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml
+        frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml 
 
 
 
@@ -586,7 +585,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.intel.logger=/system/bin/logcat
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += logd.kernel.raw_message=False
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.intel.logger.rot_cnt=20
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.intel.logger.rot_size=5000
-BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/debug-logs
+BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/debug-logs
 BOARD_SEPOLICY_M4DEFS += module_debug_logs=true
 endif
 ##############################################################
@@ -619,7 +618,7 @@ PRODUCT_COPY_FILES += $(LOCAL_PATH)/init.coredump.rc:root/init.coredump.rc
 endif
 
 ifeq ($(MIXIN_DEBUG_LOGS),true)
-BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/coredump
+BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/coredump
 # Enable core dump for eng builds
 ifeq ($(TARGET_BUILD_VARIANT),eng)
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.core.enabled=1
@@ -710,6 +709,12 @@ PRODUCT_COPY_FILES += \
         frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:vendor/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml\
         $(INTEL_PATH_COMMON)/touch/Vendor_0eef_Product_7200.idc:system/usr/idc/Vendor_0eef_Product_7200.idc
 ##############################################################
+# Source: device/intel/mixins/groups/health/true/product.mk
+##############################################################
+PRODUCT_PACKAGES += health
+PRODUCT_PACKAGES += health.$(TARGET_BOARD_PLATFORM) \
+					android.hardware.health@2.0-service.celadon
+##############################################################
 # Source: device/intel/mixins/groups/art-config/default/product.mk
 ##############################################################
 # This is needed to enable silver art optimizer.
diff --git a/celadon/init.coredump.rc b/celadon/init.coredump.rc
index 6263c89ca..75ecbc71c 100644
--- a/celadon/init.coredump.rc
+++ b/celadon/init.coredump.rc
@@ -11,11 +11,11 @@ on early-init
 
 on post-fs-data
     mkdir /data/core 0773 root log
-    write /proc/sys/kernel/core_pattern /data/core/%t_%p_%s_%e.core
 
 on property:persist.core.enabled=0
     setrlimit 4 0 0
 
 on property:persist.core.enabled=1
     setrlimit 4 -1 -1
+    write /proc/sys/kernel/core_pattern /data/core/%t_%p_%s_%e.core
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/celadon/init.logs.rc b/celadon/init.logs.rc
index 04907eae8..6901e4416 100644
--- a/celadon/init.logs.rc
+++ b/celadon/init.logs.rc
@@ -7,27 +7,31 @@ on post-fs-data
     mkdir /data/logs 0770 system log
 
 on property:persist.service.aplogfs.enable=0
-    stop ap_logfs
+    stop vendor.ap_logfs
 
 on property:persist.service.aplogfs.enable=1
     setprop persist.service.apklogfs.enable 0
-    restart ap_log_srv
+    restart vendor.ap_log_srv
 
 on property:persist.service.apklogfs.enable=0
-    stop apk_logfs
+    stop vendor.apk_logfs
 
 on property:persist.service.apklogfs.enable=1
     setprop persist.service.aplogfs.enable 0
-    restart ap_log_srv
+    restart vendor.ap_log_srv
 
-service apk_logfs /system/vendor/bin/logcat_ep.sh auto \
+service vendor.apk_logfs /vendor/bin/logcat_ep.sh auto \
         -b main -b system -b radio -b events -b crash -b kernel \
         -v threadtime -f /data/logs/aplog
+    user root
+    group root log
     disabled
 
-service ap_logfs /system/vendor/bin/logcat_ep.sh auto \
+service vendor.ap_logfs /vendor/bin/logcat_ep.sh auto \
         -b main -b system -b radio -b events -b crash \
         -v threadtime -f /data/logs/aplog
+    user root
+    group root log
     disabled
 
 # Service called at boot time after data is decrypted
@@ -35,19 +39,21 @@ service ap_logfs /system/vendor/bin/logcat_ep.sh auto \
 # This is done through the late_start class or through persist properties
 # that are only available after data is decrypted.
 # The service may be called again when the properties are updated.
-service ap_log_srv /system/vendor/bin/start_log_srv.sh
+service vendor.ap_log_srv /vendor/bin/start_log_srv.sh
+    user root
+    group root log
     class late_start
     oneshot
 
-service earlylogs /system/vendor/bin/elogs.sh
+service vendor.earlylogs /vendor/bin/elogs.sh
     class core
     oneshot
 
 on nonencrypted
-    stop earlylogs
+    stop vendor.earlylogs
 
 on property:vold.decrypt=trigger_restart_framework
-    stop earlylogs
+    stop vendor.earlylogs
 
 on property:persist.service.elogs.enable=1
     mkdir /cache/elogs 0770 system log

From 7d19d210eea626f9f50e79abe67e2e20d7f69e2e Mon Sep 17 00:00:00 2001
From: xinanlux <xinanx.luo@intel.com>
Date: Fri, 23 Nov 2018 14:41:44 +0800
Subject: [PATCH 405/427] Remove sepolicy rules for logsvc

Remove bellow rule for logsvc to fix cts test errors:
allow logsvc self:capability { dac_override sys_nice };

Tracked-On: https://jira01.devtools.intel.com/browse/OAM-71987
Signed-off-by: Xinanx, Luo xinanx.luo@intel.com
---
 sepolicy/debug-logs/logsvc.te | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sepolicy/debug-logs/logsvc.te b/sepolicy/debug-logs/logsvc.te
index 2ca07f367..ba9b6c54e 100644
--- a/sepolicy/debug-logs/logsvc.te
+++ b/sepolicy/debug-logs/logsvc.te
@@ -4,10 +4,12 @@ type logsvc_exec, exec_type, file_type;
 
 init_daemon_domain(logsvc);
 
+permissive logsvc;
+
 allow logsvc system_file:file x_file_perms;
 allow logsvc shell_exec:file rx_file_perms;
 
-allow logsvc self:capability { dac_override sys_nice };
+dontaudit logsvc self:capability { dac_override sys_nice };
 allow logsvc self:capability2 syslog;
 
 allow logsvc log_file:file create_file_perms;

From f1af5a2f44b625958ee8f69830dcddd46e2b0a32 Mon Sep 17 00:00:00 2001
From: xinanlux <xinanx.luo@intel.com>
Date: Fri, 23 Nov 2018 14:33:01 +0800
Subject: [PATCH 406/427] Remove sepolicy rule for dumpstate_dropbox

Remove bellow rule for dumpstate_dropbox to fix cts test errors:
allow dumpstate_dropbox self:capability { chown dac_override };

Tracked-On: https://jira01.devtools.intel.com/browse/OAM-71987
Signed-off-by: Xinanx, Luo <xinanx.luo@intel.com>
---
 sepolicy/crashlogd/dumpstate_dropbox.te | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sepolicy/crashlogd/dumpstate_dropbox.te b/sepolicy/crashlogd/dumpstate_dropbox.te
index a1de12457..f746f79aa 100644
--- a/sepolicy/crashlogd/dumpstate_dropbox.te
+++ b/sepolicy/crashlogd/dumpstate_dropbox.te
@@ -6,7 +6,7 @@ userdebug_or_eng(`
 
   permissive dumpstate_dropbox;
 
-  allow dumpstate_dropbox self:capability { chown dac_override };
+  dontaudit dumpstate_dropbox self:capability { chown dac_override };
   allow dumpstate_dropbox system_server:binder call;
 
   allow domain dumpstate_dropbox:fd use;

From 7205234811471b03353d7fd77035addaadf44a32 Mon Sep 17 00:00:00 2001
From: "ji, zhenlong z" <zhenlong.z.ji@intel.com>
Date: Wed, 21 Nov 2018 15:58:29 +0800
Subject: [PATCH 407/427] Fix the neverallow violations

There are lots of neverallow violations during the cts
test, we need to remove the related rules.

Tracked-On: OAM-71989
Signed-off-by: ji, zhenlong z <zhenlong.z.ji@intel.com>
---
 sepolicy/domain.te                            |  2 --
 sepolicy/file.te                              |  1 -
 .../graphics/project-celadon/appdomain.te     |  2 +-
 sepolicy/init.te                              |  2 --
 sepolicy/kernel/appdomain.te                  |  1 -
 sepolicy/kernel/domain.te                     | 22 +++++++++++++++++++
 sepolicy/kernel/init.te                       |  3 +--
 sepolicy/kernel/installd.te                   |  1 -
 sepolicy/kernel/system_server.te              |  2 --
 sepolicy/kernel/vold.te                       |  1 -
 sepolicy/kernel/zygote.te                     |  1 -
 11 files changed, 24 insertions(+), 14 deletions(-)
 delete mode 100644 sepolicy/domain.te
 create mode 100644 sepolicy/kernel/domain.te
 delete mode 100644 sepolicy/kernel/installd.te
 delete mode 100644 sepolicy/kernel/vold.te
 delete mode 100644 sepolicy/kernel/zygote.te

diff --git a/sepolicy/domain.te b/sepolicy/domain.te
deleted file mode 100644
index bddbd2f93..000000000
--- a/sepolicy/domain.te
+++ /dev/null
@@ -1,2 +0,0 @@
-allow domain sysfs_socinfo:dir r_dir_perms;
-allow domain sysfs_socinfo:file r_file_perms;
diff --git a/sepolicy/file.te b/sepolicy/file.te
index 1e43945e4..2d0967a34 100644
--- a/sepolicy/file.te
+++ b/sepolicy/file.te
@@ -5,5 +5,4 @@ type sysfs_thermal_writable, fs_type, sysfs_type;
 type atvr_device, dev_type;
 type sysfs_coretemp, fs_type, sysfs_type;
 type gpu_pid_stats_file, fs_type, debugfs_type;
-type sysfs_socinfo, sysfs_type, fs_type;
 type debugfs_pstate, fs_type, debugfs_type;
diff --git a/sepolicy/graphics/project-celadon/appdomain.te b/sepolicy/graphics/project-celadon/appdomain.te
index fe7d3d296..8e085c698 100644
--- a/sepolicy/graphics/project-celadon/appdomain.te
+++ b/sepolicy/graphics/project-celadon/appdomain.te
@@ -3,5 +3,5 @@
 allow appdomain hal_graphics_allocator_default_tmpfs:file { read write map };
 allow appdomain hal_graphics_composer_default_tmpfs:file { read write map };
 allow appdomain gpu_device:dir r_dir_perms;
-allow appdomain sysfs_app_readable:file r_file_perms;
+allow { appdomain -isolated_app } sysfs_app_readable:file r_file_perms;
 allow appdomain app_fuse_file:file map;
diff --git a/sepolicy/init.te b/sepolicy/init.te
index b459b0661..79de5abac 100644
--- a/sepolicy/init.te
+++ b/sepolicy/init.te
@@ -14,13 +14,11 @@ allow init tmpfs:lnk_file create_file_perms;
 # set attributes on /sys/class/gpio sym link
 # chmod 0770 /sys/class/gpio/gpio66
 allow init sysfs:lnk_file setattr;
-allow init sysfs:dir { write add_name };
 # userspace cannot create files in sys. ignore denial
 dontaudit init sysfs_devices_system_cpu:dir write;
 allow init { cache_file storage_file }:dir mounton;
 # /config
 allow init configfs:{ file lnk_file } create_file_perms;
-allow init cgroup:file create;
 allow init sw_sync_device:file { relabelto setattr read write open ioctl };
 allow init sysfs:file create;
 allow init devpts:chr_file { ioctl };
diff --git a/sepolicy/kernel/appdomain.te b/sepolicy/kernel/appdomain.te
index 964be21aa..198b776f0 100644
--- a/sepolicy/kernel/appdomain.te
+++ b/sepolicy/kernel/appdomain.te
@@ -1,2 +1 @@
-allow appdomain proc_version:file r_file_perms;
 allow appdomain self:icmp_socket create_socket_perms_no_ioctl;
diff --git a/sepolicy/kernel/domain.te b/sepolicy/kernel/domain.te
new file mode 100644
index 000000000..92d84902b
--- /dev/null
+++ b/sepolicy/kernel/domain.te
@@ -0,0 +1,22 @@
+dontaudit {
+	dnsmasq
+	dumpstate
+	init
+	installd
+	install_recovery
+	lmkd
+	netd
+	perfprofd
+	postinstall_dexopt
+	recovery
+	sdcardd
+	tee
+	ueventd
+	uncrypt
+	vendor_init
+	vold
+	vold_prepare_subdirs
+	zygote
+} self:capability dac_read_search;
+
+allow domain vendor_configs_file:file map;
diff --git a/sepolicy/kernel/init.te b/sepolicy/kernel/init.te
index d67837348..79d5ddb64 100644
--- a/sepolicy/kernel/init.te
+++ b/sepolicy/kernel/init.te
@@ -6,11 +6,10 @@ allow init {
   vendor_file
 }:system module_load;
 
-allow init sysfs_devices_system_cpu:dir rw_dir_perms;
+allow init sysfs_devices_system_cpu:dir r_dir_perms;
 allow init sysfs_devices_system_cpu:file create_file_perms;
 allow init tmpfs:lnk_file create_file_perms;
 allow init configfs:{ file lnk_file } create_file_perms;
-allow init self:capability dac_read_search;
 allow init self:capability sys_module;
 allow init self:capability2 block_suspend;
 
diff --git a/sepolicy/kernel/installd.te b/sepolicy/kernel/installd.te
deleted file mode 100644
index 3208a1ecc..000000000
--- a/sepolicy/kernel/installd.te
+++ /dev/null
@@ -1 +0,0 @@
-allow installd self:capability dac_read_search;
diff --git a/sepolicy/kernel/system_server.te b/sepolicy/kernel/system_server.te
index ab658b2b6..d68dca54c 100644
--- a/sepolicy/kernel/system_server.te
+++ b/sepolicy/kernel/system_server.te
@@ -2,8 +2,6 @@
 # system_server
 #
 
-allow system_server proc_version:file r_file_perms;
-
 allow system_server audioserver:file rw_file_perms;
 allow system_server system_app:file rw_file_perms;
 
diff --git a/sepolicy/kernel/vold.te b/sepolicy/kernel/vold.te
deleted file mode 100644
index 7438b0038..000000000
--- a/sepolicy/kernel/vold.te
+++ /dev/null
@@ -1 +0,0 @@
-allow vold self:capability dac_read_search;
diff --git a/sepolicy/kernel/zygote.te b/sepolicy/kernel/zygote.te
deleted file mode 100644
index 7d91e5bb0..000000000
--- a/sepolicy/kernel/zygote.te
+++ /dev/null
@@ -1 +0,0 @@
-allow zygote self:capability dac_read_search;

From 97a974be6aff453d3ded8c4bb619fb0f89e5b603 Mon Sep 17 00:00:00 2001
From: ysiyer <yegnesh.s.iyer@intel.com>
Date: Fri, 23 Nov 2018 19:26:29 +0530
Subject: [PATCH 408/427] thermal-daemon: Moving the data dir to vendor

As per VNDK rules, data files directory for vendor apps should
be in vendor folder. Hence moving data dir from /data/misc to
/data/vendor folder.

Tracked-On: OAM-71986
Signed-off-by: ysiyer <yegnesh.s.iyer@intel.com>
---
 sepolicy/thermal/thermal-daemon/file.te           | 4 ++--
 sepolicy/thermal/thermal-daemon/file_contexts     | 2 +-
 sepolicy/thermal/thermal-daemon/init.te           | 4 ++--
 sepolicy/thermal/thermal-daemon/thermal-daemon.te | 4 ++++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/sepolicy/thermal/thermal-daemon/file.te b/sepolicy/thermal/thermal-daemon/file.te
index 9a43b7c36..3214575c8 100644
--- a/sepolicy/thermal/thermal-daemon/file.te
+++ b/sepolicy/thermal/thermal-daemon/file.te
@@ -1,4 +1,4 @@
-type thermal-daemon_data_file, file_type, data_file_type;
+type thermal-daemon_data_file, vendor_file_type, file_type;
 type sysfs_dmi_id, fs_type, sysfs_type;
 type sysfs_backlight_thermal, fs_type, sysfs_type;
-type thermal-daemon_run_dir, fs_type, data_file_type;
+type thermal-daemon_run_dir, file_type, data_file_type;
diff --git a/sepolicy/thermal/thermal-daemon/file_contexts b/sepolicy/thermal/thermal-daemon/file_contexts
index 0e91532ce..f70550a68 100644
--- a/sepolicy/thermal/thermal-daemon/file_contexts
+++ b/sepolicy/thermal/thermal-daemon/file_contexts
@@ -1,6 +1,6 @@
 /vendor/bin/thermal-daemon        u:object_r:thermal-daemon_exec:s0
 /vendor/etc/thermal_daemon(/.*)?        u:object_r:thermal-daemon_data_file:s0
-/data/misc/thermal-daemon(/.*)?	u:object_r:thermal-daemon_run_dir:s0
+/data/vendor/thermal_daemon(/.*)?       u:object_r:thermal-daemon_run_dir:s0
 /sys/devices/virtual/dmi/id/product_name		u:object_r:sysfs_dmi_id:s0
 /sys/devices/virtual/dmi/id/product_uuid		u:object_r:sysfs_dmi_id:s0
 /sys/class/backlight(/.*)?		u:object_r:sysfs_backlight_thermal:s0
diff --git a/sepolicy/thermal/thermal-daemon/init.te b/sepolicy/thermal/thermal-daemon/init.te
index 1a014d449..ed918349d 100644
--- a/sepolicy/thermal/thermal-daemon/init.te
+++ b/sepolicy/thermal/thermal-daemon/init.te
@@ -1,8 +1,8 @@
 allow init sysfs_powercap:dir { read open };
 allow init sysfs_powercap:file { read setattr };
 allow init thermal-daemon_data_file: dir { read open };
-allow init thermal-daemon_data_file: file { read setattr };
-allow init thermal-daemon_run_dir: dir { create read open };
+allow init thermal-daemon_data_file: file { read };
+allow init thermal-daemon_run_dir: dir { create read open setattr };
 allow init thermal-daemon_run_dir: file { create read write setattr };
 allow init sysfs_dmi_id: file { read setattr };
 allow init sysfs_backlight_thermal: file { read write setattr };
diff --git a/sepolicy/thermal/thermal-daemon/thermal-daemon.te b/sepolicy/thermal/thermal-daemon/thermal-daemon.te
index 44e2479b8..f2c81b565 100644
--- a/sepolicy/thermal/thermal-daemon/thermal-daemon.te
+++ b/sepolicy/thermal/thermal-daemon/thermal-daemon.te
@@ -23,10 +23,14 @@ allow thermal-daemon sysfs_dmi_id:{ file lnk_file } rw_file_perms;
 allow thermal-daemon system_data_file:dir create_dir_perms;
 allow thermal-daemon system_data_file:dir rw_dir_perms;
 allow thermal-daemon thermal-daemon_run_dir:dir create_dir_perms;
+allow thermal-daemon thermal-daemon_run_dir:dir rw_dir_perms;
 allow thermal-daemon thermal-daemon_run_dir:file create_file_perms;
+allow thermal-daemon thermal-daemon_run_dir:file rw_file_perms;
 allow thermal-daemon thermal-daemon_data_file:dir r_file_perms;
 allow thermal-daemon thermal-daemon_data_file:file r_file_perms;
 allow thermal-daemon thermal_device:chr_file rw_file_perms;
+allow thermal-daemon self:netlink_kobject_uevent_socket create_socket_perms;
+
 
 # properties
 set_prop(thermal-daemon, powerctl_prop)

From 7fb2057107b69ced0ea960d49c93267bfa129ab4 Mon Sep 17 00:00:00 2001
From: Ming Tan <ming.tan@intel.com>
Date: Tue, 27 Nov 2018 14:29:18 +0800
Subject: [PATCH 409/427] In kernel config, enable virtio pci and virtio input.

It can be used to support virto-scsi-pci device in QEMU.

Tracked-On: OAM-72233
Signed-off-by: Ming Tan <ming.tan@intel.com>
---
 kernel_config/kernel_64_defconfig | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index 321f8186a..ccf85ecfe 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -5022,10 +5022,12 @@ CONFIG_VIRT_DRIVERS=y
 # CONFIG_VBOXGUEST is not set
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_MENU=y
-# CONFIG_VIRTIO_PCI is not set
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_PCI_LEGACY=y
 # CONFIG_VIRTIO_BALLOON is not set
-# CONFIG_VIRTIO_INPUT is not set
-# CONFIG_VIRTIO_MMIO is not set
+CONFIG_VIRTIO_INPUT=y
+CONFIG_VIRTIO_MMIO=y
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 
 #
 # Microsoft Hyper-V guest support

From c8db74fae77bb01bb1df50ff8c898ac54cc2eb53 Mon Sep 17 00:00:00 2001
From: "Wang, ArvinX" <arvinx.wang@intel.com>
Date: Mon, 19 Nov 2018 18:24:59 +0800
Subject: [PATCH 410/427] [MIXINUP] Fix cts failure in CtsAppTestCases

CTS failure due to don't support feature: FEATURE_CANT_SAVE_STATE
the feature is for supporting the R.attr.cantSaveState API( sdk28),
the cantSaveState declare that this application can't participate
in the normal state save/restore mechanism.

Test: run cts -m CtsAppTestCases \
        -t
android.app.cts.ActivityManagerProcessStateTest#testCantSaveStateLaunchAndBackground
      run cts -m CtsAppTestCases \
        -t
android.app.cts.ActivityManagerProcessStateTest#testCantSaveStateLaunchAndSwitch

Tracked-On: OAM-71298
Signed-off-by: Wang, ArvinX <arvinx.wang@intel.com>
---
 cel_apl/device.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 7c3e94ea9..38613f1ca 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -735,7 +735,8 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.screen.landscape.xml:vendor/etc/permissions/android.hardware.screen.landscape.xml \
     frameworks/native/data/etc/android.hardware.ethernet.xml:vendor/etc/permissions/android.hardware.ethernet.xml \
     frameworks/native/data/etc/android.hardware.broadcastradio.xml:vendor/etc/permissions/android.hardware.broadcastradio.xml \
-    frameworks/native/data/etc/android.software.activities_on_secondary_displays.xml:vendor/etc/permissions/android.software.activities_on_secondary_displays.xml
+    frameworks/native/data/etc/android.software.activities_on_secondary_displays.xml:vendor/etc/permissions/android.software.activities_on_secondary_displays.xml \
+    $(INTEL_PATH_COMMON)/framework/android.software.cant_save_state.xml:vendor/etc/permissions/android.software.cant_save_state.xml
 
 # Make sure vendor car product overlays take precedence than google definition
 # under packages/services/Car/car_product/overlay/

From 0b0070b1ecf94974537f8f6b85b21635dbff04ef Mon Sep 17 00:00:00 2001
From: buildslave <ctbbot@intel.com>
Date: Thu, 29 Nov 2018 00:54:06 +0000
Subject: [PATCH 411/427] mixin updates

thermal-daemon: Updating the data dir in initrc from misc' to 'vendor'
As per VNDK rules, moving the data dir from /data/misc to
/data/vendor folder.
Fix cts failure in CtsAppTestCases
CTS failure due to don't support feature: FEATURE_CANT_SAVE_STATE
the feature is for supporting the R.attr.cantSaveState API( sdk28),
the cantSaveState declare that this application can't participate
in the normal state save/restore mechanism.
Test: run cts -m CtsAppTestCases \
-t android.app.cts.ActivityManagerProcessStateTest#testCantSaveStateLaunchAndBackground
run cts -m CtsAppTestCases \
-t android.app.cts.ActivityManagerProcessStateTest#testCantSaveStateLaunchAndSwitch

Change-Id: I72121ec64bfbf14a57c5222cff4046816363c2c0
Tracked-On: OAM-71298
Tracked-On: OAM-71986
Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/117
Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/122
Signed-off-by: Wang, ArvinX <arvinx.wang@intel.com>
Signed-off-by: ysiyer <yegnesh.s.iyer@intel.com>
---
 cel_apl/init.rc | 4 ++--
 celadon/init.rc | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cel_apl/init.rc b/cel_apl/init.rc
index dddddc8c6..459e30a0d 100644
--- a/cel_apl/init.rc
+++ b/cel_apl/init.rc
@@ -629,9 +629,9 @@ on boot
     chown system system /system/vendor/etc/thermal-daemon/thermal-conf.xml
     restorecon_recursive /sys/class/powercap
 
-on post-fs
+on post-fs-data
     setprop persist.thermal.mode thermal-daemon
-    mkdir /data/misc/thermal-daemon 0771 system system
+    mkdir /data/vendor/thermal-daemon 0660 system system
     start thermal-daemon
 
 ##############################################################
diff --git a/celadon/init.rc b/celadon/init.rc
index dddddc8c6..459e30a0d 100644
--- a/celadon/init.rc
+++ b/celadon/init.rc
@@ -629,9 +629,9 @@ on boot
     chown system system /system/vendor/etc/thermal-daemon/thermal-conf.xml
     restorecon_recursive /sys/class/powercap
 
-on post-fs
+on post-fs-data
     setprop persist.thermal.mode thermal-daemon
-    mkdir /data/misc/thermal-daemon 0771 system system
+    mkdir /data/vendor/thermal-daemon 0660 system system
     start thermal-daemon
 
 ##############################################################

From 73d666c8451d4c04cc1ee94cfe57c05af89f9192 Mon Sep 17 00:00:00 2001
From: shyjumon <shyjumon.n@intel.com>
Date: Tue, 27 Nov 2018 07:41:25 +0530
Subject: [PATCH 412/427] MMC: SDHCI Host controller enabling for 4.19.x kernel

Tracked-On: OAM-71946
Signed-off-by: shyjumon <shyjumon.n@intel.com>
---
 kernel_config/kernel_64_defconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel_config/kernel_64_defconfig b/kernel_config/kernel_64_defconfig
index ccf85ecfe..f4c7743c3 100644
--- a/kernel_config/kernel_64_defconfig
+++ b/kernel_config/kernel_64_defconfig
@@ -1616,7 +1616,7 @@ CONFIG_INTEL_MEI_TXE=y
 #
 # CONFIG_GENWQE is not set
 # CONFIG_ECHO is not set
-# CONFIG_MISC_RTSX_PCI is not set
+CONFIG_MISC_RTSX_PCI=y
 # CONFIG_MISC_RTSX_USB is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
@@ -4801,6 +4801,7 @@ CONFIG_MMC_SDHCI_ACPI=y
 # CONFIG_MMC_VUB300 is not set
 # CONFIG_MMC_USHC is not set
 # CONFIG_MMC_USDHI6ROL0 is not set
+CONFIG_MMC_REALTEK_PCI=y
 CONFIG_MMC_CQHCI=y
 # CONFIG_MMC_TOSHIBA_PCI is not set
 # CONFIG_MMC_MTK is not set

From b98c513bcc4c9742faa2cccf23de8d7511a39bac Mon Sep 17 00:00:00 2001
From: ysiyer <yegnesh.s.iyer@intel.com>
Date: Tue, 27 Nov 2018 18:45:24 +0530
Subject: [PATCH 413/427] thermal-daemon: Updating the temp limits for all
 platforms

temp_crit for cpus set as follows for all platforms:
KBL-NUC Commercial devices: 100
KBL-NUC Development devices: 100
APL-NUC Development devices: 105

Hence redefined the thermal policy as follows:
KBL-NUC Commercial and Development devices:
Passive limit 1: 85 C
Passive limit 2: 95 C
Critical limit: 99 C

APL-NUC devices:
Passive limit 1: 90 C
Passive limit 2: 100 C
Critical limit: 104 C

Tracked-On: OAM-72228
Signed-off-by: ysiyer <yegnesh.s.iyer@intel.com>
---
 common/thermal/thermal-conf.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/thermal/thermal-conf.xml b/common/thermal/thermal-conf.xml
index fb57dc34c..07f5ca614 100644
--- a/common/thermal/thermal-conf.xml
+++ b/common/thermal/thermal-conf.xml
@@ -11,7 +11,7 @@
 				<TripPoints>
 					<TripPoint>
 						<SensorType>x86_pkg_temp</SensorType>
-						<Temperature>90000</Temperature>
+						<Temperature>85000</Temperature>
 						<Type>Passive</Type>
 						<CoolingDevice>
 							<Type>rapl_limit_1</Type>
@@ -19,7 +19,7 @@
 					</TripPoint>
 					<TripPoint>
 						<SensorType>x86_pkg_temp</SensorType>
-						<Temperature>105000</Temperature>
+						<Temperature>95000</Temperature>
 						<Type>Passive</Type>
 						<CoolingDevice>
 							<Type>rapl_limit_2</Type>
@@ -32,7 +32,7 @@
 				<TripPoints>
 					<TripPoint>
 						<SensorType>x86_pkg_temp</SensorType>
-						<Temperature>110000</Temperature>
+						<Temperature>99000</Temperature>
 						<Type>Critical</Type>
 					</TripPoint>
 				</TripPoints>
@@ -67,7 +67,7 @@
 				<TripPoints>
 					<TripPoint>
 						<SensorType>x86_pkg_temp</SensorType>
-						<Temperature>90000</Temperature>
+						<Temperature>85000</Temperature>
 						<Type>Passive</Type>
 						<CoolingDevice>
 							<Type>rapl_limit_1</Type>
@@ -75,7 +75,7 @@
 					</TripPoint>
 					<TripPoint>
 						<SensorType>x86_pkg_temp</SensorType>
-						<Temperature>105000</Temperature>
+						<Temperature>95000</Temperature>
 						<Type>Passive</Type>
 						<CoolingDevice>
 							<Type>rapl_limit_2</Type>
@@ -88,7 +88,7 @@
 				<TripPoints>
 					<TripPoint>
 						<SensorType>x86_pkg_temp</SensorType>
-						<Temperature>110000</Temperature>
+						<Temperature>99000</Temperature>
 						<Type>Critical</Type>
 					</TripPoint>
 				</TripPoints>
@@ -131,7 +131,7 @@
 					</TripPoint>
 					<TripPoint>
 						<SensorType>x86_pkg_temp</SensorType>
-						<Temperature>105000</Temperature>
+						<Temperature>100000</Temperature>
 						<Type>Passive</Type>
 						<CoolingDevice>
 							<Type>rapl_limit_2</Type>
@@ -144,7 +144,7 @@
 				<TripPoints>
 					<TripPoint>
 						<SensorType>x86_pkg_temp</SensorType>
-						<Temperature>110000</Temperature>
+						<Temperature>104000</Temperature>
 						<Type>Critical</Type>
 					</TripPoint>
 				</TripPoints>

From bc0a90f59f18d106503389dd03dcf4cb45aabd32 Mon Sep 17 00:00:00 2001
From: "Yan, WalterX" <walterx.yan@intel.com>
Date: Wed, 28 Nov 2018 11:36:38 +0800
Subject: [PATCH 414/427] [MIXINUP]Move TARGET_BOARD_PLATFORM from boot-arch to
 project-celadon

Move it to make sure TARGET_BOARD_PLATFORM getting definded
before using as device.mk gets running before BoardConfig.mk

Tracked-On: OAM-72181
Signed-off-by: Yan, WalterX <walterx.yan@intel.com>
---
 cel_apl/BoardConfig.mk | 2 --
 cel_apl/device.mk      | 2 ++
 celadon/BoardConfig.mk | 2 --
 celadon/device.mk      | 2 ++
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index 5f8a03403..5ee58982f 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -167,8 +167,6 @@ BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/config-partition
 ##############################################################
 #TARGET_NO_RECOVERY ?= false
 
-TARGET_BOARD_PLATFORM := project-celadon
-
 ifeq (False,true)
 TARGET_USERIMAGES_USE_F2FS := true
 BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := f2fs
diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 38613f1ca..6ce5fb40a 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -3,6 +3,8 @@
 ##############################################################
 # Source: device/intel/mixins/groups/project-celadon/default/product.mk
 ##############################################################
+TARGET_BOARD_PLATFORM := project-celadon
+
 #Product Characteristics
 PRODUCT_DIR := $(dir $(lastword $(filter-out device/common/%,$(filter device/%,$(ALL_PRODUCTS)))))
 
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index ed896f3d9..58ed64233 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -171,8 +171,6 @@ BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/config-partition
 ##############################################################
 #TARGET_NO_RECOVERY ?= false
 
-TARGET_BOARD_PLATFORM := project-celadon
-
 ifeq (False,true)
 TARGET_USERIMAGES_USE_F2FS := true
 BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := f2fs
diff --git a/celadon/device.mk b/celadon/device.mk
index bc6b4a0be..6acdf8659 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -3,6 +3,8 @@
 ##############################################################
 # Source: device/intel/mixins/groups/project-celadon/default/product.mk
 ##############################################################
+TARGET_BOARD_PLATFORM := project-celadon
+
 #Product Characteristics
 PRODUCT_DIR := $(dir $(lastword $(filter-out device/common/%,$(filter device/%,$(ALL_PRODUCTS)))))
 

From 1584cd845b45d24ce053d2be0c13265a82847d5d Mon Sep 17 00:00:00 2001
From: Zhiwei Li <zhiwei.li@intel.com>
Date: Thu, 29 Nov 2018 08:51:45 +0800
Subject: [PATCH 415/427] support adoptable storage on usb

since there is no sd card slot on Commercial KBL-NUC, use adoptable usb
to test related function instead

Tracked-On: https://jira01.devtools.intel.com/browse/OAM-72351
Signed-off-by: Zhiwei li zhiwei.li@intel.com
---
 cel_apl/mixins.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cel_apl/mixins.spec b/cel_apl/mixins.spec
index 5c71718d8..c0f6a487e 100644
--- a/cel_apl/mixins.spec
+++ b/cel_apl/mixins.spec
@@ -12,7 +12,7 @@ graphics: project-celadon(gen9+=true,hwc2=true,vulkan=true,drmhwc=false,minigbm=
 media: project-celadon(mediasdk=false,media_sdk_source=false)
 ethernet: dhcp
 debugfs: default
-storage: sdcard-mmc0-usb-sd(adoptablesd=true,adoptableusb=false)
+storage: sdcard-mmc0-usb-sd(adoptablesd=true,adoptableusb=true)
 display-density: default
 usb-gadget: g_ffs
 adb_net: true

From d0dad6699a5f09dbc3b4af64e4d0e18b88629f74 Mon Sep 17 00:00:00 2001
From: Swaroop Balan <swaroop.balan@intel.com>
Date: Wed, 5 Dec 2018 16:17:52 +0530
Subject: [PATCH 416/427] [MIXINUP] support adoptable storage on usb #175

Tracked-On: OAM-72351
Signed-off-by: Swaroop Balan <swaroop.balan@intel.com>
---
 cel_apl/fstab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cel_apl/fstab b/cel_apl/fstab
index 01407f788..5711ded1c 100644
--- a/cel_apl/fstab
+++ b/cel_apl/fstab
@@ -3,7 +3,7 @@
 ##############################################################
 # Source: device/intel/mixins/groups/storage/sdcard-mmc0-usb-sd/fstab
 ##############################################################
-*/usb*/*/host*/*/block/sd*              auto             auto    defaults                                   voldmanaged=usbdisk:auto
+*/usb*/*/host*/*/block/sd*              auto             auto    defaults                                   voldmanaged=usbdisk:auto,encryptable=userdata
 */mmc0/*/block/mmcblk*                  auto             auto    defaults                                   voldmanaged=sdcard1:auto,encryptable=userdata
 ##############################################################
 # Source: device/intel/mixins/groups/factory-partition/true/fstab

From e9198cddf9e124cf53303d23dd299b6806b6bb13 Mon Sep 17 00:00:00 2001
From: Cathy Bao <cathy.bao@intel.com>
Date: Fri, 30 Nov 2018 01:54:53 -0800
Subject: [PATCH 417/427] Enable 1GB zram swap

Signed-off-by: Cathy Bao <cathy.bao@intel.com>
---
 cel_apl/mixins.spec | 1 +
 celadon/mixins.spec | 1 +
 2 files changed, 2 insertions(+)

diff --git a/cel_apl/mixins.spec b/cel_apl/mixins.spec
index c0f6a487e..3f40cbb41 100644
--- a/cel_apl/mixins.spec
+++ b/cel_apl/mixins.spec
@@ -52,3 +52,4 @@ slot-ab: true
 art-config: default
 gptbuild: true(size=14G)
 device-type: car
+swap:zram(size=1073741824,swappiness=false,hardware=cel_apl)
diff --git a/celadon/mixins.spec b/celadon/mixins.spec
index 1cc5d6f87..b53871302 100644
--- a/celadon/mixins.spec
+++ b/celadon/mixins.spec
@@ -52,3 +52,4 @@ health: true
 slot-ab: true
 art-config: default
 gptbuild: true(size=14G)
+swap:zram(size=1073741824,swappiness=false,hardware=celadon)

From cf5e15525e1000d17e9c154633f6b4dfe2d60caa Mon Sep 17 00:00:00 2001
From: Cathy Bao <cathy.bao@intel.com>
Date: Sun, 2 Dec 2018 11:59:07 -0800
Subject: [PATCH 418/427] Add sepolicy for swap

Tracked-On: https://jira01.devtools.intel.com/browse/OAM-71656
Signed-off-by: Cathy Bao <cathy.bao@intel.com>
---
 sepolicy/swap/file.te        | 1 +
 sepolicy/swap/file_contexts  | 2 ++
 sepolicy/swap/genfs_contexts | 1 +
 sepolicy/swap/vendor_init.te | 1 +
 sepolicy/swap/vold.te        | 5 +++++
 5 files changed, 10 insertions(+)
 create mode 100644 sepolicy/swap/file.te
 create mode 100644 sepolicy/swap/file_contexts
 create mode 100644 sepolicy/swap/genfs_contexts
 create mode 100644 sepolicy/swap/vendor_init.te
 create mode 100644 sepolicy/swap/vold.te

diff --git a/sepolicy/swap/file.te b/sepolicy/swap/file.te
new file mode 100644
index 000000000..a83786514
--- /dev/null
+++ b/sepolicy/swap/file.te
@@ -0,0 +1 @@
+type proc_swappiness, fs_type, proc_type;
diff --git a/sepolicy/swap/file_contexts b/sepolicy/swap/file_contexts
new file mode 100644
index 000000000..9ddf7ae42
--- /dev/null
+++ b/sepolicy/swap/file_contexts
@@ -0,0 +1,2 @@
+# ZRam device configured as swap space
+/dev/block/zram0    u:object_r:swap_block_device:s0
diff --git a/sepolicy/swap/genfs_contexts b/sepolicy/swap/genfs_contexts
new file mode 100644
index 000000000..db74bc966
--- /dev/null
+++ b/sepolicy/swap/genfs_contexts
@@ -0,0 +1 @@
+genfscon proc /sys/vm/swappiness    u:object_r:proc_swappiness:s0
diff --git a/sepolicy/swap/vendor_init.te b/sepolicy/swap/vendor_init.te
new file mode 100644
index 000000000..639a52eaa
--- /dev/null
+++ b/sepolicy/swap/vendor_init.te
@@ -0,0 +1 @@
+allow vendor_init proc_swappiness:file w_file_perms;
diff --git a/sepolicy/swap/vold.te b/sepolicy/swap/vold.te
new file mode 100644
index 000000000..357e54215
--- /dev/null
+++ b/sepolicy/swap/vold.te
@@ -0,0 +1,5 @@
+#
+# vold
+#
+
+allow vold swap_block_device:blk_file getattr;

From 25a47d23336fc8f3a5459923441bf184bfa22a21 Mon Sep 17 00:00:00 2001
From: buildslave <ctbbot@intel.com>
Date: Thu, 6 Dec 2018 01:23:15 +0000
Subject: [PATCH 419/427] mixin updates

Add sepolicy for swap
Add swap mixin group

Tracked-On: https://jira01.devtools.intel.com/browse/OAM-71656
Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia-mixins/pull/127
Mixin-Reviewed-On: https://github.com/projectceladon/device-androidia/pull/174
Signed-off-by: Cathy Bao <cathy.bao@intel.com>
---
 cel_apl/BoardConfig.mk |  5 +++++
 cel_apl/fstab          |  5 +++++
 cel_apl/fstab.recovery |  5 +++++
 cel_apl/init.rc        | 11 +++++++++++
 celadon/BoardConfig.mk |  5 +++++
 celadon/fstab          |  5 +++++
 celadon/fstab.recovery |  5 +++++
 celadon/init.rc        | 11 +++++++++++
 8 files changed, 52 insertions(+)

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index 5ee58982f..70cad339a 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -484,4 +484,9 @@ BOARD_SEPOLICY_DIRS += \
     $(INTEL_PATH_SEPOLICY)/car
 
 TARGET_USES_CAR_FUTURE_FEATURES := true
+##############################################################
+# Source: device/intel/mixins/groups/swap/zram/BoardConfig.mk
+##############################################################
+BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/swap
+BOARD_SEPOLICY_M4DEFS += module_swap=true
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/cel_apl/fstab b/cel_apl/fstab
index 5711ded1c..b1beed366 100644
--- a/cel_apl/fstab
+++ b/cel_apl/fstab
@@ -46,4 +46,9 @@
 /dev/block/by-name/persistent   /persistent     emmc    defaults                                                    defaults
 /dev/block/by-name/metadata     /metadata       emmc    defaults                                                    defaults
 /dev/block/by-name/tos          /tos            emmc    defaults                                                    defaults,slotselect,avb
+##############################################################
+# Source: device/intel/mixins/groups/swap/zram/fstab
+##############################################################
+/dev/block/zram0                        none             swap    defaults                                   zramsize=1073741824
+
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/cel_apl/fstab.recovery b/cel_apl/fstab.recovery
index 88929d1e5..03119efa9 100644
--- a/cel_apl/fstab.recovery
+++ b/cel_apl/fstab.recovery
@@ -47,4 +47,9 @@
 /dev/block/by-name/persistent   /persistent     emmc    defaults                                                    defaults
 /dev/block/by-name/metadata     /metadata       ext4    noatime,nosuid,nodev,errors=panic                           wait,check
 /dev/block/by-name/tos          /tos            emmc    defaults                                                    defaults,slotselect
+##############################################################
+# Source: device/intel/mixins/groups/swap/zram/fstab.recovery
+##############################################################
+/dev/block/zram0                        none             swap    defaults                                   zramsize=1073741824
+
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/cel_apl/init.rc b/cel_apl/init.rc
index 459e30a0d..68dbf624c 100644
--- a/cel_apl/init.rc
+++ b/cel_apl/init.rc
@@ -704,6 +704,17 @@ service storageproxyd /vendor/bin/storageproxyd -d /dev/trusty-ipc-dev0 -p /data
     group system
 
 ##############################################################
+# Source: device/intel/mixins/groups/swap/zram/init.rc
+##############################################################
+
+on boot
+    # Read one page at a time for swap (default is 8)
+    write /proc/sys/vm/page-cluster 0
+
+on post-fs-data
+    # Enable swaps described in the fstab
+    swapon_all /fstab.${ro.hardware}
+##############################################################
 # Source: device/intel/mixins/groups/debug-kernel/default/init.rc
 ##############################################################
 import /init.kernel.rc
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index 58ed64233..14dc428c2 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -479,4 +479,9 @@ DEVICE_FRAMEWORK_MANIFEST_FILE += \
 # can't use := here, as PRODUCT_OUT is not defined yet
 GPTIMAGE_BIN = $(PRODUCT_OUT)/$(TARGET_PRODUCT)_gptimage.img
 CRAFFIMAGE_BIN = $(PRODUCT_OUT)/$(TARGET_PRODUCT)_gptimage.craff
+##############################################################
+# Source: device/intel/mixins/groups/swap/zram/BoardConfig.mk
+##############################################################
+BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/swap
+BOARD_SEPOLICY_M4DEFS += module_swap=true
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/celadon/fstab b/celadon/fstab
index 16e2663c8..82f275051 100644
--- a/celadon/fstab
+++ b/celadon/fstab
@@ -46,4 +46,9 @@
 /dev/block/by-name/persistent   /persistent     emmc    defaults                                                    defaults
 /dev/block/by-name/metadata     /metadata       emmc    defaults                                                    defaults
 /dev/block/by-name/tos          /tos            emmc    defaults                                                    defaults,slotselect,avb
+##############################################################
+# Source: device/intel/mixins/groups/swap/zram/fstab
+##############################################################
+/dev/block/zram0                        none             swap    defaults                                   zramsize=1073741824
+
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/celadon/fstab.recovery b/celadon/fstab.recovery
index 88929d1e5..03119efa9 100644
--- a/celadon/fstab.recovery
+++ b/celadon/fstab.recovery
@@ -47,4 +47,9 @@
 /dev/block/by-name/persistent   /persistent     emmc    defaults                                                    defaults
 /dev/block/by-name/metadata     /metadata       ext4    noatime,nosuid,nodev,errors=panic                           wait,check
 /dev/block/by-name/tos          /tos            emmc    defaults                                                    defaults,slotselect
+##############################################################
+# Source: device/intel/mixins/groups/swap/zram/fstab.recovery
+##############################################################
+/dev/block/zram0                        none             swap    defaults                                   zramsize=1073741824
+
 # ------------------ END MIX-IN DEFINITIONS ------------------
diff --git a/celadon/init.rc b/celadon/init.rc
index 459e30a0d..68dbf624c 100644
--- a/celadon/init.rc
+++ b/celadon/init.rc
@@ -704,6 +704,17 @@ service storageproxyd /vendor/bin/storageproxyd -d /dev/trusty-ipc-dev0 -p /data
     group system
 
 ##############################################################
+# Source: device/intel/mixins/groups/swap/zram/init.rc
+##############################################################
+
+on boot
+    # Read one page at a time for swap (default is 8)
+    write /proc/sys/vm/page-cluster 0
+
+on post-fs-data
+    # Enable swaps described in the fstab
+    swapon_all /fstab.${ro.hardware}
+##############################################################
 # Source: device/intel/mixins/groups/debug-kernel/default/init.rc
 ##############################################################
 import /init.kernel.rc

From 89b1cdd22560567f4b04b561e98255c840ecb614 Mon Sep 17 00:00:00 2001
From: "tianmi.chen" <tianmi.chen@intel.com>
Date: Thu, 13 Dec 2018 14:57:17 +0800
Subject: [PATCH 420/427] Set proper codec performance range on KBL

Tracked-On: OAM-71352, OAM-72681
Signed-off-by: tianmi.chen <tianmi.chen@intel.com>
---
 common/media/media_codecs_performance.xml | 30 +++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/common/media/media_codecs_performance.xml b/common/media/media_codecs_performance.xml
index 470742422..7cf08cd7c 100644
--- a/common/media/media_codecs_performance.xml
+++ b/common/media/media_codecs_performance.xml
@@ -20,14 +20,14 @@
             <Limit name="measured-frame-rate-176x144" range="2500-3200" />
         </MediaCodec>
         <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="530-590" />
+            <Limit name="measured-frame-rate-320x240" range="1200-1500" />
             <Limit name="measured-frame-rate-720x480" range="300-480" />
             <Limit name="measured-frame-rate-1280x720" range="100-150" />
             <Limit name="measured-frame-rate-1920x1080" range="40-60" />
         </MediaCodec>
         <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="450-510" />
-            <Limit name="measured-frame-rate-640x360" range="200-220" />
+            <Limit name="measured-frame-rate-352x288" range="1000-1400" />
+            <Limit name="measured-frame-rate-640x360" range="400-680" />
             <Limit name="measured-frame-rate-720x480" range="360-480" />
             <Limit name="measured-frame-rate-1280x720" range="180-220" />
             <Limit name="measured-frame-rate-1920x1080" range="100-150" />
@@ -55,8 +55,8 @@
         </MediaCodec>
         <MediaCodec name="OMX.Intel.hw_vd.h265" type="video/hevc" update="true">
             <Limit name="measured-frame-rate-352x288" range="3000-4300" />
-            <Limit name="measured-frame-rate-640x360" range="1000-1400" />
-            <Limit name="measured-frame-rate-720x480" range="820-1020" />
+            <Limit name="measured-frame-rate-640x360" range="2800-4000" />
+            <Limit name="measured-frame-rate-720x480" range="2000-3000" />
             <Limit name="measured-frame-rate-1280x720" range="540-580" />
             <Limit name="measured-frame-rate-1920x1080" range="430-470" />
             <Limit name="measured-frame-rate-3840x2160" range="120-130" />
@@ -83,13 +83,13 @@
             <Limit name="measured-frame-rate-1920x1080" range="30-35" />
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="710-790" />
+            <Limit name="measured-frame-rate-176x144" range="1600-2000" />
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="750-830" />
+            <Limit name="measured-frame-rate-176x144" range="1800-2200" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="120-150" />
+            <Limit name="measured-frame-rate-320x180" range="250-600" />
             <Limit name="measured-frame-rate-640x360" range="95-110" />
             <Limit name="measured-frame-rate-1280x720" range="32-38" />
             <Limit name="measured-frame-rate-1920x1080" range="22-25" />
@@ -100,16 +100,16 @@
             <Limit name="measured-frame-rate-1280x720" range="7-9" />
         </MediaCodec>
         <MediaCodec name="OMX.Intel.hw_ve.h264" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="260-300" />
-            <Limit name="measured-frame-rate-720x480" range="140-160" />
-            <Limit name="measured-frame-rate-1280x720" range="75-110" />
+            <Limit name="measured-frame-rate-320x240" range="1000-1600" />
+            <Limit name="measured-frame-rate-720x480" range="400-800" />
+            <Limit name="measured-frame-rate-1280x720" range="150-350" />
             <Limit name="measured-frame-rate-1920x1080" range="50-55" />
         </MediaCodec>
         <MediaCodec name="OMX.Intel.hw_ve.h265" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="100-180" />
-            <Limit name="measured-frame-rate-720x480" range="120-160" />
-            <Limit name="measured-frame-rate-1280x720" range="70-90" />
-            <Limit name="measured-frame-rate-1920x1080" range="35-45" />
+            <Limit name="measured-frame-rate-320x240" range="900-1600" />
+            <Limit name="measured-frame-rate-720x480" range="300-650" />
+            <Limit name="measured-frame-rate-1280x720" range="120-320" />
+            <Limit name="measured-frame-rate-1920x1080" range="50-150" />
             <Limit name="measured-frame-rate-3840x2160" range="10-14" />
         </MediaCodec>
     </Encoders>

From fca21c3ffcc1ba1b1513d9a7378d03d3b620f360 Mon Sep 17 00:00:00 2001
From: Zhiwei Li <zhiwei.li@intel.com>
Date: Fri, 7 Dec 2018 13:09:55 +0800
Subject: [PATCH 421/427] Allow write permission for "/data/misc/vold/" in
 sepolicy

Tracked-On: https://jira01.devtools.intel.com/browse/OAM-72409
Signed-off-by: Zhiwei li zhiwei.li@intel.com
---
 sepolicy/kernel/kernel.te | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sepolicy/kernel/kernel.te b/sepolicy/kernel/kernel.te
index 101b795b2..bf8d5576d 100644
--- a/sepolicy/kernel/kernel.te
+++ b/sepolicy/kernel/kernel.te
@@ -13,3 +13,6 @@ allow kernel kernel:capability sys_admin;
 allow kernel rootfs:system module_load;
 allow kernel system_file:system module_load;
 allow kernel self:system module_request;
+
+# allow write permission for "/data/misc/vold/"
+allow kernel vold_data_file:file write;

From a309a4bd9229bb5a72f1cb1ef02597406a359ce5 Mon Sep 17 00:00:00 2001
From: swaroopb <swaroop.balan@intel.com>
Date: Thu, 13 Dec 2018 14:20:40 +0530
Subject: [PATCH 422/427] Mixinup Changes

Tracked-On: None
Signed-off-by: swaroopb <swaroop.balan@intel.com>
---
 cel_apl/BoardConfig.mk | 2 +-
 cel_apl/device.mk      | 5 ++++-
 celadon/BoardConfig.mk | 2 +-
 celadon/device.mk      | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index 70cad339a..125431b62 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -97,7 +97,7 @@ KERNEL_LOGLEVEL ?= 3
 SERIAL_PARAMETER ?= console=tty0 console=ttyS0,115200n8
 
 
-BOARD_KERNEL_CMDLINE += androidboot.hardware=$(TARGET_PRODUCT) firmware_class.path=/vendor/firmware loglevel=$(KERNEL_LOGLEVEL)
+BOARD_KERNEL_CMDLINE += androidboot.hardware=$(TARGET_PRODUCT) firmware_class.path=/vendor/firmware loglevel=$(KERNEL_LOGLEVEL) loop.max_part=7
 
 ifneq ($(TARGET_BUILD_VARIANT),user)
 ifeq ($(SPARSE_IMG),true)
diff --git a/cel_apl/device.mk b/cel_apl/device.mk
index 6ce5fb40a..ae1a8c034 100644
--- a/cel_apl/device.mk
+++ b/cel_apl/device.mk
@@ -204,6 +204,9 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:system/etc/permissions/android.hardware.vulkan.level.xml
 
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:system/etc/permissions/android.hardware.vulkan.compute.xml
+
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:system/etc/permissions/android.hardware.vulkan.version.xml
@@ -502,7 +505,7 @@ PRODUCT_PACKAGES += \
 #copy iwlwifi wpa config files
 PRODUCT_COPY_FILES += \
         device/intel/common/wlan/wpa_supplicant-common.conf:system/etc/wifi/wpa_supplicant.conf \
-        device/intel/common/wlan/iwlwifi/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \
+        device/intel/common/wlan/iwlwifi/wpa_supplicant_overlay_no_tdls.conf:system/etc/wifi/wpa_supplicant_overlay.conf \
         frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml 
 
 
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index 14dc428c2..53c729bf5 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -101,7 +101,7 @@ KERNEL_LOGLEVEL ?= 3
 SERIAL_PARAMETER ?= console=tty0 console=ttyS0,115200n8
 
 
-BOARD_KERNEL_CMDLINE += androidboot.hardware=$(TARGET_PRODUCT) firmware_class.path=/vendor/firmware loglevel=$(KERNEL_LOGLEVEL)
+BOARD_KERNEL_CMDLINE += androidboot.hardware=$(TARGET_PRODUCT) firmware_class.path=/vendor/firmware loglevel=$(KERNEL_LOGLEVEL) loop.max_part=7
 
 ifneq ($(TARGET_BUILD_VARIANT),user)
 ifeq ($(SPARSE_IMG),true)
diff --git a/celadon/device.mk b/celadon/device.mk
index 6acdf8659..7234ab861 100644
--- a/celadon/device.mk
+++ b/celadon/device.mk
@@ -501,7 +501,7 @@ PRODUCT_PACKAGES += \
 #copy iwlwifi wpa config files
 PRODUCT_COPY_FILES += \
         device/intel/common/wlan/wpa_supplicant-common.conf:system/etc/wifi/wpa_supplicant.conf \
-        device/intel/common/wlan/iwlwifi/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \
+        device/intel/common/wlan/iwlwifi/wpa_supplicant_overlay_no_tdls.conf:system/etc/wifi/wpa_supplicant_overlay.conf \
         frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml 
 
 

From 907868e573522ae264c120a63f11adbf3d4bc820 Mon Sep 17 00:00:00 2001
From: Punit Vara <punit.vara@intel.com>
Date: Wed, 12 Dec 2018 16:13:26 +0530
Subject: [PATCH 423/427] celadon: Add socperf and socwatch in extra kernel
 module path

It adds socperf and socwatch kernel-modules in extra kernel modules
to consider extra modules for compile and build.

Tracked-On: OAM-71957
Signed-off-by: Punit Vara <punit.vara@intel.com>
---
 cel_apl/AndroidBoard.mk | 3 +++
 celadon/AndroidBoard.mk | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/cel_apl/AndroidBoard.mk b/cel_apl/AndroidBoard.mk
index d92b3514b..4ff818752 100644
--- a/cel_apl/AndroidBoard.mk
+++ b/cel_apl/AndroidBoard.mk
@@ -64,6 +64,9 @@ $(PRODUCT_OUT)/kernel: $(KERNEL_CONFIG) | $(ACP)
 
 EXTMOD_SRC := ../../../../../..
 
+TARGET_EXTRA_KERNEL_MODULES := $(EXTMOD_SRC)/kernel/modules/perftools-external/soc_perf_driver/src
+TARGET_EXTRA_KERNEL_MODULES += $(EXTMOD_SRC)/kernel/modules/perftools-external/socwatch_driver
+
 ALL_EXTRA_MODULES := $(patsubst %,$(TARGET_OUT_INTERMEDIATES)/kmodule/%,$(TARGET_EXTRA_KERNEL_MODULES))
 $(ALL_EXTRA_MODULES): $(TARGET_OUT_INTERMEDIATES)/kmodule/%: $(PRODUCT_OUT)/kernel
 	@echo Building additional kernel module $*
diff --git a/celadon/AndroidBoard.mk b/celadon/AndroidBoard.mk
index fb6485740..d6b40fd10 100644
--- a/celadon/AndroidBoard.mk
+++ b/celadon/AndroidBoard.mk
@@ -64,6 +64,9 @@ $(PRODUCT_OUT)/kernel: $(KERNEL_CONFIG) | $(ACP)
 
 EXTMOD_SRC := ../../../../../..
 
+TARGET_EXTRA_KERNEL_MODULES := $(EXTMOD_SRC)/kernel/modules/perftools-external/soc_perf_driver/src
+TARGET_EXTRA_KERNEL_MODULES += $(EXTMOD_SRC)/kernel/modules/perftools-external/socwatch_driver
+
 ALL_EXTRA_MODULES := $(patsubst %,$(TARGET_OUT_INTERMEDIATES)/kmodule/%,$(TARGET_EXTRA_KERNEL_MODULES))
 $(ALL_EXTRA_MODULES): $(TARGET_OUT_INTERMEDIATES)/kmodule/%: $(PRODUCT_OUT)/kernel
 	@echo Building additional kernel module $*

From 1152d78fb75c02825ba38a24f65dec106c94892f Mon Sep 17 00:00:00 2001
From: Punit Vara <punit.vara@intel.com>
Date: Wed, 12 Dec 2018 16:22:39 +0530
Subject: [PATCH 424/427] [MIXINUP] enable socperf and socwatch driver

socwatch and socperf configuration changes for cel_apl and celadon

Tracked-On: OAM-71957
Signed-off-by: Punit Vara <punit.vara@intel.com>
---
 cel_apl/mixins.spec | 2 +-
 celadon/mixins.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cel_apl/mixins.spec b/cel_apl/mixins.spec
index 3f40cbb41..da0f3a515 100644
--- a/cel_apl/mixins.spec
+++ b/cel_apl/mixins.spec
@@ -16,7 +16,7 @@ storage: sdcard-mmc0-usb-sd(adoptablesd=true,adoptableusb=true)
 display-density: default
 usb-gadget: g_ffs
 adb_net: true
-kernel: project-celadon(loglevel=3, disable_cpuidle_on_boot=true)
+kernel: project-celadon(loglevel=3, disable_cpuidle_on_boot=true, external_modules=perftools-external/soc_perf_driver/src perftools-external/socwatch_driver)
 bluetooth: btusb (ivi=true)
 boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true,ignore_not_applicable_reset=true,self_usb_device_mode_protocol=true)
 audio: project-celadon
diff --git a/celadon/mixins.spec b/celadon/mixins.spec
index b53871302..47773aaf2 100644
--- a/celadon/mixins.spec
+++ b/celadon/mixins.spec
@@ -17,7 +17,7 @@ storage: sdcard-mmc0-usb-sd(adoptablesd=false,adoptableusb=true)
 display-density: default
 usb-gadget: g_ffs
 adb_net: true
-kernel: project-celadon(loglevel=3, disable_cpuidle_on_boot=true)
+kernel: project-celadon(loglevel=3, disable_cpuidle_on_boot=true, external_modules=perftools-external/soc_perf_driver/src perftools-external/socwatch_driver)
 bluetooth: btusb
 boot-arch: project-celadon(bootloader_policy=0x0,bootloader_len=60,magic_key_timeout=80,assume_bios_secure_boot=true,tos_partition=true,rpmb_simulate=true,disk_encryption=false,file_encryption=true,ignore_not_applicable_reset=true,self_usb_device_mode_protocol=true)
 audio: project-celadon

From 536ea67d4cb44a0d8c0fdff011e5d28ffa910d84 Mon Sep 17 00:00:00 2001
From: saranya <saranya.gopal@intel.com>
Date: Wed, 5 Dec 2018 14:18:57 +0530
Subject: [PATCH 425/427] sepolicy: Add selinux permissions for USB

This patch adds selinux permissions needed for
init.rc to write into 'role' sysfs and set
USB config.

Jira: OAM-71244

Signed-off-by: saranya <saranya.gopal@intel.com>
---
 sepolicy/usb/file.te         | 1 +
 sepolicy/usb/file_contexts   | 1 +
 sepolicy/usb/init.te         | 2 ++
 sepolicy/usb/platform_app.te | 1 +
 4 files changed, 5 insertions(+)
 create mode 100644 sepolicy/usb/file.te
 create mode 100644 sepolicy/usb/file_contexts
 create mode 100644 sepolicy/usb/init.te
 create mode 100644 sepolicy/usb/platform_app.te

diff --git a/sepolicy/usb/file.te b/sepolicy/usb/file.te
new file mode 100644
index 000000000..45ed06c6a
--- /dev/null
+++ b/sepolicy/usb/file.te
@@ -0,0 +1 @@
+type sysfs_usb_role_writeable, fs_type, sysfs_type, mlstrustedobject;
diff --git a/sepolicy/usb/file_contexts b/sepolicy/usb/file_contexts
new file mode 100644
index 000000000..f1d72fd1e
--- /dev/null
+++ b/sepolicy/usb/file_contexts
@@ -0,0 +1 @@
+/sys/devices/pci0000:00/0000:00:14.0/intel_xhci_usb_sw/usb_role/intel_xhci_usb_sw-role-switch/role u:object_r:sysfs_usb_role_writeable:s0
diff --git a/sepolicy/usb/init.te b/sepolicy/usb/init.te
new file mode 100644
index 000000000..39b56af68
--- /dev/null
+++ b/sepolicy/usb/init.te
@@ -0,0 +1,2 @@
+allow init sysfs_usb_role_writeable:file rw_file_perms;
+allow init sysfs_usb_role_writeable:file { setattr };
diff --git a/sepolicy/usb/platform_app.te b/sepolicy/usb/platform_app.te
new file mode 100644
index 000000000..bc84251b3
--- /dev/null
+++ b/sepolicy/usb/platform_app.te
@@ -0,0 +1 @@
+allow platform_app sysfs_usb_role_writeable:file rw_file_perms;

From 83a7d3f1ebae7fa8d4e7c8a5b8846118e19d47fb Mon Sep 17 00:00:00 2001
From: saranya <saranya.gopal@intel.com>
Date: Tue, 18 Dec 2018 10:27:36 +0530
Subject: [PATCH 426/427] MIXINUP: Fix issue with shutdown

Jira: OAM-71244

Signed-off-by: saranya <saranya.gopal@intel.com>
---
 cel_apl/BoardConfig.mk | 5 +++++
 cel_apl/init.rc        | 2 ++
 celadon/BoardConfig.mk | 5 +++++
 celadon/init.rc        | 2 ++
 4 files changed, 14 insertions(+)

diff --git a/cel_apl/BoardConfig.mk b/cel_apl/BoardConfig.mk
index 125431b62..38ae4940f 100644
--- a/cel_apl/BoardConfig.mk
+++ b/cel_apl/BoardConfig.mk
@@ -71,6 +71,11 @@ BOARD_HAVE_MEDIASDK_OPEN_SOURCE := true
 # Source: device/intel/mixins/groups/debugfs/default/BoardConfig.mk
 ##############################################################
 BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/debugfs
+##############################################################
+# Source: device/intel/mixins/groups/usb-gadget/g_ffs/BoardConfig.mk
+##############################################################
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/usb
+
 ##############################################################
 # Source: device/intel/mixins/groups/slot-ab/true/BoardConfig.mk
 ##############################################################
diff --git a/cel_apl/init.rc b/cel_apl/init.rc
index 68dbf624c..26fda794f 100644
--- a/cel_apl/init.rc
+++ b/cel_apl/init.rc
@@ -254,6 +254,8 @@ on boot
     write /sys/devices/pci0000\:00/0000\:00\:15.1/dwc3.0.auto/power/control auto
     write /sys/devices/pci0000\:00/0000\:00\:15.1/dwc3.0.auto/gadget/power/control auto
     write /sys/devices/pci0000\:00/0000\:00\:15.1/dwc3.0.auto/udc/dwc3.0.auto/power/control auto
+    chown system system /sys/devices/pci0000:00/0000:00:14.0/intel_xhci_usb_sw/usb_role/intel_xhci_usb_sw-role-switch/role
+    chmod 0666 /sys/devices/pci0000:00/0000:00:14.0/intel_xhci_usb_sw/usb_role/intel_xhci_usb_sw-role-switch/role
 
 on property:sys.usb.config=none && property:sys.usb.configfs=1
     write /config/usb_gadget/g1/os_desc/use 0
diff --git a/celadon/BoardConfig.mk b/celadon/BoardConfig.mk
index 53c729bf5..b8ce35f29 100644
--- a/celadon/BoardConfig.mk
+++ b/celadon/BoardConfig.mk
@@ -75,6 +75,11 @@ DEVICE_PACKAGE_OVERLAYS += $(INTEL_PATH_COMMON)/device-type/overlay-tablet
 # Source: device/intel/mixins/groups/debugfs/default/BoardConfig.mk
 ##############################################################
 BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/debugfs
+##############################################################
+# Source: device/intel/mixins/groups/usb-gadget/g_ffs/BoardConfig.mk
+##############################################################
+BOARD_SEPOLICY_DIRS += device/intel/project-celadon/sepolicy/usb
+
 ##############################################################
 # Source: device/intel/mixins/groups/slot-ab/true/BoardConfig.mk
 ##############################################################
diff --git a/celadon/init.rc b/celadon/init.rc
index 68dbf624c..26fda794f 100644
--- a/celadon/init.rc
+++ b/celadon/init.rc
@@ -254,6 +254,8 @@ on boot
     write /sys/devices/pci0000\:00/0000\:00\:15.1/dwc3.0.auto/power/control auto
     write /sys/devices/pci0000\:00/0000\:00\:15.1/dwc3.0.auto/gadget/power/control auto
     write /sys/devices/pci0000\:00/0000\:00\:15.1/dwc3.0.auto/udc/dwc3.0.auto/power/control auto
+    chown system system /sys/devices/pci0000:00/0000:00:14.0/intel_xhci_usb_sw/usb_role/intel_xhci_usb_sw-role-switch/role
+    chmod 0666 /sys/devices/pci0000:00/0000:00:14.0/intel_xhci_usb_sw/usb_role/intel_xhci_usb_sw-role-switch/role
 
 on property:sys.usb.config=none && property:sys.usb.configfs=1
     write /config/usb_gadget/g1/os_desc/use 0

From 013e3dfd713a6379fbcb30e01c6f6a8fbff925e5 Mon Sep 17 00:00:00 2001
From: "Huang, Yuanjun" <yuanjun.huang>
Date: Wed, 19 Dec 2018 11:23:15 +0800
Subject: [PATCH 427/427] Add selinux policy for hdcpd.

Tracked-On: OAM-73644
Signed-off-by: Huang, Yuanjun <yuanjun.huang@intel.com>
---
 sepolicy/graphics/project-celadon/hdcpd.te |  6 ++++
 sepolicy/hdcpd/file.te                     |  2 ++
 sepolicy/hdcpd/file_contexts               |  6 ++++
 sepolicy/hdcpd/hdcpd.te                    | 40 ++++++++++++++++++++++
 sepolicy/hdcpd/mediadrmserver.te           | 11 ++++++
 sepolicy/hdcpd/mediaserver.te              |  9 +++++
 sepolicy/hdcpd/vendor_init.te              |  1 +
 sepolicy/hdcpd/violators_blacklist.te      | 11 ++++++
 8 files changed, 86 insertions(+)
 create mode 100644 sepolicy/graphics/project-celadon/hdcpd.te
 create mode 100644 sepolicy/hdcpd/file.te
 create mode 100644 sepolicy/hdcpd/file_contexts
 create mode 100644 sepolicy/hdcpd/hdcpd.te
 create mode 100644 sepolicy/hdcpd/mediadrmserver.te
 create mode 100644 sepolicy/hdcpd/mediaserver.te
 create mode 100644 sepolicy/hdcpd/vendor_init.te
 create mode 100644 sepolicy/hdcpd/violators_blacklist.te

diff --git a/sepolicy/graphics/project-celadon/hdcpd.te b/sepolicy/graphics/project-celadon/hdcpd.te
new file mode 100644
index 000000000..31a0d88ce
--- /dev/null
+++ b/sepolicy/graphics/project-celadon/hdcpd.te
@@ -0,0 +1,6 @@
+#
+# hdcpd
+#
+
+#gfx
+#allow hdcpd sysfs_gfx:file rw_file_perms;
diff --git a/sepolicy/hdcpd/file.te b/sepolicy/hdcpd/file.te
new file mode 100644
index 000000000..2cc168002
--- /dev/null
+++ b/sepolicy/hdcpd/file.te
@@ -0,0 +1,2 @@
+ # hdcp
+ type hdcpd_data_file, file_type, data_file_type;
diff --git a/sepolicy/hdcpd/file_contexts b/sepolicy/hdcpd/file_contexts
new file mode 100644
index 000000000..abb9d6258
--- /dev/null
+++ b/sepolicy/hdcpd/file_contexts
@@ -0,0 +1,6 @@
+# hdcpd
+(/system)?/vendor/bin/hdcpd    u:object_r:hdcpd_exec:s0
+
+# Even though hdcpd creates this itself, we keep a fc entry
+# incase we need to relabel existing nodes
+/data/hdcp(/.*)?            u:object_r:hdcpd_data_file:s0
diff --git a/sepolicy/hdcpd/hdcpd.te b/sepolicy/hdcpd/hdcpd.te
new file mode 100644
index 000000000..c7b8fefb6
--- /dev/null
+++ b/sepolicy/hdcpd/hdcpd.te
@@ -0,0 +1,40 @@
+# Rules for system/bin/dhcpd
+type hdcpd, domain;
+type hdcpd_exec, exec_type, file_type, vendor_file_type;
+init_daemon_domain(hdcpd);
+
+# need use vendor binder to access msync service
+vndbinder_use(hdcpd)
+not_full_treble(`
+  binder_call(hdcpd, surfaceflinger)
+
+  # Find hwc.info service from surfaceflinger
+  allow hdcpd surfaceflinger_service:service_manager find;
+')
+
+allow hdcpd hwc_info_service:service_manager find;
+binder_call(hdcpd, hal_graphics_composer_default)
+
+allow hdcpd self:netlink_kobject_uevent_socket create_socket_perms;
+allowxperm hdcpd self:netlink_kobject_uevent_socket ioctl SIOCETHTOOL;
+
+# sysfs access
+allow hdcpd sysfs:dir r_dir_perms;
+allow hdcpd sysfs:file r_file_perms;
+
+# gpu_device
+allow hdcpd gpu_device:dir r_dir_perms;
+allow hdcpd gpu_device:chr_file rw_file_perms;
+
+# self generated /data/hdcp
+allow hdcpd system_data_file:dir ra_dir_perms;
+type_transition hdcpd system_data_file:dir hdcpd_data_file;
+allow hdcpd hdcpd_data_file:dir create_dir_perms;
+allow hdcpd hdcpd_data_file:{ file sock_file } create_file_perms;
+
+# tmpfs
+allow hdcpd tmpfs:dir w_dir_perms;
+allow hdcpd hdcpd_tmpfs:file create_file_perms;
+
+allow hdcpd proc_graphics:file r_file_perms;
+
diff --git a/sepolicy/hdcpd/mediadrmserver.te b/sepolicy/hdcpd/mediadrmserver.te
new file mode 100644
index 000000000..d5f7280da
--- /dev/null
+++ b/sepolicy/hdcpd/mediadrmserver.te
@@ -0,0 +1,11 @@
+#
+# mediadrmserver
+#
+
+# breaks treble as mediadrmserver should be instrumented to a
+# vendor hal interface.
+not_full_treble(`
+  allow mediadrmserver hdcpd:unix_stream_socket connectto;
+  allow mediadrmserver hdcpd_data_file:dir search;
+  allow mediadrmserver hdcpd_data_file:sock_file write;
+')
diff --git a/sepolicy/hdcpd/mediaserver.te b/sepolicy/hdcpd/mediaserver.te
new file mode 100644
index 000000000..39c9be66d
--- /dev/null
+++ b/sepolicy/hdcpd/mediaserver.te
@@ -0,0 +1,9 @@
+#
+# mediaserver
+#
+
+not_full_treble(`
+  allow mediaserver hdcpd:unix_stream_socket connectto;
+  allow mediaserver hdcpd_data_file:sock_file write;
+  allow mediaserver hdcpd_data_file:dir { search };
+')
diff --git a/sepolicy/hdcpd/vendor_init.te b/sepolicy/hdcpd/vendor_init.te
new file mode 100644
index 000000000..6577d7367
--- /dev/null
+++ b/sepolicy/hdcpd/vendor_init.te
@@ -0,0 +1 @@
+allow vendor_init hdcpd_data_file:dir create_dir_perms;
diff --git a/sepolicy/hdcpd/violators_blacklist.te b/sepolicy/hdcpd/violators_blacklist.te
new file mode 100644
index 000000000..f864c24a9
--- /dev/null
+++ b/sepolicy/hdcpd/violators_blacklist.te
@@ -0,0 +1,11 @@
+typeattribute hdcpd data_between_core_and_vendor_violators;
+
+#FAILED: out/target/product/gordon_peak/obj/ETC/sepolicy_tests_intermediates/sepolicy_tests
+#The following types in proc must be associated with the "proc_type" attribute: proc_graphics
+typeattribute proc_graphics proc_type;
+
+#make sepolicy_tests error:
+#The following types on /data/ must be associated with the "core_data_file_type" attribute: hdcpd_data_file
+typeattribute hdcpd_data_file core_data_file_type;
+
+typeattribute vendor_init data_between_core_and_vendor_violators;