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

Change-Id: Id53e35da42506eef81e628b855dc731b5e590d21