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

Change-Id: Ib4341edece2bc0b1730ccd4e6c8312bca701aefa