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

This reverts commit 2df7b3af4b7537465909ad6988f92ca3b10afca5.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the robot_interaction sub directory