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