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

Change-Id: Iab760a8db125f30bce6dbda2b3d784fb135995da