Merge "Fix conference call cannot be hung up" am: a8f8245aef
am: 3ef0bf4214

Change-Id: Ied60044fb71cf3edae884196cea0d153aa3a15ca