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

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