Merge "Merge "Properly compute default and system set flag on an upgrade" into oc-dev am: 357f42bf69 am: da4e8f2d31" into oc-dr1-dev-plus-aosp
am: 9706d8000b  -s ours

Change-Id: I5f3cd8aa863c90532383b6615bbc3bc731323582