Revert "Revert sound commits"

This reverts commit 12aa8ec3f10f3e241861c0fab2c58c81e2706dfa.

Change-Id: I08691f2b7adb8d24cfd147511ba50031d9d289f9