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

This reverts commit d8b20d1f6658cdcd0dac681b3525a68b8873e70d.
Rebase from 'upstream'
Trimmed the branch to only the trivial_garbage sub directory