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

Change-Id: Ie1efe13740a76e1e56848fbe776ce6e13bc4b00c