Merge "IMS: Add support for STK CC feature" am: bc813005b8
am: 9c9e54b066

Change-Id: I3b85eff2e17725108f4f150e8f2b358b5e2358a6