Merge "toolbox: fix memory leak" am: e3bd4a2fec am: 32bf66a168 am: 7fef2a4b20
am: cc187be646

Change-Id: Ib84545b9f87f92903ef4803d5acdf70a94655281