Tool Labs: package tweak

Change-Id: Ibd1df543c8d301f274866569385e89344a5ea22d