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

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