Merge "Fix int overflow in SpannableStringBuilder.replace" into nyc-dev