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

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