Merge "Unsuspending packages when a PO or DO is set" into pi-dev
am: 24e913e5a8

Change-Id: Ibc0d2d064fa642f668cf084022f0f7d10e82bc88