Merge "DO NOT MERGE - disable memory dumps" into ics-mr1