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

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