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

Change-Id: I793b961135d82e90fca908d19e6dd0d4b0a7f4c5