This reverts commit fdb7d5d8. Test failures due to failing the added DCHECK. Bug: 34967844 Change-Id: If4a6ec70330c7f773b550481c3dd2e7a2e5d4f9a