Merge "Remove bogus DCHECK." am: 39d4dee8d1
am: 831789822c

* commit '831789822c62fdc4370689cd8aa71e8e13bad1fd':
  Remove bogus DCHECK.

Change-Id: Id4ec5aa4dbe8154eb1f4e7f561de900f321bea91