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

This reverts commit f0c0373e4c43b717f7e11e58bd3461f9869926d5.
Rebase from 'upstream'
Trimmed the branch to only the robot sub directory