Merge "Ims: Add support for Adhoc Conference calls" am: ba248894ac am: b54e70f7ae

Change-Id: Idf560b660a3d6d5f026ea240c421d380d4506c2d