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

This reverts commit b1c06b208fc4ba8bd56c531c3ef51333c0650458.
Rebase from 'upstream'
Trimmed the branch to only the rostime sub directory