demo meeting refactoring

Change-Id: Ib6828a6cfe730083d39b99bf252a6bf6aa82db6b
Merge "demo meeting refactoring"