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

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