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

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