olemarkus: Automated cherry pick of #13819: Replace manifests after apply

No Results