Merge "Properly compute default and system set flag on an upgrade" into oc-mr1-dev am: 7e73c70fce
am: f6b0e7017c

Change-Id: I19b7ae0a939032d8093431673209fb241aa9de3c