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

Change-Id: I7b6b1a94fd04b22755cba511b674f128ee63260b