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

Change-Id: Ia41c9954430149d3144f064575089f91f72ec79e