* stable-2.16: Rely on GroupAuditService rather than its implementation Change-Id: I54c285adec60c1e8af2ed03aacd01fa667f0ca58