Merge "Remove assert, use CHECK instead."
am: 5d6d932a60

Change-Id: I84ca9a5e4a77c44a336245286c1d40d7fd4de003