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

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