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

Change-Id: I29fb7e019b31ababc408dc20f71227609b858e9a