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

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