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

Change-Id: I39ec00edf07095ae63d28dfd2fb69cd6a11f89c9