[automerger skipped] Merge "Add unit test for CEP at conference creation." am: 9fab62ffb5 am: f67a9dc1e0 -s ours am: 1e08a911bf -s ours am: e9b2643a90 -s ours

am skip reason: Change-Id I48aabb7004c549a55c3ec0472ea88d99ac0832bf with SHA-1 167c0c11da is in history

Change-Id: Ie1c09dee799718131c1f1dbb8a93fdfd46a4ca74