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

Change-Id: Iee5f05e4cc0efc8c0abbe2c46c7ceedea164bbee