Merge change I7cc0fe4d

* changes:
  rightsize StringBuilders for arrays; see bug 2135223