Merge "Resets system flags when updating PackageSettings" into pi-dev am: f8f6e5af75
am: 91bb146dd0

Change-Id: Ibb8f601122bd57972eb8b03051c166e699b3d220