Merge "Change prototype for "setCamera" in IMS VideoProvider." am: c164b159f8 am: e55b11573e am: 998655f80e
am: 58d8c5eb07  -s ours

Change-Id: Ic1f76d23f1d0c28c74cbea392a3998181d9d6da7