Merge "Fix issue where conference gets logged when no CEP is enabled." am: 603547b079
am: 9abf783910

Change-Id: Ie48f8be6ca1b35c93f40430f91fb323fea238d02