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
am: 997c434ed8  -s ours

Change-Id: Ifb54fdd84ddaf6039b78605b554ddb6462f27ae7