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

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