Merge \\"Remove too aggressive DCHECKs.\\" am: cace1ba2ab
am: 1523d7cb05

Change-Id: Ie276a1d0fd7ce90d13561bc51b68dc6b2b4c5f66