Merge "tee domain is a vendor domain" into oc-dev