diff --git a/hal/Android.mk b/hal/Android.mk
index 85a58bf..7485d2f 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -5,20 +5,6 @@
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libqcaudioperf
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-LOCAL_SHARED_LIBRARIES += libbase libhidlbase libhwbinder libutils android.hardware.power@1.2 liblog
-LOCAL_SRC_FILES := audio_perf.cpp
-LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := qti
-LOCAL_VENDOR_MODULE := true
-
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-
 LOCAL_ARM_MODE := arm
 
 AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)
@@ -358,7 +344,9 @@
 #    LOCAL_CFLAGS += -DAUDIO_EXTN_AUTO_HAL_ENABLED
 #    LOCAL_SRC_FILES += audio_extn/auto_hal.c
 #endif
-LOCAL_SHARED_LIBRARIES += libqcaudioperf
+
+LOCAL_SHARED_LIBRARIES += libbase libhidlbase libhwbinder libutils android.hardware.power@1.2 liblog
+LOCAL_SRC_FILES += audio_perf.cpp
 
 LOCAL_MODULE := audio.primary.$(TARGET_BOARD_PLATFORM)
 
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 59b0072..5fa0fc8 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -3165,6 +3165,9 @@
 
         if (adev->offload_effects_stop_output != NULL)
             adev->offload_effects_stop_output(out->handle, out->pcm_device_id);
+    } else if (out->usecase == USECASE_AUDIO_PLAYBACK_ULL ||
+               out->usecase == USECASE_AUDIO_PLAYBACK_MMAP) {
+        audio_low_latency_hint_end();
     }
 
     if (out->usecase == USECASE_INCALL_MUSIC_UPLINK)
@@ -3572,6 +3575,11 @@
     audio_extn_perf_lock_release(&adev->perf_lock_handle);
     ALOGD("%s: exit", __func__);
 
+    if (out->usecase == USECASE_AUDIO_PLAYBACK_ULL ||
+        out->usecase == USECASE_AUDIO_PLAYBACK_MMAP) {
+        audio_low_latency_hint_start();
+    }
+
     if (out->ip_hdlr_handle) {
         ret = audio_extn_ip_hdlr_intf_open(out->ip_hdlr_handle, true, out, out->usecase);
         if (ret < 0)
diff --git a/hal/audio_perf.h b/hal/audio_perf.h
index 05c3036..b564938 100644
--- a/hal/audio_perf.h
+++ b/hal/audio_perf.h
@@ -31,4 +31,4 @@
 }
 #endif
 
-#endif //__QAUDIOPERF_H___
+#endif //__QAUDIOPERF_H__