Merge "Minor DCHECK bug fix." into pi-dev
am: b71a685352

Change-Id: Ia845df87c7d51e2529ca16d5b2676b3e4e4685a7