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

Change-Id: Ica133d6e5b24796c8b03c477f4ff6929092bbea1