Merge changes from topic "ims_cc"
am: a08cc8306f

Change-Id: I481a681784df325066a9087c0a82d0f15268ba7f