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

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