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

Change-Id: I19bdd7a0b551f545d9ed43a069170b7fa84ff4c5