diff --git a/CleanSpec.mk b/CleanSpec.mk
index a5a9c40a9d31e..54c43fb4dcea2 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -181,6 +181,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/usr/idc/frameworks)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/usr/keylayout/frameworks)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/usr/keychars/frameworks)
 $(call add-clean-step, rm -f $(PRODUCT_OUT)/system/media/video/*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/)
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
diff --git a/data/sounds/AudioPackage12.mk b/data/sounds/AudioPackage12.mk
new file mode 100644
index 0000000000000..8cf94941fd3dd
--- /dev/null
+++ b/data/sounds/AudioPackage12.mk
@@ -0,0 +1,27 @@
+#
+# Audio Package 12 - K
+#
+# Include this file in a product makefile to include these audio files
+#
+#
+
+LOCAL_PATH := frameworks/base/data/sounds
+
+# Simple files that do not require renaming
+ALARM_FILES := Argon Carbon Helium Krypton Neon Oxygen Osmium Platinum
+NOTIFICATION_FILES := Ariel Ceres Carme Elara Europa Iapetus Io Rhea Salacia Titan Tethys
+RINGTONE_FILES := Callisto Dione Ganymede Luna Oberon Phobos Sedna Titania Triton Umbriel
+EFFECT_FILES := Effect_Tick KeypressReturn KeypressInvalid KeypressDelete KeypressSpacebar KeypressStandard \
+	VideoRecord camera_click camera_focus LowBattery Dock Undock Lock Unlock WirelessChargingStarted
+
+PRODUCT_COPY_FILES += $(foreach fn,$(ALARM_FILES),\
+	$(LOCAL_PATH)/alarms/ogg/$(fn).ogg:system/media/audio/alarms/$(fn).ogg)
+
+PRODUCT_COPY_FILES += $(foreach fn,$(NOTIFICATION_FILES),\
+	$(LOCAL_PATH)/notifications/ogg/$(fn).ogg:system/media/audio/notifications/$(fn).ogg)
+
+PRODUCT_COPY_FILES += $(foreach fn,$(RINGTONE_FILES),\
+	$(LOCAL_PATH)/ringtones/ogg/$(fn).ogg:system/media/audio/ringtones/$(fn).ogg)
+
+PRODUCT_COPY_FILES += $(foreach fn,$(EFFECT_FILES),\
+	$(LOCAL_PATH)/effects/ogg/$(fn).ogg:system/media/audio/effects/$(fn).ogg)
diff --git a/data/sounds/AudioPackage12_48.mk b/data/sounds/AudioPackage12_48.mk
new file mode 100644
index 0000000000000..6b7b796b2370e
--- /dev/null
+++ b/data/sounds/AudioPackage12_48.mk
@@ -0,0 +1,36 @@
+#
+# Audio Package 12 - K (48kHz)
+#
+# Include this file in a product makefile to include these audio files
+#
+#
+
+LOCAL_PATH := frameworks/base/data/sounds
+
+# Simple files that do not require renaming
+ALARM_FILES := Argon Carbon Helium Krypton Neon Oxygen Osmium Platinum
+NOTIFICATION_FILES := Ariel Ceres Carme Elara Europa Iapetus Io Rhea Salacia Titan Tethys
+RINGTONE_FILES := Callisto Dione Ganymede Luna Oberon Phobos Sedna Titania Triton Umbriel
+EFFECT_FILES := Effect_Tick KeypressReturn KeypressInvalid KeypressDelete KeypressSpacebar KeypressStandard \
+	VideoRecord camera_click Lock Unlock
+
+# Alarms not yet available in 48 kHz
+PRODUCT_COPY_FILES += $(foreach fn,$(ALARM_FILES),\
+	$(LOCAL_PATH)/alarms/ogg/$(fn).ogg:system/media/audio/alarms/$(fn).ogg)
+
+PRODUCT_COPY_FILES += $(foreach fn,$(NOTIFICATION_FILES),\
+	$(LOCAL_PATH)/notifications/ogg/$(fn)_48k.ogg:system/media/audio/notifications/$(fn).ogg)
+
+PRODUCT_COPY_FILES += $(foreach fn,$(RINGTONE_FILES),\
+	$(LOCAL_PATH)/ringtones/ogg/$(fn)_48k.ogg:system/media/audio/ringtones/$(fn).ogg)
+
+PRODUCT_COPY_FILES += $(foreach fn,$(EFFECT_FILES),\
+	$(LOCAL_PATH)/effects/ogg/$(fn)_48k.ogg:system/media/audio/effects/$(fn).ogg)
+
+# no gold-plated version yet
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/effects/camera_focus.ogg \
+    $(LOCAL_PATH)/effects/ogg/LowBattery.ogg:system/media/audio/effects/LowBattery.ogg \
+    $(LOCAL_PATH)/effects/ogg/WirelessChargingStarted.ogg:system/media/audio/effects/WirelessChargingStarted.ogg \
+    $(LOCAL_PATH)/effects/ogg/Dock.ogg:system/media/audio/effects/Dock.ogg \
+    $(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/effects/Undock.ogg
diff --git a/data/sounds/effects/ogg/Effect_Tick.ogg b/data/sounds/effects/ogg/Effect_Tick.ogg
index c8a5c36e9550e..42dddb157b978 100644
Binary files a/data/sounds/effects/ogg/Effect_Tick.ogg and b/data/sounds/effects/ogg/Effect_Tick.ogg differ
diff --git a/data/sounds/effects/ogg/Effect_Tick_48k.ogg b/data/sounds/effects/ogg/Effect_Tick_48k.ogg
index e1f53d7a3e6ca..eb1847ea5cb03 100644
Binary files a/data/sounds/effects/ogg/Effect_Tick_48k.ogg and b/data/sounds/effects/ogg/Effect_Tick_48k.ogg differ
diff --git a/data/sounds/effects/ogg/KeypressDelete.ogg b/data/sounds/effects/ogg/KeypressDelete.ogg
index 38c3244b0d123..cf2dce3d5daaa 100644
Binary files a/data/sounds/effects/ogg/KeypressDelete.ogg and b/data/sounds/effects/ogg/KeypressDelete.ogg differ
diff --git a/data/sounds/effects/ogg/KeypressDelete_48k.ogg b/data/sounds/effects/ogg/KeypressDelete_48k.ogg
new file mode 100644
index 0000000000000..9b33f5309e610
Binary files /dev/null and b/data/sounds/effects/ogg/KeypressDelete_48k.ogg differ
diff --git a/data/sounds/effects/ogg/KeypressInvalid_48k.ogg b/data/sounds/effects/ogg/KeypressInvalid_48k.ogg
new file mode 100644
index 0000000000000..24935ad2e3baf
Binary files /dev/null and b/data/sounds/effects/ogg/KeypressInvalid_48k.ogg differ
diff --git a/data/sounds/effects/ogg/KeypressReturn.ogg b/data/sounds/effects/ogg/KeypressReturn.ogg
index 1bd5b7358b8e7..314ed85e5fbf5 100644
Binary files a/data/sounds/effects/ogg/KeypressReturn.ogg and b/data/sounds/effects/ogg/KeypressReturn.ogg differ
diff --git a/data/sounds/effects/ogg/KeypressReturn_48k.ogg b/data/sounds/effects/ogg/KeypressReturn_48k.ogg
new file mode 100644
index 0000000000000..04627fcd4f4cb
Binary files /dev/null and b/data/sounds/effects/ogg/KeypressReturn_48k.ogg differ
diff --git a/data/sounds/effects/ogg/KeypressSpacebar.ogg b/data/sounds/effects/ogg/KeypressSpacebar.ogg
index 3a835949a8a5d..6aca94a1fd6c1 100644
Binary files a/data/sounds/effects/ogg/KeypressSpacebar.ogg and b/data/sounds/effects/ogg/KeypressSpacebar.ogg differ
diff --git a/data/sounds/effects/ogg/KeypressSpacebar_48k.ogg b/data/sounds/effects/ogg/KeypressSpacebar_48k.ogg
new file mode 100644
index 0000000000000..9953e56726bcf
Binary files /dev/null and b/data/sounds/effects/ogg/KeypressSpacebar_48k.ogg differ
diff --git a/data/sounds/effects/ogg/KeypressStandard.ogg b/data/sounds/effects/ogg/KeypressStandard.ogg
index 4b8d128b00e11..9b9747cfd6cb4 100644
Binary files a/data/sounds/effects/ogg/KeypressStandard.ogg and b/data/sounds/effects/ogg/KeypressStandard.ogg differ
diff --git a/data/sounds/effects/ogg/KeypressStandard_48k.ogg b/data/sounds/effects/ogg/KeypressStandard_48k.ogg
new file mode 100644
index 0000000000000..3f57438a15a54
Binary files /dev/null and b/data/sounds/effects/ogg/KeypressStandard_48k.ogg differ
diff --git a/data/sounds/effects/ogg/Lock.ogg b/data/sounds/effects/ogg/Lock.ogg
index e7928e493f40a..7e989114b9108 100644
Binary files a/data/sounds/effects/ogg/Lock.ogg and b/data/sounds/effects/ogg/Lock.ogg differ
diff --git a/data/sounds/effects/ogg/Lock_48k.ogg b/data/sounds/effects/ogg/Lock_48k.ogg
new file mode 100644
index 0000000000000..06697ed72c8fd
Binary files /dev/null and b/data/sounds/effects/ogg/Lock_48k.ogg differ
diff --git a/data/sounds/effects/ogg/Unlock.ogg b/data/sounds/effects/ogg/Unlock.ogg
index cca95940d9507..851eed5063ff8 100644
Binary files a/data/sounds/effects/ogg/Unlock.ogg and b/data/sounds/effects/ogg/Unlock.ogg differ
diff --git a/data/sounds/effects/ogg/Unlock_48k.ogg b/data/sounds/effects/ogg/Unlock_48k.ogg
new file mode 100644
index 0000000000000..c2cf304948c72
Binary files /dev/null and b/data/sounds/effects/ogg/Unlock_48k.ogg differ
diff --git a/data/sounds/notifications/ogg/Ariel.ogg b/data/sounds/notifications/ogg/Ariel.ogg
new file mode 100644
index 0000000000000..6a11cbd7f9e8e
Binary files /dev/null and b/data/sounds/notifications/ogg/Ariel.ogg differ
diff --git a/data/sounds/notifications/ogg/Ariel_48k.ogg b/data/sounds/notifications/ogg/Ariel_48k.ogg
new file mode 100644
index 0000000000000..6a11cbd7f9e8e
Binary files /dev/null and b/data/sounds/notifications/ogg/Ariel_48k.ogg differ
diff --git a/data/sounds/notifications/ogg/Carme.ogg b/data/sounds/notifications/ogg/Carme.ogg
new file mode 100644
index 0000000000000..afd358fd76f90
Binary files /dev/null and b/data/sounds/notifications/ogg/Carme.ogg differ
diff --git a/data/sounds/notifications/ogg/Carme_48k.ogg b/data/sounds/notifications/ogg/Carme_48k.ogg
new file mode 100644
index 0000000000000..1dd4b417251f3
Binary files /dev/null and b/data/sounds/notifications/ogg/Carme_48k.ogg differ
diff --git a/data/sounds/notifications/ogg/Ceres.ogg b/data/sounds/notifications/ogg/Ceres.ogg
new file mode 100644
index 0000000000000..fadbe84165b56
Binary files /dev/null and b/data/sounds/notifications/ogg/Ceres.ogg differ
diff --git a/data/sounds/notifications/ogg/Ceres_48k.ogg b/data/sounds/notifications/ogg/Ceres_48k.ogg
new file mode 100644
index 0000000000000..134842d70bbed
Binary files /dev/null and b/data/sounds/notifications/ogg/Ceres_48k.ogg differ
diff --git a/data/sounds/notifications/ogg/Elara.ogg b/data/sounds/notifications/ogg/Elara.ogg
new file mode 100644
index 0000000000000..c66c9f333b4e7
Binary files /dev/null and b/data/sounds/notifications/ogg/Elara.ogg differ
diff --git a/data/sounds/notifications/ogg/Elara_48k.ogg b/data/sounds/notifications/ogg/Elara_48k.ogg
new file mode 100644
index 0000000000000..80c619554df3c
Binary files /dev/null and b/data/sounds/notifications/ogg/Elara_48k.ogg differ
diff --git a/data/sounds/notifications/ogg/Europa.ogg b/data/sounds/notifications/ogg/Europa.ogg
new file mode 100644
index 0000000000000..07cc3d94544eb
Binary files /dev/null and b/data/sounds/notifications/ogg/Europa.ogg differ
diff --git a/data/sounds/notifications/ogg/Europa_48k.ogg b/data/sounds/notifications/ogg/Europa_48k.ogg
new file mode 100644
index 0000000000000..bf27eb146cab6
Binary files /dev/null and b/data/sounds/notifications/ogg/Europa_48k.ogg differ
diff --git a/data/sounds/notifications/ogg/Iapetus.ogg b/data/sounds/notifications/ogg/Iapetus.ogg
new file mode 100644
index 0000000000000..d4062a8431a69
Binary files /dev/null and b/data/sounds/notifications/ogg/Iapetus.ogg differ
diff --git a/data/sounds/notifications/ogg/Iapetus_48k.ogg b/data/sounds/notifications/ogg/Iapetus_48k.ogg
new file mode 100644
index 0000000000000..811523962b6fa
Binary files /dev/null and b/data/sounds/notifications/ogg/Iapetus_48k.ogg differ
diff --git a/data/sounds/notifications/ogg/Io.ogg b/data/sounds/notifications/ogg/Io.ogg
new file mode 100644
index 0000000000000..2286d73738669
Binary files /dev/null and b/data/sounds/notifications/ogg/Io.ogg differ
diff --git a/data/sounds/notifications/ogg/Io_48k.ogg b/data/sounds/notifications/ogg/Io_48k.ogg
new file mode 100644
index 0000000000000..2286d73738669
Binary files /dev/null and b/data/sounds/notifications/ogg/Io_48k.ogg differ
diff --git a/data/sounds/notifications/ogg/Rhea.ogg b/data/sounds/notifications/ogg/Rhea.ogg
new file mode 100644
index 0000000000000..039644f942e77
Binary files /dev/null and b/data/sounds/notifications/ogg/Rhea.ogg differ
diff --git a/data/sounds/notifications/ogg/Rhea_48k.ogg b/data/sounds/notifications/ogg/Rhea_48k.ogg
new file mode 100644
index 0000000000000..32889f3c863f3
Binary files /dev/null and b/data/sounds/notifications/ogg/Rhea_48k.ogg differ
diff --git a/data/sounds/notifications/ogg/Salacia.ogg b/data/sounds/notifications/ogg/Salacia.ogg
new file mode 100644
index 0000000000000..af07b01fceaae
Binary files /dev/null and b/data/sounds/notifications/ogg/Salacia.ogg differ
diff --git a/data/sounds/notifications/ogg/Salacia_48k.ogg b/data/sounds/notifications/ogg/Salacia_48k.ogg
new file mode 100644
index 0000000000000..3ef7b0ba3f5ee
Binary files /dev/null and b/data/sounds/notifications/ogg/Salacia_48k.ogg differ
diff --git a/data/sounds/notifications/ogg/Tethys.ogg b/data/sounds/notifications/ogg/Tethys.ogg
new file mode 100644
index 0000000000000..25475d108aa27
Binary files /dev/null and b/data/sounds/notifications/ogg/Tethys.ogg differ
diff --git a/data/sounds/notifications/ogg/Tethys_48k.ogg b/data/sounds/notifications/ogg/Tethys_48k.ogg
new file mode 100644
index 0000000000000..a9d8bbd7a6bf3
Binary files /dev/null and b/data/sounds/notifications/ogg/Tethys_48k.ogg differ
diff --git a/data/sounds/notifications/ogg/Titan.ogg b/data/sounds/notifications/ogg/Titan.ogg
new file mode 100644
index 0000000000000..8c10f58c81418
Binary files /dev/null and b/data/sounds/notifications/ogg/Titan.ogg differ
diff --git a/data/sounds/notifications/ogg/Titan_48k.ogg b/data/sounds/notifications/ogg/Titan_48k.ogg
new file mode 100644
index 0000000000000..45ea524a95781
Binary files /dev/null and b/data/sounds/notifications/ogg/Titan_48k.ogg differ
diff --git a/data/sounds/ringtones/ogg/Callisto.ogg b/data/sounds/ringtones/ogg/Callisto.ogg
new file mode 100644
index 0000000000000..9c982d80752b1
Binary files /dev/null and b/data/sounds/ringtones/ogg/Callisto.ogg differ
diff --git a/data/sounds/ringtones/ogg/Callisto_48k.ogg b/data/sounds/ringtones/ogg/Callisto_48k.ogg
new file mode 100644
index 0000000000000..05ad67b3cdc6d
Binary files /dev/null and b/data/sounds/ringtones/ogg/Callisto_48k.ogg differ
diff --git a/data/sounds/ringtones/ogg/Dione.ogg b/data/sounds/ringtones/ogg/Dione.ogg
new file mode 100644
index 0000000000000..a378520f588f3
Binary files /dev/null and b/data/sounds/ringtones/ogg/Dione.ogg differ
diff --git a/data/sounds/ringtones/ogg/Dione_48k.ogg b/data/sounds/ringtones/ogg/Dione_48k.ogg
new file mode 100644
index 0000000000000..a378520f588f3
Binary files /dev/null and b/data/sounds/ringtones/ogg/Dione_48k.ogg differ
diff --git a/data/sounds/ringtones/ogg/Ganymede.ogg b/data/sounds/ringtones/ogg/Ganymede.ogg
new file mode 100644
index 0000000000000..01ff573aef545
Binary files /dev/null and b/data/sounds/ringtones/ogg/Ganymede.ogg differ
diff --git a/data/sounds/ringtones/ogg/Ganymede_48k.ogg b/data/sounds/ringtones/ogg/Ganymede_48k.ogg
new file mode 100644
index 0000000000000..aed2e967e6dcf
Binary files /dev/null and b/data/sounds/ringtones/ogg/Ganymede_48k.ogg differ
diff --git a/data/sounds/ringtones/ogg/Luna.ogg b/data/sounds/ringtones/ogg/Luna.ogg
new file mode 100644
index 0000000000000..87a2463902ea0
Binary files /dev/null and b/data/sounds/ringtones/ogg/Luna.ogg differ
diff --git a/data/sounds/ringtones/ogg/Luna_48k.ogg b/data/sounds/ringtones/ogg/Luna_48k.ogg
new file mode 100644
index 0000000000000..c8a61aab41d51
Binary files /dev/null and b/data/sounds/ringtones/ogg/Luna_48k.ogg differ
diff --git a/data/sounds/ringtones/ogg/Oberon.ogg b/data/sounds/ringtones/ogg/Oberon.ogg
new file mode 100644
index 0000000000000..124af10019d90
Binary files /dev/null and b/data/sounds/ringtones/ogg/Oberon.ogg differ
diff --git a/data/sounds/ringtones/ogg/Oberon_48k.ogg b/data/sounds/ringtones/ogg/Oberon_48k.ogg
new file mode 100644
index 0000000000000..ec2cb29cfaa5a
Binary files /dev/null and b/data/sounds/ringtones/ogg/Oberon_48k.ogg differ
diff --git a/data/sounds/ringtones/ogg/Phobos.ogg b/data/sounds/ringtones/ogg/Phobos.ogg
new file mode 100644
index 0000000000000..768ca9498f41a
Binary files /dev/null and b/data/sounds/ringtones/ogg/Phobos.ogg differ
diff --git a/data/sounds/ringtones/ogg/Phobos_48k.ogg b/data/sounds/ringtones/ogg/Phobos_48k.ogg
new file mode 100644
index 0000000000000..f926cb0eb7da0
Binary files /dev/null and b/data/sounds/ringtones/ogg/Phobos_48k.ogg differ
diff --git a/data/sounds/ringtones/ogg/Sedna.ogg b/data/sounds/ringtones/ogg/Sedna.ogg
new file mode 100644
index 0000000000000..522faaf7ce273
Binary files /dev/null and b/data/sounds/ringtones/ogg/Sedna.ogg differ
diff --git a/data/sounds/ringtones/ogg/Sedna_48k.ogg b/data/sounds/ringtones/ogg/Sedna_48k.ogg
new file mode 100644
index 0000000000000..522faaf7ce273
Binary files /dev/null and b/data/sounds/ringtones/ogg/Sedna_48k.ogg differ
diff --git a/data/sounds/ringtones/ogg/Titania.ogg b/data/sounds/ringtones/ogg/Titania.ogg
new file mode 100644
index 0000000000000..76cc0a5d18948
Binary files /dev/null and b/data/sounds/ringtones/ogg/Titania.ogg differ
diff --git a/data/sounds/ringtones/ogg/Titania_48k.ogg b/data/sounds/ringtones/ogg/Titania_48k.ogg
new file mode 100644
index 0000000000000..4da66367251fc
Binary files /dev/null and b/data/sounds/ringtones/ogg/Titania_48k.ogg differ
diff --git a/data/sounds/ringtones/ogg/Triton.ogg b/data/sounds/ringtones/ogg/Triton.ogg
new file mode 100644
index 0000000000000..542ae1624e00b
Binary files /dev/null and b/data/sounds/ringtones/ogg/Triton.ogg differ
diff --git a/data/sounds/ringtones/ogg/Triton_48k.ogg b/data/sounds/ringtones/ogg/Triton_48k.ogg
new file mode 100644
index 0000000000000..0ae7383455bb5
Binary files /dev/null and b/data/sounds/ringtones/ogg/Triton_48k.ogg differ
diff --git a/data/sounds/ringtones/ogg/Umbriel.ogg b/data/sounds/ringtones/ogg/Umbriel.ogg
new file mode 100644
index 0000000000000..b21a12e0778a8
Binary files /dev/null and b/data/sounds/ringtones/ogg/Umbriel.ogg differ
diff --git a/data/sounds/ringtones/ogg/Umbriel_48k.ogg b/data/sounds/ringtones/ogg/Umbriel_48k.ogg
new file mode 100644
index 0000000000000..99ebcddae6b09
Binary files /dev/null and b/data/sounds/ringtones/ogg/Umbriel_48k.ogg differ