repopick: make topic picking work for pac (2/2)

PS2: derpfix
PS3: we cannot abandon twice

Change-Id: Ibc9bda748f0f1e3bfde4db99086760bf78232688
Merge "repopick: make topic picking work for pac (2/2)" into pac-4.4