am c96d2aee: (-s ours) am 2a38657d: Merge "DO NOT MERGE - disable memory dumps" into ics-mr1

* commit 'c96d2aeed70f930d26236a20f6d32f0a24d83bd8':
  DO NOT MERGE - disable memory dumps