Merge "Check the size of the strings in the StringPool before flattening." into pi-dev