Cleanup packaging

Change-Id: I1cab86014f6aa766ac61dd3ba2d3f2f3f3852bea