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

Change-Id: I69dcdb09f8e174acfe6268ede87b1f804b0e33f1