Merge "Fix broken DCHECK"
am: 7ebb7aed1c

* commit '7ebb7aed1c10a83a24a66475f886e77645bf29c4':
  Fix broken DCHECK

Change-Id: I0eee58bde6ebeddc9bd2245f306e0daa3158f2bd