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

Change-Id: Iea9a23e62bb62d8034b9ff41f1d569954613854a