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

Change-Id: I1176b63a1d84829b79b9e540747a27b777e88c47