Merge "Turn a few DCHECK into CHECKs."
am: 4aa0cf8d72

Change-Id: Id06e75b2c51d056743db7a3243d9a385b2498206