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

Change-Id: Id04b0e5932092da46acd36874b05dd200e234032