Merge "Ims: Add support for Adhoc Conference calls" am: 0ab00030a2 am: cac198c770

Change-Id: I731b34760f1dd075100c85d45fc193ab6947b816