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

This reverts commit a7dacebf70a40323113205232c3899055de14401.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the rostime sub directory