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

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