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

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