Fix potential error copying null conference participant list. am: 108a6b7283
Tyler Gunn [Wed, 24 Aug 2016 22:24:05 +0000 (22:24 +0000)]
am: ef3d89d01a

Change-Id: I2a615eca5d499be15e40ac6b8370aab3bcec444b


Trivial merge