Merge "Fix DCHECK compilation error."