Merge "Add ability to disable video conferencing." into nyc-mr1-dev
am: b4e87abed8

* commit 'b4e87abed818cb66a0e996cfbed246cb2723c77c':
  Add ability to disable video conferencing.

Change-Id: I029efdb162a8a5e546083c4f227fe5829336c612