am be34db7c: am 51358838: Merge "IMS Conference changes" into mnc-dev

* commit 'be34db7c062e2c794cbb49119189803db33cb947':
  IMS Conference changes