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

This reverts commit 9051a171c98cce036d9ab215dbaeb71abb7cdc4a.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the sound_play sub directory