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

Change-Id: I154fccf2ee1046de3b4ec2c0e628114371d7fb45