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

Change-Id: I42b5eabd1e21aa5b7c5ab71b34d5eadada0023aa