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

Change-Id: I19d878aee8e8e212015465aa31f3a35991b303fd