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

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