For OCL, keep original control logic FOr HIP, keep the fix for SWDEV-338781 Change-Id: I89de8d1e73cd103b3b4f62206eed72d45695dd6e