Merge "Track multiparty conferences" am: cbaf63717d

Change-Id: Ia86957d7346a38013ad7e8c7c76b69d0bc955dc7