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

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