Add groups to a file missing them

Change-Id: Ia2ada0d4182398495694573e96671e6ff3492bd8
Merge "Add groups to a file missing them"