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

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