[automerger skipped] Merge changes from topic "malloc-purge" into pi-dev
am: 91d12f1577  -s ours

Change-Id: If5ce5f694770aad373a215fe56c2782fb551449d