Making changes as per SILICON ODL