Merge "Fixed incorrect display on group members" am: 31831e4249
am: b028e23ef9

Change-Id: I696d78c0c110b8cdee555068d17f1aae897788b1