Merge "Fixes cache misses and extra allocations. Bug #3421454" into honeycomb