Support for OEM/ODM services

Support for OEM/ODM services