Merge \\"A few conference calling fixes:\\" into nyc-mr1-dev am: ba9e3af74e
am: 8d12c832c7

Change-Id: I271fb7e54e53c61867ac8940f79cd61afeaa9e5b