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

Change-Id: If31df37c11eebb379987bcbfdbc4f6aee7c6dc8a