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

This reverts commit 8b3120d48e4a705977626d20cb410103373834c8.
Rebase from 'upstream'
Trimmed the branch to only the adhoc_communication sub directory