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

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