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

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