Fix duplicate packages causing a server fault when submitting a new job

Bug: 883887
Change-Id: Ie3679c9bcea0014f273131cc94b09fd342e20137