Merge "Fix broken DCHECK."
am: de833ef742

Change-Id: I7c85e950d28147e8f3a0bfd965554409ef4008c0