Merge "toolbox: fix memory leak" am: e3bd4a2fec
am: 32bf66a168

Change-Id: I0d6d94fdfb7f7484eb7e6ea39a1d38bf8ce4a88a