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

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