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

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