am a9c369d0: am 87465f02: Merge "Fixes cache misses and extra allocations. Bug #3421454" into honeycomb

* commit 'a9c369d0fbe2b995f456877b2368aac95f810558':
  Fixes cache misses and extra allocations. Bug #3421454