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

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