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

This reverts commit 5de256baf1f028d5b3d0c503a928cdd2563356a6.
Rebase from 'upstream'
Trimmed the branch to only the audio_play sub directory