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

Change-Id: I85fdc058077fa77179e4a5e019cb8368038ee717