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

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