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

This reverts commit e1336008963354f97d8e972c0c3668903793660f.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the audio_play sub directory