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

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