Merge changes from topic "add_participant" am: fdfc58fcd9 am: ac4f7edbd3 am: 0997ab95ae

Change-Id: I82f5641c95547646bf41a21c6ee4d4e0c4cc9aef