Merge "Merge "Properly compute default and system set flag on an upgrade" into...
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 am: 9706d800 -s ours
am: 20c4d352 -s ours
Change-Id: I370b5b6348823ac61772648e140df4f43c1ce0f1