am 2ac4cb14: Merge "Cache element type in allocation." into jb-mr1-dev

* commit '2ac4cb14fd34fff9ed1fede229aea9c84edb6556':
  Cache element type in allocation.