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

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