[fix] resolve wolf_kima resists (mantis 5681)

Change-Id: I684d64999ff7dedf169c47cf7a4424c7a0237ec2
Merge "[fix] resolve wolf_kima resists (mantis 5681)" into unstable