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

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