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

Change-Id: I2d8bd85bf274a494303a83cb4f2fdb9f4202b035