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

Change-Id: I8832fc1d11afe9593bf229ef0575b8e8d962d2db