am 4aa2ec15: Merge "Some optimizations for the array alloc path."

* commit '4aa2ec15878c77bfb33927cfa7b3d0103d70ffd0':
  Some optimizations for the array alloc path.