merge this one as it is xpu only change.
Signed-off-by: Rahul Vijayaraghavan <rahul.vijayaraghavan@intel.com>