Merge "Remove unnecessary memory allocations" into ics-mr1