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

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