Merge "Changes to IMS SS API to better fit API standards/"
am: 91bd02534a

Change-Id: I410188f983fc04180e404359e9e53712e82fd683