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

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