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

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