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

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