Merge "IMS: UT ServiceClass" into lmp-mr1-wfc-dev