Merge \\"Enhance toString on ConferenceParticipant.\\" into nyc-mr1-dev am: b822f7a956
am: b4eba24135

Change-Id: I49dcd951c8e27211c7b8a374a50edb1218814531