Merge "IMS: Add support for STK CC feature" am: 60435c90bd am: 7bfe773fa8
am: 48cda043b8

Change-Id: Ic819b0ec5c29f25ed17e0527c64382fab1410fb2