Merge changes from topic "ims_cc" am: a08cc8306f
am: 9d0769f8a6

Change-Id: Ia79d7886ad64194491cb2e3236f1e987b8b3f01b