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

* commit '4f3e4380f38e853c6806f0dc5a6623310d5f38a5':
  Move DCHECK into loop.

Change-Id: I679433b42ae6e7a66305ede534014fc9df86523f