Fix leaks

Change-Id: Iba29be756934d9564cfdee1f6281c56345772dc7
Fixes: 28074995
3 files changed