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

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