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

This reverts commit 0982c9daafcda3df35bad14a738baf11c1f98180.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the timestamp_tools sub directory