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

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