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

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