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

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