Merge "Enforce consistent sizes for arrays in SpannableStringInternal am: 9cde7244b6 am: 75152d61b0" into nyc-mr1-dev
am: bc6425f838

Change-Id: I5410c173009a3b2a3d65cae2a6d74865539495ff