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

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