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

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