Merge "Add workaround for coverage on group call APIs" am: 10654ff46c
am: 11010b1dc6

Change-Id: Ic37d1b6955f7120844631a6733fb7d1bf4c4a4a3