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

Change-Id: Ib08da06f3797ca40217aa57fba1c92dcc091213b