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

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