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

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