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

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