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

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