Merge "Remove assert, use CHECK instead."