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

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