Merge "Fix bug where group IDs were not being assigned during boot."