upstream imports r102
upstream imports r103
cleanup entity text helper
upstream imports r119, among other things, the number of animations were increasded to 512