Merge "Improve parsing of conference participant addresses." am: dec0d823f1
am: 9d84f9e151

Change-Id: Iec77f248e67b9a0d37268d9f8e3a06cd646ff37c