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

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