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

Change-Id: I9aeebf5ad18409fb038a21e24fde45f588d260f8