Merge "IMS: Add support for STK CC feature"
am: 60435c90bd

Change-Id: Ie407862830b32e15b9bc8d764623aefedb32375e