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

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