Fixed a bug where the wrong group was HUNd

Fixes: 22466201
Fixes: 27925006
Change-Id: Iaaf91b63c0bb218a75b449554f17ed3828fdfff8
3 files changed