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

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