This fix "single role" class design rule.

Refs #64903

Change-Id: Idc8a82d04d13380bddad75c766fc7b3175a54ef1