Merge "setPackagesSuspended now overwrites all the state" into pi-dev
am: e901d69ea6

Change-Id: I0c323bdb3fdbf36a732b383040db5f016db9b212