Merge "Add VTS to ensure deprecated IOemHook is not used" into oc-dr1-dev