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

This reverts commit c5c92e31bc98d1760e7000c69a985a4c76ec55e0.
Rebase from 'upstream'
Trimmed the branch to only the trivial_gray_streams sub directory