Merge "Merge "Check the size of the strings in the StringPool before flattening." into pi-dev am: 7281fe0a" into pi-dev-plus-aosp