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

Change-Id: I683eaf58177ad3676cc773cac934b4b9b337a87a