Merge "Fix an incorrect assert that doesn't account for element array size."