diff --git a/device.mk b/device.mk
index 0c629033..57eaf645 100644
--- a/device.mk
+++ b/device.mk
@@ -226,6 +226,11 @@ PRODUCT_VENDOR_PROPERTIES += \
 	ro.hardware.egl = mali
 endif
 
+# Configure EGL blobcache
+PRODUCT_VENDOR_PROPERTIES += \
+       ro.egl.blobcache.multifile=true \
+       ro.egl.blobcache.multifile_limit=134217728 \
+
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.opengles.version=196610 \
 	graphics.gpu.profiler.support=true \
diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index 2b878db1..ab512efa 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -148,4 +148,9 @@
     <!-- Boolean indicating whether DTIM multiplier configuration is enabled. DTIM multiplier value
         is when the system is in the suspended mode -->
     <bool translatable="false" name="config_wifiDtimMultiplierConfigEnabled">true</bool>
+
+    <!-- Boolean indicating whether the framework updates country from scan results when there is
+         no telephony country code and driver country code is 00.
+         This is applied only during the setup wizard -->
+    <bool translatable="false" name ="config_wifiUpdateCountryCodeFromScanResultSetupWizard">true</bool>
 </resources>