Merge "Change log behavior to log conference calls only when they are...
Merge "Change log behavior to log conference calls only when they are disconnected from conference." am: c6fb66d0
am: bf4e958c
Change-Id: Ifdd3485a11bb5b3120c1d7b6906b00779acd872c