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

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