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

This reverts commit 5daad37545640cc5a62b21de2970e6c43af0394b.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the manifest_cleaner sub directory