DO NOT MERGE Revert video calling CLs skipped: 6161aee5ab

Change-Id: I3ecdfb0cb8de1a9e3a10026f7227a9e94e8c3338