Merge "Fix broken DCHECK." am: de833ef742 am: 5def39427d am: 57ce8cdc7e
am: 43c843f714

Change-Id: I631ab07bac61efcacebbd82d9790e3ee923a88fb