Merge "Add unit test for CEP at conference creation." am: 9fab62ffb5

Change-Id: I885a34956358cfc19d5c4f6afcc0b732df38a280