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

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