Tool Labs: add user-requested packages

Bug: 63000
Change-Id: Icb08d33bf1cf832f8bf289f35fdba83ce703d231
Merge "Tool Labs: add user-requested packages" into production