Merge "Increase vtable size for String class" into nyc-dev