Merge "Revert "Fix conference call cannot be hung up"" am: df83f91e60 am: d0d3f84b5d
am: d4f012adfd

Change-Id: I6b00bca2556dbb64e47737353262118104347136