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

This reverts commit 627abb2b9f144e53041324e1c29be26f756b1e33.
Rebase from 'upstream'
Trimmed the branch to only the robot_interaction sub directory