Merge "Track multiparty conferences" into rvc-dev am: e315ba4934 am: fc00baa678

Change-Id: I645c8df9f1faf39680961104be2280a69939181f