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

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