Merge "Remove DCHECK while investigating."
am: 7643e41206

Change-Id: I443e4b08e19f55ee567455704cccf24fe6b30131