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

This reverts commit 20aa552b8ef5d1694031b4c816a0f9cd80394a1c.
Rebase from 'upstream'
Trimmed the branch to only the manifest_cleaner sub directory