am 2a38657d: Merge "DO NOT MERGE - disable memory dumps" into ics-mr1

* commit '2a38657dfcb5655e3e900a3d25695864f3d023a3':
  DO NOT MERGE - disable memory dumps