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
am: 9e323cdb -s ours
Change-Id: I5d862880faa3361dff13d83058133c0ddcda1195