Merge "Fix oldMergedSS is altered to OUT_OF_SERVICE."
am: 29664b8206

Change-Id: I4bd5c07860640a2bc5eabd8a582a13669b3f022f