Fix for OSR

Change-Id: I354571ee55df251d69feccc907236c4d3436d082
Fix for OSR

Change-Id: I5e7f49e5cf07e4759040e5f4eb7928ee29ec07c2