Change-Id: I59d2e15b297b6ca2d5eee1a6dee642bdb01a3839
SWDEV-238517 for enhancing hip unit tests Change-Id: I9b6ef41db2f02ee3679360d0fae709a404a0ea4f