Merge "Revert "Reject the config if condition config has errors. And add log tag.""