Merge "Fix DCHECK compilation error." am: 2f0f5ffcfc
am: a71313dba2

* commit 'a71313dba22d27d31008b90357e76e9916d10bd8':
  Fix DCHECK compilation error.