Merge "Fix broken DCHECK." am: de833ef742
am: 5def39427d

Change-Id: I2cda9a2adc0a619c631b339af51679ab23333445