Merge "Fix broken DCHECK" am: 7ebb7aed1c
am: 63cbd3c027

* commit '63cbd3c027ecac74482cbf12c21e88473bfcfdbd':
  Fix broken DCHECK

Change-Id: I72b400bae989f5c596a15299b17508d9589bfa62