Merge "Minor DCHECK bug fix." into pi-dev