diff --git a/config/display-board.mk b/config/display-board.mk
index 2abdd00..6f7a86a 100644
--- a/config/display-board.mk
+++ b/config/display-board.mk
@@ -13,4 +13,6 @@
 TARGET_HAS_WIDE_COLOR_DISPLAY := true
 TARGET_HAS_HDR_DISPLAY := true
 TARGET_USES_DISPLAY_RENDER_INTENTS := true
+TARGET_USE_COLOR_MANAGEMENT := true
+SF_WCG_COMPOSITION_DATA_SPACE := 143261696
 
diff --git a/config/msmnile.mk b/config/msmnile.mk
index 70e755d..7730d68 100644
--- a/config/msmnile.mk
+++ b/config/msmnile.mk
@@ -15,7 +15,6 @@
     memtrack.qcom \
     libqdutils \
     libqdMetaData \
-    libqdMetaData.system \
     modetest
 
 #QDCM calibration xml file for 2k panel
diff --git a/gralloc/gr_buf_mgr.cpp b/gralloc/gr_buf_mgr.cpp
index 61e31d6..cd36c13 100644
--- a/gralloc/gr_buf_mgr.cpp
+++ b/gralloc/gr_buf_mgr.cpp
@@ -329,11 +329,11 @@
   hnd->layer_count = layer_count;
   // set default csc as 709, but for video(yuv) its 601L
   ColorSpace_t colorSpace = (buffer_type == BUFFER_TYPE_VIDEO) ? ITU_R_601 : ITU_R_709;
-  setMetaData(hnd, UPDATE_COLOR_SPACE, reinterpret_cast<void *>(&colorSpace));
+  setMetaDataAndUnmap(hnd, UPDATE_COLOR_SPACE, reinterpret_cast<void *>(&colorSpace));
 
   bool use_adreno_for_size = CanUseAdrenoForSize(buffer_type, usage);
   if (use_adreno_for_size) {
-    setMetaData(hnd, SET_GRAPHICS_METADATA, reinterpret_cast<void *>(&graphics_metadata));
+    setMetaDataAndUnmap(hnd, SET_GRAPHICS_METADATA, reinterpret_cast<void *>(&graphics_metadata));
   }
 
   *handle = hnd;