Merge changes from topic "CdmaSs" am: b4cefbf0f6 am: 004a31ee28

Change-Id: I1d5f70d460b78502b65be60558d18a113fb5d458