am 99015a24: Merge "Remove unnecessary memory allocations" into ics-mr1

* commit '99015a2464a40097c3e23e07cdf69da0f886aa66':
  Remove unnecessary memory allocations