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

* commit '2f0f5ffcfcbe05d0fa20592294e6a12959e3dada':
  Fix DCHECK compilation error.