Merge "Fix for ContactsTest#testGroupMembershipTable" into honeycomb