Merge "Add missing remote conference property set." into nyc-mr1-dev am: aa9b18f90a
am: 273f01785d

Change-Id: I53490a7d67d8dc909049338ec7470acdc8cf801f