diff --git a/target/product/full_base.mk b/target/product/full_base.mk
index 625b8943d8..9ad45a9357 100644
--- a/target/product/full_base.mk
+++ b/target/product/full_base.mk
@@ -29,7 +29,9 @@ PRODUCT_PACKAGES := \
 
 # Additional settings used in all AOSP builds
 PRODUCT_PROPERTY_OVERRIDES := \
-    ro.com.android.dateformat=MM-dd-yyyy
+    ro.com.android.dateformat=MM-dd-yyyy \
+    ro.config.ringtone=Ring_Synth_04.ogg \
+    ro.config.notification_sound=pixiedust.ogg
 
 # Put en_US first in the list, so make it default.
 PRODUCT_LOCALES := en_US