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

Change-Id: Id85e15e5977feac7db367340817460a23d5ff97e