diff --git a/device.mk b/device.mk
index 8031f49e3e1b8d306fd95953f0fdc28a70c79f7c..4454cb05f24a632c5c564d72d278217b4cbbffdb 100644
--- a/device.mk
+++ b/device.mk
@@ -43,6 +43,10 @@ PRODUCT_COPY_FILES += \
 TARGET_SCREEN_HEIGHT := 2160
 TARGET_SCREEN_WIDTH := 1080
 
+# Cmaera Shim
+PRODUCT_PACKAGES += \
+    libcamera_hal_shim
+
 # Fingerprint Gestures
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/keylayout/uinput-fpc.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput-fpc.kl \
diff --git a/extract-files.sh b/extract-files.sh
index 6d292a111cbeb174c85a6d6f55d9e47b1ec7bdf4..5745e15b1166c3ca74af767ef53537fcf65ca8be 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -40,3 +40,10 @@ sed -i "s|/system/lib/hw/|/vendor/lib/hw/|g" "$CAMERA_IMX386"
 # Load ZAF configs from vendor
 ZAF_CORE="$BLOB_ROOT"/vendor/lib/libzaf_core.so
 sed -i "s|/system/etc/zaf|/vendor/etc/zaf|g" "$ZAF_CORE"
+
+# Using in vendor libgui for O cam blobs
+sed -i "s|libgui.so|libPui.so|g" "$BLOB_ROOT"/vendor/lib/libmmcamera_ppeiscore.so
+sed -i "s|libgui.so|libPui.so|g" "$BLOB_ROOT"/vendor/lib/libmmcamera_vstab_module.so
+
+# Using patchelf to add cam shims
+patchelf --add-needed libcamera_hal_shim.so "$BLOB_ROOT"/vendor/lib/hw/camera.sdm660.so
diff --git a/libshims/Android.mk b/libshims/Android.mk
new file mode 100644
index 0000000000000000000000000000000000000000..b3de844157f97a3cc24e3e8a6d4a61270ac657ad
--- /dev/null
+++ b/libshims/Android.mk
@@ -0,0 +1,24 @@
+# Copyright (C) 2018 The LineageOS 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.
+
+LOCAL_PATH := $(call my-dir)
+
+# Camera
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := camera_hal_shim.cpp
+LOCAL_SHARED_LIBRARIES := libutils
+LOCAL_MODULE := libcamera_hal_shim
+LOCAL_MODULE_TAGS := optional
+LOCAL_PROPRIETARY_MODULE := true
+include $(BUILD_SHARED_LIBRARY)
diff --git a/libshims/camera_hal_shim.cpp b/libshims/camera_hal_shim.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..f3ce23c29da5a0c8d61cd744fab13d253ff7c734
--- /dev/null
+++ b/libshims/camera_hal_shim.cpp
@@ -0,0 +1,8 @@
+#include <stdint.h>
+
+namespace android {
+    extern "C" void _ZN7android9StopWatchC1EPKci(const char* name, int clock);
+    extern "C" void _ZN7android9StopWatchC1EPKcij(const char* name, int clock, uint32_t flags) {
+        _ZN7android9StopWatchC1EPKci(name, clock);
+    }
+}
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 968e28348b482e79c2f34ea3c1262316a76d18af..ea0c56d6ae772cc02a39a9ce9995d05daae5f5bc 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -429,9 +429,13 @@ vendor/lib64/libubifocus.so
 vendor/lib/libS5k2l7Pdaf.so
 vendor/lib/libS5k2l7PdafCamif.so
 vendor/lib/libmm-qcamera.so
-vendor/lib/libmot_gpu_mapper.so
 lib/libcamera_metadata.so:vendor/lib/libcamera_metadata.so
 
+# Cam from P
+vendor/lib/libmot_gpu_mapper.so|a7477c7604bf9ac8b7b2ead6283eb6ddb80051fa
+vendor/lib/libgui_vendor.so|2289516454cceae50bb3963f9255bc113a24b508
+vendor/lib/libPui.so|2289516454cceae50bb3963f9255bc113a24b508
+
 # Camera - Firmware
 vendor/firmware/cpp_firmware_v1_10_0.fw
 vendor/firmware/cpp_firmware_v1_12_0.fw
diff --git a/vendor_prop.mk b/vendor_prop.mk
index 629f5d96a209a990fa5f9a9ba1a754d92a2eed11..90ce5fa0970fe0f5eba2cb7c7967e7f3c0d7ed0b 100644
--- a/vendor_prop.mk
+++ b/vendor_prop.mk
@@ -12,6 +12,11 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.audio.calfile5=/vendor/etc/acdbdata/common/Headset_cal.acdb \
     persist.audio.calfile6=/vendor/etc/acdbdata/common/Speaker_cal.acdb
 
+# Camera
+PRODUCT_PROPERTY_OVERRIDES += \
+    persist.camera.preview.ubwc=0 \
+    video.disable.ubwc=1
+
 # Sensors
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.hardware.sensors=evert \