Merge "toolbox: fix memory leak"
am: e3bd4a2fec

Change-Id: I1c3d0e7308acf2af333b9a41a73b2a4120a3cc0b