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

Change-Id: Ic98b3e57ee420c40a3b5359b7b3acba3a5869192