Merge "Move TEE rules to vendor image" into oc-dev