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

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