As explained in the comment, with the generated-groups file in the
inventory, as we regenerate the groups we end up finding old entries
that have actually disappeared and keep putting them back in.
Change-Id: I86463ecf516c38bb08d3d45e706a0da61a33efdf