Revert "Trimmed the branch to only the sound_play sub directory"

This reverts commit 7a5eebf49fdf9cee0440492455bfcbb762e0ba7b.
Rebase from 'upstream'
Trimmed the branch to only the sound_play sub directory