Merge changes from topic "CdmaSs" am: b4cefbf0f6

Change-Id: Ic3b89aad5c687064e4ec24106c8a9ecd8b6b8d4c