Merge "Use new manifest flag to gate clearing data during restore"