Merge "Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev am: 5d628b1e am: 3a25ff94" into nyc-mr1-dev