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

Change-Id: Ib9695b7707d8a1e9c093bd14e6470db8981f2e8b