See if we can get trove to package itself.

Change-Id: I653fcee0725896d588115db354cd69ca4ab2b342
Merge "See if we can get trove to package itself."