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

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