Merge "Merge "Properly compute default and system set flag on an upgrade" into oc-dev am: 357f42bf am: da4e8f2d" into oc-dr1-dev-plus-aosp