Merge "Properly compute default and system set flag on an upgrade" into oc-dev...
Merge "Properly compute default and system set flag on an upgrade" into oc-dev am: 357f42bf am: 2800f22e -s ours
am: a41e7b87 -s ours
Change-Id: I40bfeb479cdde89fbbbcca3d72a2d69bdddf7f0f