Merge "Properly compute default and system set flag on an upgrade" into oc-dev am: 357f42bf69 am: 2800f22eec  -s ours am: a41e7b87dc  -s ours
am: 9e323cdb2a  -s ours

Change-Id: I5d862880faa3361dff13d83058133c0ddcda1195