Merge "Remove bogus DCHECK." into nyc-dev
am: 26da99595f

* commit '26da99595fd9b4298af68937c1c6302faec4e4da':
  Remove bogus DCHECK.

Change-Id: Ia4dd67778c1453a0bdae2bf938864eda457c1308