Merge "Properly compute default and system set flag on an upgrade" into oc-dev am: 357f42bf69
am: 2800f22eec  -s ours

Change-Id: I767ece0ec5b60ef92da2e6ebe394bdcf2e966328