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

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