Merge "bootable: leak less memory" am: 19073f2067 am: 37395747a8
am: 5026bd6047

Change-Id: I3d33089fb30ee61b960b18fdb1a785eb1ed2028e