Merge "Move DCHECK into loop." am: a07be75 am: 4f3e438
am: d9a3fc0

* commit 'd9a3fc05b8d79aaca38661625509151550c446f3':
  Move DCHECK into loop.

Change-Id: Ib5686029eee203cd192cb96d9457bb55212508c4