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

This reverts commit 963b6b9c8a82d0b05a9b5e8231316e301c57b66b.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the rostime sub directory