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

Change-Id: I3fdf25a59c6000d6dd3e46679a119d2ddc72fb5a