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

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