diff --git a/car_product/build/car.mk b/car_product/build/car.mk
index eb9bab3..3b40292 100644
--- a/car_product/build/car.mk
+++ b/car_product/build/car.mk
@@ -53,7 +53,7 @@
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.bluetooth.enablenewavrcp=false \
     ro.carrier=unknown \
-    ro.fw.multiuser.headless_system_user=true
+    ro.fw.mu.headless_system_user=true
 
 # Overlay for Google network and fused location providers
 $(call inherit-product, device/sample/products/location_overlay.mk)
diff --git a/tests/DirectRenderingClusterSample/Android.mk b/tests/DirectRenderingClusterSample/Android.mk
index 41d2a65..28a5a78 100644
--- a/tests/DirectRenderingClusterSample/Android.mk
+++ b/tests/DirectRenderingClusterSample/Android.mk
@@ -40,7 +40,8 @@
     androidx.car_car-cluster \
     car-arch-common \
     car-media-common \
-    car-telephony-common
+    car-telephony-common \
+    car-apps-common
 
 include $(BUILD_PACKAGE)
 
diff --git a/tests/DirectRenderingClusterSample/res/layout/fragment_music.xml b/tests/DirectRenderingClusterSample/res/layout/fragment_music.xml
index 3071c72..f9c72f7 100644
--- a/tests/DirectRenderingClusterSample/res/layout/fragment_music.xml
+++ b/tests/DirectRenderingClusterSample/res/layout/fragment_music.xml
@@ -23,7 +23,7 @@
     app:cardElevation="0dp"
     app:cardCornerRadius="6dp">
 
-    <com.android.car.media.common.CrossfadeImageView
+    <com.android.car.apps.common.CrossfadeImageView
         android:id="@+id/album_background"
         android:foreground="?android:attr/selectableItemBackground"
         android:layout_width="match_parent"