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

Change-Id: Ie27b6b596eb87a1041f0afa47e4affe9a04c43eb