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

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