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

Change-Id: Id2dc1687d653af03096eba3ee648df0e7d3ca554