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

This reverts commit 95c3199d61bf30a6d1ffe226349ae085129d54bd.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the adhoc_communication sub directory