Change-Id: I7ed4a1246943867482ff595d5f98bb25bd79074b
SWDEV-238517 for enhancing hip unit tests Change-Id: Icff175360815ba6e25a6954a67947b65caff3711