Merge "Enforce consistent sizes for arrays in SpannableStringInternal am: 9cde7244 am: 75152d61" into nyc-mr1-dev