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

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