Merge "CallQuality is set to empty instead of null" am: b3f282daa1 am: aee66949ef
am: baa788a7aa

Change-Id: Ic6c251059d763df6f79520a5cae259f4a44601cf