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

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